@exodus/solana-api 3.17.4 → 3.18.1

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 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-api@3.18.0...@exodus/solana-api@3.18.1) (2025-05-05)
+
+
+### Bug Fixes
+
+
+* fix: SOL reserve and units consumed (#5540)
+
+
+
+## [3.18.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.4...@exodus/solana-api@3.18.0) (2025-05-01)
+
+
+### Features
+
+
+* feat(solana): make shouldUpdateBalanceBeforeHistory configurable (#5544)
+
+
+### Bug Fixes
+
+
+* fix: SOL staking regression (#5539)
+
+
+
 ## [3.17.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.3...@exodus/solana-api@3.17.4) (2025-04-25)
 
 

package/package.json

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

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

@@ -30,6 +30,7 @@ export const createUnsignedTxForSend = async ({
   // staking
   method,
   stakeAddresses,
+  accounts,
   seed,
   pool,
   // <MagicEden>
@@ -119,6 +120,7 @@ export const createUnsignedTxForSend = async ({
   const stakingParams = {
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
   }
@@ -173,8 +175,10 @@ export const createUnsignedTxForSend = async ({
       message,
     })
     if (err) {
-      // we don't throw error here, because we can use this method to estimate fee
-      console.log('SOL estimate unitsConsumed err:', JSON.stringify(err))
+      // we use this method to compute unitsConsumed
+      // we can throw error here and fallback to ~0.02 SOL or estimate fee based on the method
+      console.log('error getting units consumed:', err)
+      throw new Error(err)
     }
 
     return unitsConsumed + CU_FOR_COMPUTE_BUDGET_INSTRUCTIONS

package/src/get-fees.js

@@ -3,7 +3,7 @@ import assert from 'minimalistic-assert'
 
 import { createUnsignedTxForSend } from './create-unsigned-tx-for-send.js'
 
-const DEFAULT_RESERVE_FEE = '0.01' // SOL
+const DEFAULT_SAFE_FEE = '0.0025' // SOL (enough for rent exemption)
 
 export const getFeeAsyncFactory = ({ api }) => {
   assert(api, 'api is required')
@@ -37,16 +37,18 @@ export const getFeeAsyncFactory = ({ api }) => {
         for (const [addr, info] of Object.entries(stakingInfo.accounts || {})) {
           if (method === 'undelegate' && (info.state === 'active' || info.state === 'activating'))
             stakeAddresses.push(addr)
-          if (method === 'withdraw' && info.state === 'inactive') stakeAddresses.push(addr)
         }
 
         rest.stakeAddresses = stakeAddresses
+        rest.accounts = stakingInfo.accounts
+
         amount =
           method === 'undelegate'
             ? stakingInfo.locked // unstake all
             : method === 'withdraw'
               ? stakingInfo.withdrawable // withdraw all
               : amount
+        // withdraw won't use amount, will extract it from accounts
       }
 
       try {
@@ -64,7 +66,8 @@ export const getFeeAsyncFactory = ({ api }) => {
       } catch (err) {
         console.log('error computing right SOL fee:', err)
         // simulating a tx will fail if the user has not enough balance
-        fee = asset.feeAsset.currency.defaultUnit(DEFAULT_RESERVE_FEE)
+        // we fallback to a default fee (but we could leave some dust)
+        fee = asset.feeAsset.currency.defaultUnit(DEFAULT_SAFE_FEE)
       }
     }
 

package/src/index.js

@@ -6,7 +6,7 @@ import { Api } from './api.js'
 
 export { SolanaMonitor } from './tx-log/index.js'
 export { createAccountState } from './account-state.js'
-export { getSolStakedFee, getStakingInfo } from './staking-utils.js'
+export { getStakingInfo } from './staking-utils.js'
 export {
   isSolanaStaking,
   isSolanaUnstaking,

package/src/staking-utils.js

@@ -1,20 +1,3 @@
-/**
- * Generates pending Fee for stake-able asset
- * @param {Object} stakingInfo solana staking information object
- * @param {Object} fee solana asset fee
- *
- */
-export const getSolStakedFee = ({ asset, stakingInfo, fee }) => {
-  const { currency } = asset
-  const { accounts } = stakingInfo
-
-  // TODO: REMOVE this method.. only used in Desktop!
-  // (also this is wrong, accounts must be filtered by state to compute the right fee)
-
-  const allPending = Object.entries(accounts).length
-  return allPending > 0 ? fee.mul(allPending) : currency.ZERO
-}
-
 export const getStakingInfo = (stakingInfo) => {
   return {
     loaded: stakingInfo.loaded,

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

@@ -23,6 +23,7 @@ export class SolanaMonitor extends BaseMonitor {
     ticksBetweenHistoryFetches = TICKS_BETWEEN_HISTORY_FETCHES,
     ticksBetweenStakeFetches = TICKS_BETWEEN_STAKE_FETCHES,
     txsLimit,
+    shouldUpdateBalanceBeforeHistory = true,
     ...args
   }) {
     super(args)
@@ -33,6 +34,7 @@ export class SolanaMonitor extends BaseMonitor {
     this.staking = DEFAULT_REMOTE_CONFIG.staking
     this.ticksBetweenStakeFetches = ticksBetweenStakeFetches
     this.ticksBetweenHistoryFetches = ticksBetweenHistoryFetches
+    this.shouldUpdateBalanceBeforeHistory = shouldUpdateBalanceBeforeHistory
     this.includeUnparsed = includeUnparsed
     this.txsLimit = txsLimit
     this.addHook('before-stop', (...args) => this.beforeStop(...args))
@@ -167,10 +169,9 @@ export class SolanaMonitor extends BaseMonitor {
 
     const shouldUpdateHistory = refresh || isHistoryUpdateTick || balanceChanged
     const shouldUpdateOnlyBalance = balanceChanged && !shouldUpdateHistory
-    const shouldUpdateBalanceBeforeHistory = true
 
     // getHistory is more likely to fail/be rate limited, so we want to update users balance only on a lot of ticks
-    if (shouldUpdateBalanceBeforeHistory || shouldUpdateOnlyBalance) {
+    if (this.shouldUpdateBalanceBeforeHistory || shouldUpdateOnlyBalance) {
       // update all state at once
       await this.updateState({ account, walletAccount, staking })
       await this.emitUnknownTokensEvent({ tokenAccounts })

package/src/tx-send.js

@@ -69,8 +69,7 @@ export const createAndBroadcastTXFactory =
       let data
       if (isStakingTx) {
         data = {
-          ...txLogData.stakingParams,
-          stake: coinAmount.toBaseNumber(),
+          staking: { ...txLogData.stakingParams, stake: coinAmount.toBaseNumber() },
         }
       } else {
         data = Object.create(null)