@exodus/solana-api 3.27.2 → 3.27.4

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.27.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.27.3...@exodus/solana-api@3.27.4) (2026-01-15)
+
+
+### Bug Fixes
+
+
+* fix: SOL unconfirmed withdrawable balance (#7274)
+
+
+
+## [3.27.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.27.2...@exodus/solana-api@3.27.3) (2026-01-13)
+
+
+### Bug Fixes
+
+
+* fix: SOL clarity integration for txs (#7256)
+
+
+
 ## [3.27.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.27.1...@exodus/solana-api@3.27.2) (2026-01-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.27.2",
+  "version": "3.27.4",
   "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": "f12ac3b153051649bd7c8c3f23fb3653c1ec5a55",
+  "gitHead": "c617d7eefb871a0ee8f174cccc56c42c20203b01",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/get-balances.js

@@ -113,6 +113,7 @@ const fixBalances = ({
           activating = activating.add(stakeAmount.abs())
           break
         case 'withdraw':
+          unconfirmedSent = unconfirmedSent.add(withdrawable)
           withdrawable = asset.currency.ZERO
           break
         case 'undelegate':

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

@@ -18,7 +18,8 @@ const TX_STALE_AFTER = ms('2m') // mark txs as dropped after N minutes
 
 export class SolanaClarityMonitor extends BaseMonitor {
   constructor({
-    api,
+    clarityApi,
+    rpcApi,
     includeUnparsed = false,
     ticksBetweenHistoryFetches = TICKS_BETWEEN_HISTORY_FETCHES,
     ticksBetweenStakeFetches = TICKS_BETWEEN_STAKE_FETCHES,
@@ -27,8 +28,9 @@ export class SolanaClarityMonitor extends BaseMonitor {
     ...args
   }) {
     super(args)
-    assert(api, 'api is required')
-    this.api = api
+    assert(clarityApi, 'clarityApi is required')
+    this.clarityApi = clarityApi
+    this.rpcApi = rpcApi
     this.cursors = Object.create(null)
     this.assets = Object.create(null)
     this.staking = DEFAULT_REMOTE_CONFIG.staking
@@ -45,8 +47,8 @@ export class SolanaClarityMonitor extends BaseMonitor {
       clarityUrl,
       staking = Object.create(null),
     } = { ...DEFAULT_REMOTE_CONFIG, ...config }
-    this.api.setRpcServer(rpcUrl[0])
-    this.api.setClarityServer(clarityUrl[0])
+    this.clarityApi.setRpcServer(rpcUrl[0])
+    this.clarityApi.setClarityServer(clarityUrl[0])
     this.staking = staking
   }
 
@@ -56,9 +58,9 @@ export class SolanaClarityMonitor extends BaseMonitor {
   }
 
   async emitUnknownTokensEvent({ tokenAccounts }) {
-    const tokensList = await this.api.getWalletTokensList({ tokenAccounts })
+    const tokensList = await this.clarityApi.getWalletTokensList({ tokenAccounts })
     const unknownTokensList = tokensList.filter((mintAddress) => {
-      return !this.api.tokens.has(mintAddress)
+      return !this.clarityApi.tokens.has(mintAddress)
     })
     if (unknownTokensList.length > 0) {
       this.emit('unknown-tokens', unknownTokensList)
@@ -112,7 +114,7 @@ export class SolanaClarityMonitor extends BaseMonitor {
   async tick({ walletAccount, refresh }) {
     const assetName = this.asset.name
     this.assets = await this.aci.getAssetsForNetwork({ baseAssetName: assetName })
-    this.api.setTokens(this.assets)
+    this.clarityApi.setTokens(this.assets)
 
     const accountState = await this.aci.getAccountState({ assetName, walletAccount })
     const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
@@ -181,7 +183,9 @@ export class SolanaClarityMonitor extends BaseMonitor {
     const cursor = refresh ? '' : accountState.cursor
     const baseAsset = this.asset
 
-    const { transactions, newCursor } = await this.api.getTransactions(address, {
+    // TODO: switch to this.clarityApi.getTransactions once ready!!
+    // and remove this.rpcApi from constructor and create-asset-utils.js
+    const { transactions, newCursor } = await this.rpcApi.getTransactions(address, {
       cursor,
       includeUnparsed: this.includeUnparsed,
       limit: this.txsLimit,
@@ -192,7 +196,7 @@ export class SolanaClarityMonitor extends BaseMonitor {
     for (const tx of transactions) {
       // we get the token name using the token.mintAddress
       const assetName = tx.token
-        ? this.api.tokens.get(tx.token.mintAddress)?.name ?? 'unknown'
+        ? this.clarityApi.tokens.get(tx.token.mintAddress)?.name ?? 'unknown'
         : baseAsset.name
 
       const asset = this.assets[assetName]
@@ -267,8 +271,8 @@ export class SolanaClarityMonitor extends BaseMonitor {
 
   async getAccountsAndBalances({ refresh, address, accountState, walletAccount }) {
     const [accountInfo, { balances: splBalances, accounts: tokenAccounts }] = await Promise.all([
-      this.api.getAccountInfo(address).catch(() => {}),
-      this.api.getTokensBalancesAndAccounts({
+      this.clarityApi.getAccountInfo(address).catch(() => {}),
+      this.clarityApi.getTokensBalancesAndAccounts({
         address,
       }),
     ])
@@ -278,19 +282,19 @@ export class SolanaClarityMonitor extends BaseMonitor {
     const accountSize = accountInfo?.space || 0
 
     const rentExemptAmount = this.asset.currency.baseUnit(
-      await this.api.getMinimumBalanceForRentExemption(accountSize)
+      await this.clarityApi.getMinimumBalanceForRentExemption(accountSize)
     )
 
-    const ownerChanged = await this.api.ownerChanged(address, accountInfo)
+    const ownerChanged = await this.clarityApi.ownerChanged(address, accountInfo)
 
     // we can have splBalances for tokens that are not in our asset list
     const clientKnownTokens = omitBy(splBalances, (v, mintAddress) => {
-      const tokenName = this.api.tokens.get(mintAddress)?.name
+      const tokenName = this.clarityApi.tokens.get(mintAddress)?.name
       return !this.assets[tokenName]
     })
     const tokenBalances = Object.fromEntries(
       Object.entries(clientKnownTokens).map(([mintAddress, balance]) => {
-        const tokenName = this.api.tokens.get(mintAddress)?.name
+        const tokenName = this.clarityApi.tokens.get(mintAddress)?.name
         return [tokenName, this.assets[tokenName].currency.baseUnit(balance)]
       })
     )
@@ -352,10 +356,10 @@ export class SolanaClarityMonitor extends BaseMonitor {
   }
 
   async getStakingInfo({ address, accountState, walletAccount }) {
-    const stakingInfo = await this.api.getStakeAccountsInfo(address)
+    const stakingInfo = await this.clarityApi.getStakeAccountsInfo(address)
     let earned = accountState.stakingInfo.earned.toBaseString()
     try {
-      const rewards = await this.api.getRewards(address)
+      const rewards = await this.clarityApi.getRewards(address)
       earned = rewards
     } catch (error) {
       console.warn(error)

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

@@ -13,11 +13,10 @@ const DEFAULT_REMOTE_CONFIG = {
 const TICKS_BETWEEN_HISTORY_FETCHES = 10
 const TICKS_BETWEEN_STAKE_FETCHES = 5
 const TX_STALE_AFTER = ms('2m') // mark txs as dropped after N minutes
-const FORCE_HTTP = true // use https over ws
 
 export class SolanaMonitor extends BaseMonitor {
   constructor({
-    api,
+    rpcApi,
     includeUnparsed = false,
     ticksBetweenHistoryFetches = TICKS_BETWEEN_HISTORY_FETCHES,
     ticksBetweenStakeFetches = TICKS_BETWEEN_STAKE_FETCHES,
@@ -26,8 +25,8 @@ export class SolanaMonitor extends BaseMonitor {
     ...args
   }) {
     super(args)
-    assert(api, 'api is required')
-    this.api = api
+    assert(rpcApi, 'rpcApi is required')
+    this.rpcApi = rpcApi
     this.cursors = {}
     this.assets = {}
     this.staking = DEFAULT_REMOTE_CONFIG.staking
@@ -36,52 +35,11 @@ export class SolanaMonitor extends BaseMonitor {
     this.shouldUpdateBalanceBeforeHistory = shouldUpdateBalanceBeforeHistory
     this.includeUnparsed = includeUnparsed
     this.txsLimit = txsLimit
-    this.addHook('before-stop', (...args) => this.beforeStop(...args))
-  }
-
-  async beforeStop() {
-    const walletAccounts = await this.aci.getWalletAccounts({ assetName: this.asset.name })
-    return Promise.all(walletAccounts.map((walletAccount) => this.stopListener({ walletAccount })))
-  }
-
-  async initWalletAccount({ walletAccount }) {
-    if (this.tickCount[walletAccount] === 0) {
-      await this.startListener({ walletAccount })
-    }
-  }
-
-  async startListener({ walletAccount }) {
-    if (FORCE_HTTP) return null
-
-    const address = await this.aci.getReceiveAddress({
-      assetName: this.asset.name,
-      walletAccount,
-      useCache: true,
-    })
-
-    return this.api.watchAddress({
-      address,
-      onMessage: (json) => {
-        // new SOL tx event, tick monitor with 15 sec delay (to avoid hitting delayed nodes)
-        setTimeout(() => this.tick({ walletAccount }), 15_000)
-      },
-    })
-  }
-
-  async stopListener({ walletAccount }) {
-    if (FORCE_HTTP) return null
-
-    const address = await this.aci.getReceiveAddress({
-      assetName: this.asset.name,
-      walletAccount,
-      useCache: true,
-    })
-    return this.api.unwatchAddress({ address })
   }
 
   setServer(config = {}) {
     const { rpcs, staking = {} } = { ...DEFAULT_REMOTE_CONFIG, ...config }
-    this.api.setServer(rpcs[0])
+    this.rpcApi.setServer(rpcs[0])
     this.staking = staking
   }
 
@@ -91,9 +49,9 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async emitUnknownTokensEvent({ tokenAccounts }) {
-    const tokensList = await this.api.getWalletTokensList({ tokenAccounts })
+    const tokensList = await this.rpcApi.getWalletTokensList({ tokenAccounts })
     const unknownTokensList = tokensList.filter((mintAddress) => {
-      return !this.api.tokens.has(mintAddress)
+      return !this.rpcApi.tokens.has(mintAddress)
     })
     if (unknownTokensList.length > 0) {
       this.emit('unknown-tokens', unknownTokensList)
@@ -127,7 +85,7 @@ export class SolanaMonitor extends BaseMonitor {
   async markStaleTransactions({ walletAccount, logItemsByAsset = Object.create(null) }) {
     // mark stale txs as dropped in logItemsByAsset
     const clearedLogItems = logItemsByAsset
-    const tokenNames = [...this.api.tokens.values()].map(({ name }) => name)
+    const tokenNames = [...this.rpcApi.tokens.values()].map(({ name }) => name)
     const assets = [this.asset.name, ...tokenNames]
 
     for (const assetName of assets) {
@@ -146,12 +104,9 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async tick({ walletAccount, refresh }) {
-    // Check for new wallet account
-    await this.initWalletAccount({ walletAccount })
-
     const assetName = this.asset.name
     this.assets = await this.aci.getAssetsForNetwork({ baseAssetName: assetName })
-    this.api.setTokens(this.assets)
+    this.rpcApi.setTokens(this.assets)
 
     const accountState = await this.aci.getAccountState({ assetName, walletAccount })
     const address = await this.aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
@@ -213,7 +168,7 @@ export class SolanaMonitor extends BaseMonitor {
     const cursor = refresh ? '' : accountState.cursor
     const baseAsset = this.asset
 
-    const { transactions, newCursor } = await this.api.getTransactions(address, {
+    const { transactions, newCursor } = await this.rpcApi.getTransactions(address, {
       cursor,
       includeUnparsed: this.includeUnparsed,
       limit: this.txsLimit,
@@ -224,7 +179,7 @@ export class SolanaMonitor extends BaseMonitor {
     for (const tx of transactions) {
       // we get the token name using the token.mintAddress
       const assetName = tx.token
-        ? this.api.tokens.get(tx.token.mintAddress)?.name ?? 'unknown'
+        ? this.rpcApi.tokens.get(tx.token.mintAddress)?.name ?? 'unknown'
         : baseAsset.name
 
       const asset = this.assets[assetName]
@@ -300,8 +255,8 @@ export class SolanaMonitor extends BaseMonitor {
   async getAccountsAndBalances({ refresh, address, accountState, walletAccount }) {
     const tokens = Object.keys(this.assets).filter((name) => name !== this.asset.name)
     const [accountInfo, { balances: splBalances, accounts: tokenAccounts }] = await Promise.all([
-      this.api.getAccountInfo(address).catch(() => {}),
-      this.api.getTokensBalancesAndAccounts({
+      this.rpcApi.getAccountInfo(address).catch(() => {}),
+      this.rpcApi.getTokensBalancesAndAccounts({
         address,
         filterByTokens: tokens,
       }),
@@ -312,10 +267,10 @@ export class SolanaMonitor extends BaseMonitor {
     const accountSize = accountInfo?.space || 0
 
     const rentExemptAmount = this.asset.currency.baseUnit(
-      await this.api.getMinimumBalanceForRentExemption(accountSize)
+      await this.rpcApi.getMinimumBalanceForRentExemption(accountSize)
     )
 
-    const ownerChanged = await this.api.ownerChanged(address, accountInfo)
+    const ownerChanged = await this.rpcApi.ownerChanged(address, accountInfo)
 
     const tokenBalances = _.mapValues(splBalances, (balance, name) =>
       this.assets[name].currency.baseUnit(balance)
@@ -378,10 +333,10 @@ export class SolanaMonitor extends BaseMonitor {
   }
 
   async getStakingInfo({ address, accountState, walletAccount }) {
-    const stakingInfo = await this.api.getStakeAccountsInfo(address)
+    const stakingInfo = await this.rpcApi.getStakeAccountsInfo(address)
     let earned = accountState.stakingInfo.earned.toBaseString()
     try {
-      const rewards = await this.api.getRewards(address)
+      const rewards = await this.rpcApi.getRewards(address)
       earned = rewards
     } catch (error) {
       console.warn(error)

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

@@ -25,7 +25,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
   async beforeStart() {
     this.assets = await this.aci.getAssetsForNetwork({ baseAssetName: this.asset.name })
-    this.api.setTokens(this.assets)
+    this.clarityApi.setTokens(this.assets)
 
     const walletAccounts = await this.aci.getWalletAccounts({ assetName: this.asset.name })
     await Promise.all(
@@ -49,7 +49,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
       useCache: true,
     })
 
-    const { accounts: tokenAccountsByOwner } = await this.api.getTokensBalancesAndAccounts({
+    const { accounts: tokenAccountsByOwner } = await this.clarityApi.getTokensBalancesAndAccounts({
       address,
     })
     this.tokenAccountsByOwner[walletAccount] = tokenAccountsByOwner
@@ -88,7 +88,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
     const assetName = this.asset.name
     this.assets = await this.aci.getAssetsForNetwork({ baseAssetName: assetName })
-    this.api.setTokens(this.assets)
+    this.clarityApi.setTokens(this.assets)
     const address = await this.aci.getReceiveAddress({
       assetName,
       walletAccount,
@@ -103,7 +103,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
     // we call this periodically to detect new token accounts created (there's not a WS event for this in Helius yet, we need programSubscribe)
     const { accounts: tokenAccounts, balances: splBalances } =
-      await this.api.getTokensBalancesAndAccounts({
+      await this.clarityApi.getTokensBalancesAndAccounts({
         address,
       })
     this.tokenAccountsByOwner[walletAccount] = tokenAccounts
@@ -114,7 +114,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
     // subscribe to new tokenAccounts
     for (const mintAddress of unknownTokensList) {
-      const tokenName = this.api.tokens.get(mintAddress)?.name
+      const tokenName = this.clarityApi.tokens.get(mintAddress)?.name
       if (!tokenName) {
         console.log(`Unknown token mint address: ${mintAddress}`)
         continue
@@ -171,7 +171,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
         // update account state balance for SOL or Token
         if (tokenMintAddress) {
           // token balance changed
-          const tokenName = this.api.tokens.get(tokenMintAddress)?.name
+          const tokenName = this.clarityApi.tokens.get(tokenMintAddress)?.name
           if (!tokenName) {
             console.log(`Unknown token mint address: ${tokenMintAddress}`)
             return
@@ -228,7 +228,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
         // update tx-log with new txs and state with cursor
 
         // NB. if we receive a tx with a new "token", never received before,
-        // this.api.tokens will be populated with new tokens only after we ran a monitor tick
+        // this.clarityApi.tokens will be populated with new tokens only after we ran a monitor tick
         // since the unknown-tokens event is captured and processed in other places.
         // hence what happens is we skip the txLog update for that new token.
 
@@ -237,7 +237,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
           walletAccount,
           baseAsset: this.asset,
           assets: this.assets,
-          tokens: this.api.tokens,
+          tokens: this.clarityApi.tokens,
           tokenAccountsByOwner,
           result: data.params.result, // raw tx
         })
@@ -301,7 +301,7 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
           // because we NEED at a certain point to have an updated stakingInfo in the state to know what's the new solana stake account address.
           const stakingInfo = await this.getStakingInfo({ address, accountState, walletAccount })
           const balance = this.#computeTotalBalance({
-            amount: this.asset.currency.baseUnit(await this.api.getBalance(address)), // we needed the delay otherwise will never be updated right away.
+            amount: this.asset.currency.baseUnit(await this.clarityApi.getBalance(address)), // we needed the delay otherwise will never be updated right away.
             address,
             stakingInfo,
             walletAccount,