@exodus/solana-lib 3.17.0 → 3.18.1

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.18.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.18.0...@exodus/solana-lib@3.18.1) (2025-12-15)
+
+
+### Bug Fixes
+
+
+* fix: check SOL transactionBuffer type (#7111)
+
+
+
+## [3.18.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.15.3...@exodus/solana-lib@3.18.0) (2025-11-26)
+
+
+### Features
+
+
+* feat: Solana support Close Authority Sponsorship in fee payer (#6767)
+
+
+
 ## [3.17.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.15.3...@exodus/solana-lib@3.17.0) (2025-11-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.17.0",
+  "version": "3.18.1",
   "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": "6a39e3cdbf3bf1849d6d4aae8e935588332d92ac"
+  "gitHead": "76314e6813c7b8c01a3c852cac1228be3820356d"
 }

package/src/tx/common.js

@@ -1,5 +1,6 @@
 import { VersionedTransaction } from '@exodus/solana-web3.js'
 import base58 from 'bs58'
+import assert from 'minimalistic-assert'
 
 export function isVersionedTransaction(tx) {
   return Number.isInteger(tx.version)
@@ -14,6 +15,7 @@ export function transactionToBase58(tx) {
 }
 
 export function deserializeTransaction(tx) {
+  assert(tx instanceof Uint8Array, 'tx must be a Buffer or Uint8Array')
   return VersionedTransaction.deserialize(tx)
 }
 

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

@@ -1,48 +1,14 @@
-import BN from 'bn.js'
 import bs58 from 'bs58'
 
 import { SYSTEM_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../constants.js'
-import { SYSTEM_INSTRUCTION_LAYOUTS, TOKEN_INSTRUCTION_LAYOUTS } from '../vendor/index.js'
+import {
+  SYSTEM_INSTRUCTION_LAYOUTS,
+  SystemInstruction,
+  TOKEN_INSTRUCTION_LAYOUTS,
+  TokenInstruction,
+} from '../vendor/index.js'
 import { deserializeTransaction } from './common.js'
 
-function decodeSPLTransferData(data) {
-  // Data is already normalized to Buffer in normalizeInstruction
-  if (data.length < 9) throw new Error('Instruction data too short for SPL transfer')
-
-  const instructionType = data[0]
-  const amountBytes = data.slice(1, 9)
-  const amountBN = new BN(amountBytes, 'le')
-
-  if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.Transfer.index) {
-    return { amount: amountBN, method: 'transfer' }
-  }
-
-  if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.TransferChecked.index) {
-    if (data.length < 10) throw new Error('Instruction data too short for transferChecked')
-    const decimals = data[9]
-    return { amount: amountBN, method: 'transferChecked', decimals }
-  }
-
-  throw new Error(`Unsupported instruction type: ${instructionType}`)
-}
-
-function decodeSystemTransferData(data) {
-  const buffer = Buffer.from(data)
-
-  // 4 bytes - instruction type must be 2 (Transfer)
-  if (buffer.readUInt32LE(0) !== SYSTEM_INSTRUCTION_LAYOUTS.Transfer.index) {
-    throw new Error(`Unsupported instruction type for SystemProgram: ${buffer.readUInt32LE(0)}`)
-  }
-
-  const amountBytes = buffer.slice(4, 12)
-  const amountBN = new BN(amountBytes, 'le')
-
-  return {
-    amount: amountBN,
-    method: 'systemTransfer',
-  }
-}
-
 // Helper function to check if an instruction is a token transfer
 function isTokenTransferInstruction(instruction, accountKeys) {
   if (!instruction || instruction.programIdIndex === undefined) return false
@@ -58,7 +24,8 @@ function isTokenTransferInstruction(instruction, accountKeys) {
     return false
   }
 
-  // Check if the instruction data is transfer (0x03) or transferChecked (0x0c/12)
+  // Check if the instruction data is transfer (0x03), transferChecked (0x0c/12),
+  // or TransferFeeExtension (0x1a/26) with TransferCheckedWithFee sub-instruction
   // Note: Must handle both formats because this is called from isTokenTransfer()
   // which uses non-normalized instructions
   try {
@@ -68,13 +35,22 @@ function isTokenTransferInstruction(instruction, accountKeys) {
     }
 
     const instructionType = data[0]
-    // Accept both Transfer and TransferChecked
+
+    // Accept Transfer, TransferChecked, and TransferFeeExtension
     if (
       instructionType !== TOKEN_INSTRUCTION_LAYOUTS.Transfer.index &&
-      instructionType !== TOKEN_INSTRUCTION_LAYOUTS.TransferChecked.index
+      instructionType !== TOKEN_INSTRUCTION_LAYOUTS.TransferChecked.index &&
+      instructionType !== TOKEN_INSTRUCTION_LAYOUTS.TransferFeeExtension.index
     ) {
       return false
     }
+
+    // For TransferFeeExtension, check if it's specifically TransferCheckedWithFee (sub-instruction 1)
+    if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.TransferFeeExtension.index) {
+      if (data.length < 2) return false
+      const subInstruction = data[1]
+      if (subInstruction !== 1) return false // Only support TransferCheckedWithFee
+    }
   } catch {
     return false
   }
@@ -192,15 +168,16 @@ export async function parseTxBuffer(buffer, api) {
   try {
     for (const [index, instruction] of instructions.entries()) {
       if (isTokenTransferInstruction(instruction, accountKeys)) {
-        const decoded = decodeSPLTransferData(instruction.data)
+        const decoded = TokenInstruction.decodeInstructionData(instruction.data)
         const programId = accountKeys[instruction.programIdIndex]
 
         // Transfer (3): [source, destination, authority]
         // TransferChecked (12): [source, mint, destination, authority, ...]
+        // TransferCheckedWithFee (26,1): [source, mint, destination, authority, ...]
         let fromTokenAccount, toTokenAccount, mintAddress
 
-        if (decoded.method === 'transferChecked') {
-          // TransferChecked: mint is at index 1, destination at index 2
+        if (decoded.method === 'transferChecked' || decoded.method === 'transferCheckedWithFee') {
+          // TransferChecked and TransferCheckedWithFee: mint is at index 1, destination at index 2
           fromTokenAccount = accountKeys[instruction.accounts[0]].toBase58()
           mintAddress = accountKeys[instruction.accounts[1]].toBase58() // Mint directly from accounts
           toTokenAccount = accountKeys[instruction.accounts[2]].toBase58()
@@ -248,7 +225,7 @@ export async function parseTxBuffer(buffer, api) {
 
         parsedInstructions.push(parsedInstruction)
       } else if (isSolTransferInstruction(instruction, accountKeys)) {
-        const { amount, method } = decodeSystemTransferData(instruction.data)
+        const { amount, method } = SystemInstruction.decodeInstructionData(instruction.data)
         const programId = accountKeys[instruction.programIdIndex]
 
         parsedInstructions.push({

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

@@ -1,6 +1,7 @@
 import { isNumberUnit } from '@exodus/currency'
 import { VersionedTransaction } from '@exodus/solana-web3.js'
 import BN from 'bn.js'
+import assert from 'minimalistic-assert'
 
 import { createMetaplexTransferTransaction } from '../helpers/metaplex-transfer.js'
 import Transaction from '../transaction.js'
@@ -42,6 +43,10 @@ export function prepareForSigning(unsignedTx, { checkBalances = true } = {}) {
 
   // Recreate a Web3.js Transaction instance if the buffer provided.
   if (transactionBuffer) {
+    assert(
+      unsignedTx.txData.transactionBuffer instanceof Uint8Array,
+      'transactionBuffer must be a Buffer or Uint8Array'
+    )
     return deserializeTransactionBytes(transactionBuffer)
   }
 

package/src/vendor/index.js

@@ -9,4 +9,4 @@ export * from './stake-program.js'
 export * from './sysvar.js'
 export * from './transaction.js'
 export * from './constants.js'
-export { TOKEN_INSTRUCTION_LAYOUTS } from './token-program.js'
+export { TOKEN_INSTRUCTION_LAYOUTS, TokenInstruction } from './token-program.js'

package/src/vendor/system-program.js

@@ -1,4 +1,5 @@
 import * as BufferLayout from '@exodus/buffer-layout'
+import BN from 'bn.js'
 
 import { decodeData, encodeData } from './instruction.js'
 import { NONCE_ACCOUNT_LENGTH } from './nonce-account.js'
@@ -258,6 +259,31 @@ export const SystemInstruction = {
     }
   },
 
+  /**
+   * Decode raw instruction data (for use in parseTxBuffer)
+   * @param {Buffer} data - Raw instruction data buffer
+   * @returns {Object} Decoded instruction data with amount and method
+   */
+  decodeInstructionData(data) {
+    const buffer = Buffer.from(data)
+
+    try {
+      const { lamports } = decodeData(SYSTEM_INSTRUCTION_LAYOUTS.Transfer, buffer)
+      return {
+        amount: new BN(lamports),
+        method: 'systemTransfer',
+      }
+    } catch (err) {
+      // Provide more specific error for non-transfer instructions
+      if (err.message.includes('instruction index mismatch')) {
+        const instructionType = buffer.readUInt32LE(0)
+        throw new Error(`Unsupported instruction type for SystemProgram: ${instructionType}`)
+      }
+
+      throw err
+    }
+  },
+
   /**
    * Decode an allocate system instruction and retrieve the instruction params.
    */

package/src/vendor/token-program.js

@@ -1,3 +1,5 @@
+import BN from 'bn.js'
+
 /**
  * Token Program instruction layouts
  * Token-2022 (Token Extensions) is backward compatible with these instruction types
@@ -86,13 +88,93 @@ export const TOKEN_INSTRUCTION_LAYOUTS = Object.freeze({
   UiAmountToAmount: {
     index: 24,
   },
-  WithdrawExcessLamports: {
-    index: 38,
+  // Token-2022 Extension Instructions
+  InitializeMintCloseAuthority: {
+    index: 25,
   },
-  UnwrapLamports: {
-    index: 45,
+  TransferFeeExtension: {
+    index: 26,
+    // Used for TransferCheckedWithFee operations
+    // Sub-instructions: InitializeTransferFeeConfig(0), TransferCheckedWithFee(1), etc.
   },
-  Batch: {
-    index: 255,
+  WithdrawExcessLamports: {
+    index: 38,
   },
 })
+
+/**
+ * TransferFeeExtension sub-instruction types
+ */
+export const TRANSFER_FEE_SUB_INSTRUCTIONS = Object.freeze({
+  InitializeTransferFeeConfig: 0,
+  TransferCheckedWithFee: 1,
+  WithdrawWithheldTokensFromMint: 2,
+  WithdrawWithheldTokensFromAccounts: 3,
+  HarvestWithheldTokensToMint: 4,
+  SetTransferFee: 5,
+})
+
+/**
+ * Token Instruction class
+ */
+export const TokenInstruction = {
+  /**
+   * Decode raw SPL Token instruction data (for use in parseTxBuffer)
+   * @param {Buffer} data - Instruction data buffer
+   * @returns {Object} Decoded instruction data with amount, method, and optional decimals/fee
+   */
+  decodeInstructionData(data) {
+    // Ensure we have a Buffer to work with
+    const buffer = Buffer.from(data)
+
+    if (buffer.length < 9) throw new Error('Instruction data too short for SPL transfer')
+
+    const instructionType = buffer[0]
+
+    // Handle TransferFeeExtension (Token-2022 instruction 26)
+    if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.TransferFeeExtension.index) {
+      // TransferFeeExtension has a sub-instruction type at byte 1
+      if (buffer.length < 2) throw new Error('Instruction data too short for TransferFeeExtension')
+
+      const subInstructionType = buffer[1]
+      // TransferCheckedWithFee sub-instruction (1)
+      if (subInstructionType === TRANSFER_FEE_SUB_INSTRUCTIONS.TransferCheckedWithFee) {
+        // Format: [26, 1, amount(8), decimals(1), fee(8)]
+        if (buffer.length < 18) {
+          throw new Error('Instruction data too short for transferCheckedWithFee')
+        }
+
+        const amountBytes = buffer.slice(2, 10)
+        const amountBN = new BN(amountBytes, 'le')
+        const decimals = buffer[10]
+        const feeBytes = buffer.slice(11, 19)
+        const feeBN = new BN(feeBytes, 'le')
+
+        return {
+          amount: amountBN,
+          method: 'transferCheckedWithFee',
+          decimals,
+          fee: feeBN,
+        }
+      }
+
+      // Other TransferFeeExtension sub-instructions not supported yet
+      throw new Error(`Unsupported TransferFeeExtension sub-instruction: ${subInstructionType}`)
+    }
+
+    const amountBytes = buffer.slice(1, 9)
+    const amountBN = new BN(amountBytes, 'le')
+
+    if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.Transfer.index) {
+      return { amount: amountBN, method: 'transfer' }
+    }
+
+    if (instructionType === TOKEN_INSTRUCTION_LAYOUTS.TransferChecked.index) {
+      if (buffer.length < 10) throw new Error('Instruction data too short for transferChecked')
+      const decimals = buffer[9]
+      return { amount: amountBN, method: 'transferChecked', decimals }
+    }
+
+    throw new Error(`Unsupported instruction type: ${instructionType}`)
+  },
+}