@exodus/solana-api 3.30.4 → 3.30.5

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.30.5](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.30.4...@exodus/solana-api@3.30.5) (2026-03-27)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
 ## [3.30.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.30.3...@exodus/solana-api@3.30.4) (2026-03-25)
 
 **Note:** Version bump only for package @exodus/solana-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.30.4",
+  "version": "3.30.5",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -33,7 +33,7 @@
     "@exodus/fetch": "^1.7.3",
     "@exodus/models": "^13.0.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.20.1",
+    "@exodus/solana-lib": "^3.22.2",
     "@exodus/solana-meta": "^2.0.2",
     "@exodus/timer": "^1.1.1",
     "debug": "^4.1.1",
@@ -49,7 +49,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "49d472ae5c602ba68329227e0e0cd3a9b4568fba",
+  "gitHead": "07a8157aec179f656835db50568127788d4b91b6",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/index.js

@@ -33,5 +33,5 @@ const serverApi = new Api({ assets }) // TODO: remove it, clean every use from p
 export default serverApi // TODO: remove it
 
 export { Api } from './api.js'
-export { WsApi } from './ws-api.js'
+export { WsApi, normalizeTransactionNotificationResult } from './ws-api.js'
 export { ClarityApi } from './clarity-api.js'

package/src/tx-log/ws-monitor.js

@@ -2,6 +2,7 @@ import delay from 'delay'
 import assert from 'minimalistic-assert'
 
 import { DEFAULT_POOL_ADDRESS } from '../account-state.js'
