@exodus/solana-api 3.17.1 → 3.17.3

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.17.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.2...@exodus/solana-api@3.17.3) (2025-04-23)
+
+
+### Bug Fixes
+
+
+* fix: SOL skip unparsed token2022 (#5476)
+
+
+
+## [3.17.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.1...@exodus/solana-api@3.17.2) (2025-04-21)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
 ## [3.17.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.0...@exodus/solana-api@3.17.1) (2025-04-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -30,7 +30,7 @@
     "@exodus/fetch": "^1.7.3",
     "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.10.1",
+    "@exodus/solana-lib": "^3.11.1",
     "@exodus/solana-meta": "^2.0.2",
     "@exodus/timer": "^1.1.1",
     "bn.js": "^4.11.0",
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "f0b2b4a3a3dab9be7d36f6d4118c50204c25f40e",
+  "gitHead": "1838cc73f98e05d63ff8b3f63f3d142386830638",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/api.js

@@ -830,6 +830,8 @@ export class Api {
       const { pubkey, account } = entry
 
       const mint = lodash.get(account, 'data.parsed.info.mint')
+      if (!mint) continue // not a token account (or cannot be parsed)
+
       const token = this.getTokenByAddress(mint) || {
         name: 'unknown',
         ticker: 'UNKNOWN',

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

@@ -172,7 +172,11 @@ export const createUnsignedTxForSend = async ({
     const { unitsConsumed, err } = await api.simulateUnsignedTransaction({
       message,
     })
-    if (err) throw new Error(JSON.stringify(err))
+    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))
+    }
+
     return unitsConsumed + CU_FOR_COMPUTE_BUDGET_INSTRUCTIONS
   }
 

package/src/get-balances.js

@@ -3,19 +3,17 @@ import { TxSet } from '@exodus/models'
 // staking may be a feature that may not be available for a given wallet.
 // In this case, The wallet should exclude the staking balance from the general balance
 
-const DEFAULT_STAKING_RESERVE = 0.01 * 1_000_000_000
-
 export const getBalancesFactory =
   ({ stakingFeatureAvailable, allowSendingAll }) =>
   ({ asset, accountState, txLog }) => {
     const zero = asset.currency.ZERO
-    const defaultStakingReserve = asset.currency.baseUnit(DEFAULT_STAKING_RESERVE)
 
-    const { balance, locked, withdrawable, pending } = fixBalances({
+    const { balance, locked, activating, withdrawable, pending } = fixBalances({
       txLog,
       balance: getBalanceFromAccountState({ asset, accountState }),
       locked: accountState.stakingInfo?.locked || zero,
       withdrawable: accountState.stakingInfo?.withdrawable || zero,
+      activating: accountState.stakingInfo?.activating || zero,
       pending: accountState.stakingInfo?.pending || zero,
       asset,
     })
@@ -40,29 +38,21 @@ export const getBalancesFactory =
 
     // there is no wallet reserve when there are no tokens nor staking actions. Just network reserve for the rent exempt amount.
     const needsReserve =
-      hasStakedFunds({ locked, withdrawable, pending }) || hasTokensBalance({ accountState })
+      hasStakedFunds({ locked, activating, withdrawable, pending }) ||
+      hasTokensBalance({ accountState })
 
     const rentExemptAmountConditional =
       (accountState.accountSize > 0 ? accountState.rentExemptAmount : zero) || zero
     const networkReserve = allowSendingAll && !needsReserve ? zero : rentExemptAmountConditional
 
-    const accountReserve = asset.accountReserve || zero
-
-    const walletReserve = needsReserve ? accountReserve.sub(networkReserve).clampLowerZero() : zero
-
-    const spendable = balanceWithoutStaking.sub(walletReserve).sub(networkReserve).clampLowerZero()
+    const spendable = balanceWithoutStaking.sub(networkReserve).clampLowerZero()
 
-    // leave enough sol for staking when the reserve is set to 0
-    // FIXME: should be able to get total stakeable balance dynamically
-    // instead of hardcoding a reserve value.
-    const stakeable = walletReserve.isZero
-      ? spendable.sub(defaultStakingReserve).clampLowerZero()
-      : spendable
+    const stakeable = spendable
 
     const staked = locked
     const unstaking = pending
 
-    const staking = accountState.activating || zero
+    const staking = activating || zero
 
     return {
       // legacy
@@ -76,11 +66,19 @@ export const getBalancesFactory =
       staking,
       unstaking,
       networkReserve,
-      walletReserve,
+      walletReserve: zero,
     }
   }
 
-const fixBalances = ({ txLog = TxSet.EMPTY, balance, locked, withdrawable, pending, asset }) => {
+const fixBalances = ({
+  txLog = TxSet.EMPTY,
+  balance,
+  locked,
+  withdrawable,
+  activating,
+  pending,
+  asset,
+}) => {
   for (const tx of txLog) {
     if ((tx.sent || tx.data.staking) && tx.pending && !tx.error) {
       if (tx.coinAmount.unitType.equals(tx.feeAmount.unitType)) {
@@ -112,6 +110,7 @@ const fixBalances = ({ txLog = TxSet.EMPTY, balance, locked, withdrawable, pendi
     balance: balance.clampLowerZero(),
     locked: locked.clampLowerZero(),
     withdrawable: withdrawable.clampLowerZero(),
+    activating: activating.clampLowerZero(),
     pending: pending.clampLowerZero(),
   }
 }
@@ -124,8 +123,8 @@ const getBalanceFromAccountState = ({ asset, accountState }) => {
   )
 }
 
-const hasStakedFunds = ({ locked, withdrawable, pending }) =>
-  [locked, withdrawable, pending].some((amount) => amount.isPositive)
+const hasStakedFunds = ({ locked, activating, withdrawable, pending }) =>
+  [locked, activating, withdrawable, pending].some((amount) => amount.isPositive)
 
 const hasTokensBalance = ({ accountState }) =>
   Object.values(accountState?.tokenBalances || {}).some((balance) => balance.isPositive)

package/src/get-fees.js

@@ -1,23 +1,74 @@
+/* eslint-disable @exodus/mutable/no-param-reassign-prop-only */
 import assert from 'minimalistic-assert'
 
 import { createUnsignedTxForSend } from './create-unsigned-tx-for-send.js'
 
+const DEFAULT_RESERVE_FEE = '0.01' // SOL
+
 export const getFeeAsyncFactory = ({ api }) => {
   assert(api, 'api is required')
-  return async ({ asset, feeData, unsignedTx: providedUnsignedTx, amount, toAddress, ...rest }) => {
-    const unsignedTx =
-      providedUnsignedTx ||
-      (await createUnsignedTxForSend({
-        asset,
-        feeData,
-        api,
-        amount: amount ?? asset.currency.baseUnit(1),
-        toAddress: toAddress ?? rest.fromAddress,
-        useFeePayer: false,
-        ...rest,
-      }))
-
-    return { fee: asset.feeAsset.currency.baseUnit(unsignedTx.txMeta.fee), unsignedTx }
+  return async ({
+    asset,
+    method,
+    feeData,
+    unsignedTx: providedUnsignedTx,
+    amount,
+    toAddress,
+    stakingInfo,
+    ...rest
+  }) => {
+    let fee, unsignedTx
+
+    if (providedUnsignedTx) {
+      unsignedTx = providedUnsignedTx
+      fee = asset.feeAsset.currency.baseUnit(unsignedTx.txMeta.fee)
+    } else {
+      if (['delegate', 'undelegate', 'withdraw'].includes(method)) {
+        assert(stakingInfo, 'stakingInfo is required for staking txs')
+        assert(rest.fromAddress, 'fromAddress is required for staking txs')
+        assert(feeData, 'feeData is required for staking txs')
+
+        // staking params
+        rest.method = method
+        rest.seed = `exodus:${Date.now()}` // unique seed
+        rest.pool = stakingInfo.staking.pool
+
+        const stakeAddresses = []
+        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
+        amount =
+          method === 'undelegate'
+            ? stakingInfo.locked // unstake all
+            : method === 'withdraw'
+              ? stakingInfo.withdrawable // withdraw all
+              : amount
+      }
+
+      try {
+        unsignedTx = await createUnsignedTxForSend({
+          asset,
+          feeData,
+          api,
+          amount: amount ?? asset.currency.baseUnit(1),
+          toAddress: toAddress ?? rest.fromAddress,
+          useFeePayer: false,
+          ...rest,
+        })
+
+        fee = asset.feeAsset.currency.baseUnit(unsignedTx.txMeta.fee)
+      } 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)
+      }
+    }
+
+    return { fee, unsignedTx }
   }
 }
 

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, getUnstakingFee } from './staking-utils.js'
+export { getSolStakedFee, getStakingInfo } from './staking-utils.js'
 export {
   isSolanaStaking,
   isSolanaUnstaking,

package/src/staking-utils.js

@@ -8,6 +8,9 @@ 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
 }
@@ -25,8 +28,3 @@ export const getStakingInfo = (stakingInfo) => {
     earned: stakingInfo.earned,
   }
 }
-
-export const getUnstakingFee = ({ asset, fee, accountState }) => {
-  const stakingInfo = getStakingInfo(accountState.stakingInfo ?? {})
-  return getSolStakedFee({ asset, stakingInfo, fee })
-}