@exodus/solana-api 3.29.5 → 3.29.6

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.29.6](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.29.5...@exodus/solana-api@3.29.6) (2026-02-23)
+
+
+### Bug Fixes
+
+
+* fix: remove staking provider param (#7440)
+
+
+
 ## [3.29.5](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.29.4...@exodus/solana-api@3.29.5) (2026-02-14)
 
 **Note:** Version bump only for package @exodus/solana-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.29.5",
+  "version": "3.29.6",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -49,7 +49,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "01daedc61270d2ef4e7b03f984c130346d06922f",
+  "gitHead": "6ac0fce9b0cc8dc2fe3cb5b940f077ec36cfcae3",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/staking/index.js

@@ -5,8 +5,8 @@ import { stakingProviderClientFactory } from './staking-provider-client.js'
 
 export { getStakingInfo } from '../staking-utils.js'
 
-export const stakingApiFactory = ({ assetName, assetClientInterface, stakingProviderClient }) => {
-  const stakingProvider = stakingProviderClient ?? stakingProviderClientFactory()
+export const stakingApiFactory = ({ assetName, assetClientInterface }) => {
+  const stakingProvider = stakingProviderClientFactory()
 
   async function sendStake({
     address,

package/src/ws-api.js

@@ -7,9 +7,9 @@ import { parseTransaction } from './tx-parser.js'
 import { isSolAddressPoisoningTx } from './txs-utils.js'
 
 // Triton Whirligig WebSocket
-const WS_ENDPOINT = 'wss://solana-triton.a.exodus.io/whirligig' // pointing to: wss://exodus-solanama-6db3.mainnet.rpcpool.com/<token>/whirligig
-// Helius Advanced WebSocket
-// const WS_ENDPOINT = 'wss://solana-helius-wss.a.exodus.io/ws' // pointing to: wss://atlas-mainnet.helius-rpc.com/?api-key=<API_KEY>
+const TRITON_WS_ENDPOINT = 'wss://solana-triton.a.exodus.io/whirligig' // pointing to: wss://exodus-solanama-6db3.mainnet.rpcpool.com/<token>/whirligig
+// Helius Enhanced WebSocket (https://www.helius.dev/docs/enhanced-websockets)
+const HELIUS_WS_URL = 'wss://solana-helius-wss.a.exodus.io/ws'
 
 export class WsApi {
   constructor({ rpcUrl, wsUrl, assets }) {
@@ -23,6 +23,7 @@ export class WsApi {
   #resetSubscriptionState() {
     this.accountSubscriptions = Object.create(null)
     this.transactionSubscriptions = Object.create(null)
+    this.programSubscriptions = Object.create(null)
     // subscription id (from RPC response) -> { owner, type: 'account'|'transaction'|'program' }
     this.subscriptionIdToMeta = Object.create(null)
     // request id (our conn.seq) -> { owner, type }, until we receive the subscription id
@@ -30,7 +31,13 @@ export class WsApi {
   }
 
   setWsEndpoint(wsUrl) {
-    this.wsUrl = wsUrl || WS_ENDPOINT
+    this.wsUrl = wsUrl || TRITON_WS_ENDPOINT
+  }
+
+  /** True when using Helius Enhanced WebSocket (different transactionSubscribe params and notification shape). */
+  #isHelius() {
+    if (!this.wsUrl) return false
+    return this.wsUrl.includes('helius') || this.wsUrl === HELIUS_WS_URL
   }
 
   /**
@@ -174,36 +181,79 @@ export class WsApi {
 
     const id = ++conn.seq
     this.pendingSubscriptionRequests[id] = { owner, type: 'transaction' }
+    const options = {
+      commitment: 'confirmed',
+      encoding: 'jsonParsed',
+      transactionDetails: 'full',
+      showRewards: false,
+      maxSupportedTransactionVersion: 255,
+    }
+    const filter = this.#isHelius()
+      ? { accountInclude: difference }
+      : { vote: false, accounts: { include: difference } }
     conn.send({
       jsonrpc: '2.0',
       id,
       method: 'transactionSubscribe',
+      params: [filter, options],
+    })
+    this.transactionSubscriptions[owner] = [...subscriptions, ...difference]
+  }
+
+  async programSubscribe({ owner }) {
+    const conn = this.connection
+    if (!conn || !conn.isOpen) {
+      console.warn('SOL Connection is not open, cannot programSubscribe for', owner)
+      return
+    }
+
+    if (this.programSubscriptions[owner]) return // already subscribed (SPL + Token-2022)
+
+    const splTokenProgramId = TOKEN_PROGRAM_ID.toBase58()
+    const token2022ProgramId = TOKEN_2022_PROGRAM_ID.toBase58()
+    const tokenAccountDataSize = 165
+
+    // SPL Token: fixed 165-byte account size
+    const id1 = ++conn.seq
+    this.pendingSubscriptionRequests[id1] = { owner, type: 'program' }
+    conn.send({
+      jsonrpc: '2.0',
+      id: id1,
+      method: 'programSubscribe',
       params: [
+        splTokenProgramId,
         {
-          vote: false,
-          accounts: {
-            include: difference,
-          },
+          encoding: 'jsonParsed',
+          commitment: 'confirmed',
+          filters: [{ dataSize: tokenAccountDataSize }, { memcmp: { offset: 32, bytes: owner } }],
         },
+      ],
+    })
+
+    // Token-2022: no dataSize filter (accounts can have extensions and be larger than 165 bytes)
+    const id2 = ++conn.seq
+    this.pendingSubscriptionRequests[id2] = { owner, type: 'program' }
+    conn.send({
+      jsonrpc: '2.0',
+      id: id2,
+      method: 'programSubscribe',
+      params: [
+        token2022ProgramId,
         {
-          commitment: 'confirmed',
           encoding: 'jsonParsed',
-          transactionDetails: 'full',
-          showRewards: false,
-          maxSupportedTransactionVersion: 255,
+          commitment: 'confirmed',
+          filters: [{ memcmp: { offset: 32, bytes: owner } }],
         },
       ],
     })
-    this.transactionSubscriptions[owner] = [...subscriptions, ...difference]
+
+    this.programSubscriptions[owner] = true
   }
 
   async sendSubscriptions({ address, tokensAddresses = [] }) {
-    const conn = this.connection
-
     const addresses = [address, ...tokensAddresses]
 
     // 1. subscribe to each addresses (SOL and Token addresses) balance events
-    // transform this forEach in a for of to await each subscription:
     for (const addr of addresses) {
       await this.accountSubscribe({ owner: address, account: addr })
     }
@@ -212,48 +262,7 @@ export class WsApi {
     await this.transactionSubscribe({ owner: address, accounts: addresses })
 
     // 3. subscribe to SPL Token and Token-2022 program account changes to detect new token accounts for this wallet
-    const splTokenProgramId = TOKEN_PROGRAM_ID.toBase58()
-    const token2022ProgramId = TOKEN_2022_PROGRAM_ID.toBase58()
-    const tokenAccountDataSize = 165
-
-    if (conn?.isOpen) {
-      // SPL Token: fixed 165-byte account size
-      const id1 = ++conn.seq
-      this.pendingSubscriptionRequests[id1] = { owner: address, type: 'program' }
-      conn.send({
-        jsonrpc: '2.0',
-        id: id1,
-        method: 'programSubscribe',
-        params: [
-          splTokenProgramId,
-          {
-            encoding: 'jsonParsed',
-            commitment: 'confirmed',
-            filters: [
-              { dataSize: tokenAccountDataSize },
-              { memcmp: { offset: 32, bytes: address } },
-            ],
-          },
-        ],
-      })
-
-      // Token-2022: no dataSize filter (accounts can have extensions and be larger than 165 bytes)
-      const id2 = ++conn.seq
-      this.pendingSubscriptionRequests[id2] = { owner: address, type: 'program' }
-      conn.send({
-        jsonrpc: '2.0',
-        id: id2,
-        method: 'programSubscribe',
-        params: [
-          token2022ProgramId,
-          {
-            encoding: 'jsonParsed',
-            commitment: 'confirmed',
-            filters: [{ memcmp: { offset: 32, bytes: address } }],
-          },
-        ],
-      })
-    }
+    await this.programSubscribe({ owner: address })
   }
 
   async unwatchAddress({ address }) {
@@ -283,6 +292,7 @@ export class WsApi {
     delete this.watchedAddresses[address]
     delete this.accountSubscriptions[address]
     delete this.transactionSubscriptions[address]
+    delete this.programSubscriptions[address]
 
     if (Object.keys(this.watchedAddresses).length === 0 && conn) {
       await conn.stop()
@@ -333,22 +343,27 @@ export class WsApi {
     }
   }
 
+  /**
+   * Parse accountNotification from Triton or Helius.
+   * Triton: params.result = { context, value }. Helius: same shape (result.value = account).
+   */
   parseAccountNotification({ address, walletAccount, tokenAccountsByOwner, result }) {
-    const isSolAccount = result.value.owner === '11111111111111111111111111111111' // System Program
+    const value = result?.value ?? result // support both { context, value } and flat result
+    const isSolAccount = value.owner === '11111111111111111111111111111111' // System Program
     if (isSolAccount) {
       // SOL balance changed
-      const amount = result.value.lamports
+      const amount = value.lamports
       return { solAddress: address, amount }
     }
 
-    const isSplTokenAccount = result.value.owner === TOKEN_PROGRAM_ID.toBase58()
-    const isSpl2022TokenAccount = result.value.owner === TOKEN_2022_PROGRAM_ID.toBase58()
+    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) {
       // Handle jsonParsed encoding (data is an object with parsed info)
-      if (result.value.data?.parsed?.info) {
-        const parsed = result.value.data.parsed.info
+      if (value.data?.parsed?.info) {
+        const parsed = value.data.parsed.info
         return {
           solAddress: parsed.owner,
           amount: parsed.tokenAmount.amount,
@@ -357,7 +372,7 @@ export class WsApi {
       }
 
       // Handle base64 encoding (data is an array: [base64_string, "base64"])
-      const decoded = Token.decode(Buffer.from(result.value.data[0], 'base64'))
+      const decoded = Token.decode(Buffer.from(value.data[0], 'base64'))
       const tokenMintAddress = new PublicKey(decoded.mint).toBase58()
       const solAddress = new PublicKey(decoded.owner).toBase58()
       const amount = U64.fromBuffer(decoded.amount).toString()
@@ -407,7 +422,12 @@ export class WsApi {
     tokenAccountsByOwner,
     result,
   }) {
-    const rawTransaction = result?.value ? result.value.transaction : result.transaction // for Triton Whirligig OR Helius Advanced WS
+    // 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 parsedTx = parseTransaction(address, rawTransaction, tokenAccountsByOwner || [])
     const timestamp = Date.now() // the notification event has no blockTime