+import { normalizeTransactionNotificationResult } from '../ws-api.js'
 import { SolanaClarityMonitor } from './clarity-monitor.js'
 
 const DEFAULT_REMOTE_CONFIG = {
@@ -251,9 +252,8 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
         // Populate tokenAccountsByOwner from this tx first (e.g. new ATA created in same tx)
         // so we can parse and update history; otherwise "cannot parse tx" would trigger for new receives
-        const rawTransaction =
-          data.params.result?.value?.transaction ?? data.params.result?.transaction
-        const txTokenAccounts = this.wsApi.getTokenAccountsFromTxMeta(rawTransaction, address)
+        const txDetails = normalizeTransactionNotificationResult(data.params.result)
+        const txTokenAccounts = this.wsApi.getTokenAccountsFromTxMeta(txDetails, address)
         let tokenAccountsByOwnerList = this.tokenAccountsByOwner[walletAccount] || []
         for (const txAcc of txTokenAccounts) {
           if (
@@ -295,7 +295,8 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
           assets: this.assets,
           tokens: this.clarityApi.tokens,
           tokenAccountsByOwner: tokenAccountsByOwnerList,
-          result: data.params.result, // raw tx
+          result: data.params.result,
+          txDetails,
         })
 
         if (Object.keys(logItemsByAsset).length === 0) return // cannot parse tx
@@ -321,7 +322,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
         // Update token balances from this tx's postTokenBalances so the first receive shows the
         // correct balance even when accountNotification was missed (we subscribe after the tx is
         // processed, so the balance-change notification can already have been sent).
-        const postTokenBalances = rawTransaction?.meta?.postTokenBalances ?? []
+        const postTokenBalances = txDetails?.meta?.postTokenBalances ?? []
         const tokenBalancesFromTx = {}
         for (const b of postTokenBalances) {
           if (b.owner !== address) continue

package/src/ws-api.js

@@ -1,4 +1,11 @@
-import { PublicKey, Token, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, U64 } from '@exodus/solana-lib'
+import {
+  isTokenProgram,
+  PublicKey,
+  Token,
+  TOKEN_2022_PROGRAM_ID,
+  TOKEN_PROGRAM_ID,
+  U64,
+} from '@exodus/solana-lib'
 import lodash from 'lodash'
 
 import { Connection } from './connection.js'
@@ -11,6 +18,42 @@ import { isSolAddressPoisoningTx } from './txs-utils.js'
 // Helius Enhanced WebSocket (https://www.helius.dev/docs/enhanced-websockets)
 const HELIUS_WS_URL = 'wss://solana-helius-wss.a.exodus.io/ws'
 
+/**
+ * Normalize `transactionSubscribe` / JSON-RPC `params.result` into `getTransaction`-shaped txDetails:
+ * `{ slot?, transaction: { message, signatures }, meta }`.
+ *
+ * - **Triton Whirligig:** `result.value.transaction` is often `{ meta, transaction: { message, signatures }, ... }`.
+ * - **Helius / std RPC:** `meta` may be a sibling of `transaction` (same layout as `getTransaction`).
+ *
+ * Use this for any WS path that needs meta, inner instructions, or token balances — not only
+ * `parseTransaction`.
+ *
+ * @returns { { slot?: number, meta: object, transaction: { message: object, signatures: string[] } } | undefined }
+ */
+export function normalizeTransactionNotificationResult(result) {
+  const rawFromValue = result?.value?.transaction
+  const rawFromRoot = result?.transaction
+  const candidate = rawFromValue ?? rawFromRoot
+
+  const isBareTransactionBody =
+    candidate != null &&
+    result?.meta != null &&
+    candidate.meta == null &&
+    candidate.message != null &&
+    Array.isArray(candidate.signatures)
+
+  const txDetails = isBareTransactionBody
+    ? { meta: result.meta, transaction: candidate }
+    : candidate
+
+  const slot = result?.slot ?? result?.value?.slot
+  if (txDetails == null || slot == null || txDetails.slot != null) {
+    return txDetails
+  }
+
+  return { ...txDetails, slot }
+}
+
 export class WsApi {
   constructor({ rpcUrl, wsUrl, assets }) {
     this.setWsEndpoint(wsUrl)
@@ -313,10 +356,7 @@ export class WsApi {
     if (!value) return null
     const { pubkey, account } = value
     if (!account || !pubkey) return null
-    const isTokenProgram =
-      account.owner === TOKEN_PROGRAM_ID.toBase58() ||
-      account.owner === TOKEN_2022_PROGRAM_ID.toBase58()
-    if (!isTokenProgram) return null
+    if (!isTokenProgram(account.owner)) return null
 
     let owner
     let mintAddress
@@ -359,11 +399,8 @@ export class WsApi {
       return { solAddress: address, amount }
     }
 
-    const isSplTokenAccount = value.owner === TOKEN_PROGRAM_ID.toBase58()
-    const isSpl2022TokenAccount = value.owner === TOKEN_2022_PROGRAM_ID.toBase58()
-
     // SPL Token balance changed (both spl-token and spl-2022 have the first 165 bytes the same)
-    if (isSplTokenAccount || isSpl2022TokenAccount) {
+    if (isTokenProgram(value.owner)) {
       // Handle jsonParsed encoding (data is an object with parsed info)
       if (value.data?.parsed?.info) {
         const parsed = value.data.parsed.info
@@ -392,10 +429,12 @@ export class WsApi {
    * Derive token account entries from a transaction's meta (postTokenBalances / preTokenBalances)
    * for the given owner address. Use this to augment tokenAccountsByOwner when the wallet
    * receives a new ATA in the same tx (transactionNotification often arrives before programNotification).
+   *
+   * @param txDetails - `getTransaction`-shaped object (output of `normalizeTransactionNotificationResult`)
    */
-  getTokenAccountsFromTxMeta(transaction, ownerAddress) {
-    const meta = transaction?.meta
-    const accountKeys = transaction?.transaction?.message?.accountKeys ?? []
+  getTokenAccountsFromTxMeta(txDetails, ownerAddress) {
+    const meta = txDetails?.meta
+    const accountKeys = txDetails?.transaction?.message?.accountKeys ?? []
     const getPubkey = (key) =>
       key && typeof key === 'object' && 'pubkey' in key ? key.pubkey : key
     const balances = [...(meta?.postTokenBalances ?? []), ...(meta?.preTokenBalances ?? [])]
@@ -416,6 +455,11 @@ export class WsApi {
     return [...byAddress.values()]
   }
 
+  /**
+   * @param result - Raw `params.result` from WS (used when `txDetails` is omitted).
+   * @param txDetails - Optional pre-normalized output of `normalizeTransactionNotificationResult(result)`;
+   *   pass this when the caller already computed it (e.g. `getTokenAccountsFromTxMeta`) to avoid duplicate work.
+   */
   parseTransactionNotification({
     address,
     walletAccount,
@@ -424,14 +468,11 @@ export class WsApi {
     tokens,
     tokenAccountsByOwner,
     result,
+    txDetails: txDetailsPreNormalized,
   }) {
-    // Triton: result = { context, value: { transaction } }. Helius: result = { slot, signature, transaction, transactionIndex }.
-    const rawTransaction = result?.value?.transaction ?? result?.transaction
-    if (rawTransaction && result?.slot != null && rawTransaction.slot == null) {
-      rawTransaction.slot = result.slot // Helius puts slot on result, parser expects it on tx
-    }
+    const txDetails = txDetailsPreNormalized ?? normalizeTransactionNotificationResult(result)
 
-    const parsedTx = parseTransaction(address, rawTransaction, tokenAccountsByOwner || [])
+    const parsedTx = parseTransaction(address, txDetails, tokenAccountsByOwner || [])
     const timestamp = Date.now() // the notification event has no blockTime
 
     if (!parsedTx.from && parsedTx.tokenTxs?.length === 0) return { logItemsByAsset: {} } // cannot parse it