@exodus/solana-lib 3.9.5 → 3.10.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.10.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.10.0...@exodus/solana-lib@3.10.1) (2025-04-04)
+
+
+### Bug Fixes
+
+
+* fix(solana): fee payer validation (#5387)
+
+
+
+## [3.10.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.9.5...@exodus/solana-lib@3.10.0) (2025-04-03)
+
+
+### Features
+
+
+* feat(solana): add optional addExternalFeePayerToTransaction (#5345)
+
+
+
 ## [3.9.5](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.9.4...@exodus/solana-lib@3.9.5) (2025-03-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.9.5",
+  "version": "3.10.1",
   "description": "Solana utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -29,6 +29,7 @@
     "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
+    "lodash": "^4.17.11",
     "minimalistic-assert": "^1.0.1"
   },
   "devDependencies": {
@@ -45,5 +46,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "0908ae0c3bd6a7d5bdd91946f88d389037f7d710"
+  "gitHead": "b4ed33112d03cda68ad156c3c455b4168f7abc16"
 }

package/src/constants.js

@@ -9,6 +9,10 @@ export const STAKE_PROGRAM_ID = StakeProgram.programId
 
 export const TOKEN_PROGRAM_ID = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA')
 
+export const COMPUTE_BUDGET_PROGRAM_ID = new PublicKey(
+  'ComputeBudget111111111111111111111111111111'
+)
+
 export const TOKEN_2022_PROGRAM_ID = new PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb')
 
 export const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr')

package/src/tx/common.js

@@ -1,3 +1,4 @@
+import { VersionedTransaction } from '@exodus/solana-web3.js'
 import base58 from 'bs58'
 
 export function isVersionedTransaction(tx) {
@@ -12,6 +13,10 @@ export function transactionToBase58(tx) {
   return base58.encode(tx.serialize())
 }
 
+export function deserializeTransaction(tx) {
+  return VersionedTransaction.deserialize(tx)
+}
+
 export function getTxId(tx) {
   const signature = getFirstSignature(tx)
   if (signature === null) {

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

@@ -6,6 +6,7 @@ export function createUnsignedTx({
   fee,
   feeData,
   recentBlockhash,
+  useFeePayer,
   // Tokens related:
   tokenMintAddress,
   destinationAddressType,
@@ -73,6 +74,7 @@ export function createUnsignedTx({
     },
     txMeta: {
       assetName: asset.name,
+      useFeePayer,
     },
   }
 }

package/src/tx/index.js

@@ -7,4 +7,6 @@ export * from './decode-tx-instructions.js'
 export * from './build-raw-transaction.js'
 export * from './sign-hardware.js'
 export * from './prepare-for-signing.js'
-export { transactionToBase58 } from './common.js'
+export * from './verify-only-fee-payer-changed.js'
+export * from './parse-tx-buffer.js'
+export { transactionToBase58, deserializeTransaction } from './common.js'

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

@@ -0,0 +1,136 @@
+import BN from 'bn.js'
+import bs58 from 'bs58'
+
+import { COMPUTE_BUDGET_PROGRAM_ID, SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID } from '../constants.js'
+import { deserializeTransaction } from './common.js'
+
+function decodeSPLTransferData(base58Data) {
+  const buffer = bs58.decode(base58Data)
+
+  // 1 byte
+  if (buffer[0] !== 3) {
+    throw new Error(`Unsupported instruction type: ${buffer[0]}`)
+  }
+
+  const amountBytes = buffer.slice(1, 9)
+  const amountBN = new BN(amountBytes, 'le')
+
+  return { amount: amountBN, method: 'transfer' }
+}
+
+function decodeSystemTransferData(base58Data) {
+  const buffer = bs58.decode(base58Data)
+
+  // 4 bytes
+  if (buffer.readUInt32LE(0) !== 2) {
+    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',
+  }
+}
+
+// TODO support more tx types/options
+export function isTokenTransfer(tx) {
+  const { message } = tx
+  const { accountKeys, instructions } = message
+
+  if (!Array.isArray(accountKeys) || accountKeys.length !== 6) return false
+  if (!Array.isArray(instructions) || instructions.length !== 3) return false
+
+  const [ix1, ix2, ix3] = instructions
+  if (
+    !accountKeys[ix1.programIdIndex].equals(COMPUTE_BUDGET_PROGRAM_ID) ||
+    !accountKeys[ix2.programIdIndex].equals(COMPUTE_BUDGET_PROGRAM_ID)
+  ) {
+    return false
+  }
+
+  if (!accountKeys[ix3.programIdIndex].equals(TOKEN_PROGRAM_ID)) return false
+
+  if (!Array.isArray(ix3.accounts) || ix3.accounts.length !== 3) return false
+
+  try {
+    const data = bs58.decode(ix3.data)
+    if (data[0] !== 0x03) return false
+  } catch {
+    return false
+  }
+
+  return true
+}
+
+export function isSolanaTransfer(tx) {
+  const { message } = tx
+  const { accountKeys, instructions } = message
+
+  if (!Array.isArray(accountKeys) || accountKeys.length !== 5) return false
+  if (!Array.isArray(instructions) || instructions.length !== 3) return false
+
+  if (
+    !accountKeys[instructions[0].programIdIndex].equals(COMPUTE_BUDGET_PROGRAM_ID) ||
+    !accountKeys[instructions[1].programIdIndex].equals(COMPUTE_BUDGET_PROGRAM_ID)
+  ) {
+    return false
+  }
+
+  const ix = instructions[2]
+  if (!accountKeys[ix.programIdIndex].equals(SYSTEM_PROGRAM_ID)) return false
+
+  if (!Array.isArray(ix.accounts) || ix.accounts.length !== 2) return false
+
+  try {
+    const data = bs58.decode(ix.data)
+    if (data[0] !== 0x02) return false
+  } catch {
+    return false
+  }
+
+  return true
+}
+
+// TODO: Unify with parseTransaction in solana-api and use there as well?
+// TODO: support more tx types.
+export async function parseTxBuffer(buffer, api) {
+  const transaction = deserializeTransaction(buffer)
+
+  try {
+    if (isTokenTransfer(transaction)) {
+      const mainInstruction = transaction.message.instructions[2]
+      const { amount, method } = decodeSPLTransferData(mainInstruction.data)
+
+      const fromTokenAddress =
+        transaction.message.accountKeys[mainInstruction.accounts[0]].toBase58()
+      const toTokenAddress = transaction.message.accountKeys[mainInstruction.accounts[1]].toBase58()
+      const from = await api.getTokenAddressOwner(fromTokenAddress)
+      const to = await api.getTokenAddressOwner(toTokenAddress)
+      return {
+        method,
+        from,
+        to,
+        amount,
+      }
+    }
+
+    if (isSolanaTransfer(transaction)) {
+      const mainInstruction = transaction.message.instructions[2]
+      const { amount, method } = decodeSystemTransferData(mainInstruction.data)
+
+      return {
+        method,
+        from: transaction.message.accountKeys[mainInstruction.accounts[0]],
+        to: transaction.message.accountKeys[mainInstruction.accounts[1]],
+        amount,
+      }
+    }
+  } catch (error) {
+    console.log('transaction check error', error)
+  }
+
+  throw new Error('Transaction not supported for buffer parsing')
+}

package/src/tx/verify-only-fee-payer-changed.js

@@ -0,0 +1,104 @@
+import lodash from 'lodash'
+import assert from 'minimalistic-assert'
+
+export function verifyOnlyFeePayerChanged(beforeTx, afterTx) {
+  assert(
+    beforeTx.signatures.length + 1 === afterTx.signatures.length &&
+      beforeTx.message.header.numRequiredSignatures + 1 ===
+        afterTx.message.header.numRequiredSignatures,
+    'A signature was not added for the new signer'
+  )
+  beforeTx.signatures.forEach((signature, index) => {
+    assert(
+      lodash.isEqual(signature, afterTx.signatures[index + 1]),
+      'Existing signatures do not match'
+    )
+  })
+  assert(
+    beforeTx.message.accountKeys.length + 1 === afterTx.message.accountKeys.length,
+    'Fee payer account key was not added'
+  )
+  beforeTx.message.accountKeys.forEach((accountKey, index) => {
+    assert(
+      lodash.isEqual(accountKey, afterTx.message.accountKeys[index + 1]),
+      'Existing account keys do not match'
+    )
+  })
+
+  assert(
+    beforeTx.message.instructions.length === afterTx.message.instructions.length,
+    'No new instructions are allowed'
+  )
+
+  beforeTx.message.instructions.forEach(({ programIdIndex }, index) => {
+    assert(
+      programIdIndex + 1 === afterTx.message.instructions[index]?.programIdIndex,
+      'Instructions program ids were not updated'
+    )
+  })
+
+  beforeTx.message.instructions.forEach(({ accounts }, index) => {
+    assert(
+      lodash.isEqual(
+        accounts.map((id) => id + 1),
+        afterTx.message.instructions[index].accounts
+      ),
+      'Instructions account key indexes were not updated'
+    )
+  })
+
+  beforeTx.message.instructions.forEach((instruction, index) => {
+    assert(
+      lodash.isEqual(
+        { ...instruction, accounts: null, programIdIndex: null },
+        {
+          ...afterTx.message.instructions[index],
+          accounts: null,
+          programIdIndex: null,
+        }
+      ),
+      'Instructions do not match in some attributes'
+    )
+  })
+
+  afterTx.message.indexToProgramIds.forEach((value, key) => {
+    assert(afterTx.message.accountKeys[key] === value, 'IndexToProgramIds do not match accountKeys')
+  })
+
+  assert(
+    lodash.isEqual(
+      {
+        ...beforeTx,
+        signatures: null,
+        message: null,
+      },
+      {
+        ...afterTx,
+
+        signatures: null,
+        message: null,
+      }
+    ),
+    'Transactions do not match in some attributes'
+  )
+
+  assert(
+    lodash.isEqual(
+      {
+        ...beforeTx.message,
+        header: { ...beforeTx.message.header, numRequiredSignatures: null },
+        accountKeys: null,
+        instructions: null,
+        indexToProgramIds: null,
+      },
+      {
+        ...afterTx.message,
+        header: { ...afterTx.message.header, numRequiredSignatures: null },
+        accountKeys: null,
+        instructions: null,
+        indexToProgramIds: null,
+      }
+    ),
+    'Transactions do not match in some attributes'
+  )
+}