@exodus/solana-lib 3.11.1 → 3.12.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.11.2...@exodus/solana-lib@3.12.0) (2025-09-25)
+
+
+### Features
+
+
+* feat: use trezor compatibility mode for solana (#6564)
+
+
+### Bug Fixes
+
+
+* fix: don't use Sync methods in async (#5682)
+
+
+
+## [3.11.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.11.1...@exodus/solana-lib@3.11.2) (2025-05-05)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
 ## [3.11.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.11.0...@exodus/solana-lib@3.11.1) (2025-04-21)
 
 **Note:** Version bump only for package @exodus/solana-lib

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.11.1",
+  "version": "3.12.0",
   "description": "Solana utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -33,10 +33,10 @@
     "minimalistic-assert": "^1.0.1"
   },
   "devDependencies": {
+    "@exodus/bip39": "^1.0.1",
     "@exodus/key-identifier": "^1.3.0",
     "@exodus/keychain": "^7.3.0",
-    "@exodus/solana-meta": "^2.0.0",
-    "bip39": "^2.6.0"
+    "@exodus/solana-meta": "^2.0.0"
   },
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-lib"
@@ -46,5 +46,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "2e550990ef9db4209f8fe4e6e0485579d1afeedf"
+  "gitHead": "50814bd63872e287b650e161010e77be15b7994e"
 }

package/src/helpers/spl-token-2022.js

@@ -118,10 +118,13 @@ export function decodeTransferCheckedWithFeeInstruction(
   instruction, // TransactionInstruction
   programId // PublicKey
 ) {
-  if (!instruction.programId.equals(programId))
+  if (!instruction.programId.equals(programId)) {
     throw new Error('TokenInvalidInstructionProgramError')
-  if (instruction.data.length !== transferCheckedWithFeeInstructionData.span)
+  }
+
+  if (instruction.data.length !== transferCheckedWithFeeInstructionData.span) {
     throw new Error('TokenInvalidInstructionDataError')
+  }
 
   const {
     keys: { source, mint, destination, authority, signers },
@@ -130,8 +133,10 @@ export function decodeTransferCheckedWithFeeInstruction(
   if (
     data.instruction !== TokenInstruction.TransferFeeExtension ||
     data.transferFeeInstruction !== TransferFeeInstruction.TransferCheckedWithFee
-  )
+  ) {
     throw new Error('TokenInvalidInstructionTypeError')
+  }
+
   if (!mint) throw new Error('TokenInvalidInstructionKeysError')
 
   return {

package/src/key-identifier.js

@@ -37,6 +37,7 @@ export const createGetKeyIdentifier =
           keyType: 'nacl',
         }
       case 'ledger':
+      case 'trezor':
       case 'trust':
         return {
           assetName,

package/src/msg/sign-message.js

@@ -1,4 +1,4 @@
-import { signDetachedSync } from '@exodus/crypto/curve25519'
+import { signDetached } from '@exodus/crypto/curve25519'
 import assert from 'minimalistic-assert'
 
 import { assertValidMessage } from './validation.js'
@@ -11,5 +11,5 @@ export const signMessageNew = async ({ privateKey, message }) => {
     `privateKey is not a Buffer or Uint8Array`
   )
 
-  return signDetachedSync({ message: rawMessage, privateKey, format: 'buffer' })
+  return signDetached({ message: rawMessage, privateKey, format: 'buffer' })
 }

package/src/transaction.js

@@ -167,8 +167,9 @@ class Tx {
     if (!rawTokenProgram) throw new Error('Cannot detect token program')
     const tokenProgram = new PublicKey(rawTokenProgram).toBase58()
     // crete account instruction
-    if (isSOLaddress && !isAssociatedTokenAccountActive)
+    if (isSOLaddress && !isAssociatedTokenAccountActive) {
       this.transaction.add(createAssociatedTokenAccount(from, tokenMintAddress, to, tokenProgram))
+    }
 
     let amountLeft = amount
     let amountToSend
@@ -277,7 +278,7 @@ class Tx {
   }
 
   static undelegate({ address, stakeAddresses, recentBlockhash }) {
-    // undelegate all stake addresses
+    // undelegate all stake addresses, in a single tx
     assert(Array.isArray(stakeAddresses), 'stakeAddresses Array is required')
 
     const fromPubkey = new PublicKey(address)
@@ -295,19 +296,29 @@ class Tx {
     return transaction
   }
 
-  static withdraw({ address, stakeAddresses, amount, recentBlockhash }) {
+  static withdraw({ address, accounts, recentBlockhash }) {
+    // withdraw all inactive unstaked addresses, in a single tx
+    assert(typeof accounts === 'object', 'accounts object is required')
     const fromPubkey = new PublicKey(address)
-    const stakeAddress = Array.isArray(stakeAddresses) ? stakeAddresses[0] : stakeAddresses
-    const stakePublicKey = new PublicKey(stakeAddress)
 
-    // TODO: why don't we put all withdraw in a single tx??
-    const transaction = StakeProgram.withdraw({
-      stakePubkey: stakePublicKey,
-      authorizedPubkey: fromPubkey,
-      toPubkey: fromPubkey,
-      lamports: amount,
-    })
-    transaction.recentBlockhash = recentBlockhash
+    const transaction = new Transaction({ recentBlockhash })
+
+    // putting all withdraw instructions in a single tx
+    for (const [stakeAddress, account] of Object.entries(accounts)) {
+      if (!account.canWithdraw) continue // skip non-withdrawable accounts
+      if (!account.lamports) continue // skip empty accounts
+
+      const stakePublicKey = new PublicKey(stakeAddress)
+
+      const instruction = StakeProgram.withdraw({
+        stakePubkey: stakePublicKey,
+        authorizedPubkey: fromPubkey,
+        toPubkey: fromPubkey,
+        lamports: account.lamports,
+      })
+      transaction.add(instruction)
+    }
+
     return transaction
   }
 

package/src/tx/create-unsigned-tx.js

@@ -18,6 +18,7 @@ export function createUnsignedTx({
   method,
   // Staking related:
   stakeAddresses,
+  accounts,
   seed,
   pool,
   // MagicEden escrow/related:
@@ -54,6 +55,7 @@ export function createUnsignedTx({
       // Staking related:
       method,
       stakeAddresses,
+      accounts,
       seed,
       pool,
       // MagicEden escrow/related:

package/src/tx/parse-unsigned-tx.js

@@ -9,6 +9,7 @@ export function parseUnsignedTx({ asset, unsignedTx }) {
     fromTokenAddresses,
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
     initializerAddress,
@@ -41,6 +42,7 @@ export function parseUnsignedTx({ asset, unsignedTx }) {
     // staking related
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
     // MagicEden escrow/related:

package/src/tx/prepare-for-signing.js

@@ -141,12 +141,12 @@ const createUndelegateTransaction = ({ address, recentBlockhash, stakeAddresses
     stakeAddresses,
   })
 
-const createWithdrawTransaction = ({ address, amount, recentBlockhash, stakeAddresses }) =>
+const createWithdrawTransaction = ({ address, amount, recentBlockhash, accounts }) =>
   Transaction.withdraw({
     address,
     amount,
     recentBlockhash,
-    stakeAddresses,
+    accounts,
   })
 
 const createMagicEdenInitializeEscrowTransaction = ({