@exodus/solana-api 3.11.8 → 3.12.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.11.9...@exodus/solana-api@3.12.0) (2025-01-02)
+
+
+### Features
+
+
+* feat: reduce call of Solana getTokenAccountsByOwner (#4762)
+
+
+
+## [3.11.9](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.11.8...@exodus/solana-api@3.11.9) (2024-12-31)
+
+
+### Bug Fixes
+
+
+* fix: include rentExemptAmount in balance calculation (#4738)
+
+* fix: integration tests (#4720)
+
+
+
 ## [3.11.8](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.11.6...@exodus/solana-api@3.11.8) (2024-12-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.11.8",
+  "version": "3.12.0",
   "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.2.0",
     "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.9.1",
+    "@exodus/solana-lib": "^3.9.3",
     "@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": "46f31ffb8a59f043ca4bd3855c88d6640ca35a1d",
+  "gitHead": "70de901b0d9b85f1045949400105203c700fc223",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/account-state.js

@@ -19,6 +19,7 @@ export const createAccountState = ({ assetList }) => {
       cursor: '',
       balance: asset.currency.ZERO,
       tokenBalances: Object.create(null),
+      rentExemptAmount: asset.currency.ZERO,
       stakingInfo: {
         loaded: false,
         staking: {

package/src/api.js

@@ -17,6 +17,7 @@ import {
 import BN from 'bn.js'
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
+import ms from 'ms'
 import urljoin from 'url-join'
 import wretch from 'wretch'
 
@@ -46,6 +47,12 @@ export class Api {
       const result = await this.rpcCall('getTokenSupply', [mintAddress])
       return result?.value?.amount
     })
+
+    this.getMinimumBalanceForRentExemption = memoize(
+      (accountSize) => this.rpcCall('getMinimumBalanceForRentExemption', [accountSize]),
+      (accountSize) => accountSize,
+      ms('15m')
+    )
   }
 
   setServer(rpcUrl) {
@@ -179,7 +186,10 @@ export class Api {
   /**
    * Get transactions from an address
    */
-  async getTransactions(address, { cursor, before, limit, includeUnparsed = false } = {}) {
+  async getTransactions(
+    address,
+    { cursor, before, limit, includeUnparsed = false, tokenAccounts } = Object.create(null)
+  ) {
     limit = limit || this.txsLimit
     let transactions = []
     // cursor is a txHash
@@ -187,7 +197,7 @@ export class Api {
     try {
       const until = cursor
 
-      const tokenAccountsByOwner = await this.getTokenAccountsByOwner(address) // Array
+      const tokenAccountsByOwner = tokenAccounts || (await this.getTokenAccountsByOwner(address)) // Array
       const tokenAccountAddresses = tokenAccountsByOwner
         .filter(({ tokenName }) => tokenName !== 'unknown')
         .map(({ tokenAccountAddress }) => tokenAccountAddress)
@@ -876,10 +886,6 @@ export class Api {
     }, 0)
   }
 
-  async getMinimumBalanceForRentExemption(size) {
-    return this.rpcCall('getMinimumBalanceForRentExemption', [size])
-  }
-
   async getProgramAccounts(programId, config) {
     return this.rpcCall('getProgramAccounts', [programId, config])
   }

package/src/get-balances.js

@@ -33,7 +33,18 @@ export const getBalancesFactory =
       .clampLowerZero()
 
     const total = stakingFeatureAvailable ? balance : balanceWithoutStaking
-    const spendable = balanceWithoutStaking.sub(asset.accountReserve || zero).clampLowerZero()
+
+    const networkReserve = accountState.rentExemptAmount || zero
+
+    const accountReserve = asset.accountReserve || zero
+
+    // there is no wallet reserve when there are no tokens nor staking actions. Just network reserve for the rent exempt amount.
+    const walletReserve =
+      hasStakedFunds({ locked, withdrawable, pending }) || hasTokensBalance({ accountState })
+        ? accountReserve.sub(networkReserve).clampLowerZero()
+        : zero
+
+    const spendable = balanceWithoutStaking.sub(walletReserve).sub(networkReserve).clampLowerZero()
 
     const staked = locked
     const unstaking = pending
@@ -47,6 +58,8 @@ export const getBalancesFactory =
       spendable,
       staked,
       unstaking,
+      networkReserve,
+      walletReserve,
     }
   }
 
@@ -93,3 +106,9 @@ const getBalanceFromAccountState = ({ asset, accountState }) => {
     asset.currency.ZERO
   )
 }
+
+const hasStakedFunds = ({ locked, withdrawable, pending }) =>
+  [locked, withdrawable, pending].some((amount) => amount.isPositive)
+
+const hasTokensBalance = ({ accountState }) =>
+  Object.values(accountState?.tokenBalances || {}).some((balance) => balance.isPositive)

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

@@ -195,6 +195,7 @@ export class SolanaMonitor extends BaseMonitor {
         accountState,
         walletAccount,
         refresh,
+        tokenAccounts,
       })
 
       const cursorChanged = this.hasNewCursor({ walletAccount, cursorState })
@@ -210,7 +211,7 @@ export class SolanaMonitor extends BaseMonitor {
     }
   }
 
-  async getHistory({ address, accountState, refresh } = {}) {
+  async getHistory({ address, accountState, refresh, tokenAccounts } = Object.create(null)) {
     const cursor = refresh ? '' : accountState.cursor
     const baseAsset = this.asset
 
@@ -218,6 +219,7 @@ export class SolanaMonitor extends BaseMonitor {
       cursor,
       includeUnparsed: this.includeUnparsed,
       limit: this.txsLimit,
+      tokenAccounts,
     })
 
     const mappedTransactions = []
@@ -227,8 +229,7 @@ export class SolanaMonitor extends BaseMonitor {
       if (assetName === 'unknown' || !asset) continue // skip unknown tokens
       const feeAsset = asset.feeAsset
 
-      // TODO: remove all uses of toDefault()
-      const coinAmount = asset.currency.baseUnit(tx.amount).toDefault()
+      const coinAmount = asset.currency.baseUnit(tx.amount)
 
       const item = {
         coinName: assetName,
@@ -249,7 +250,7 @@ export class SolanaMonitor extends BaseMonitor {
       if (tx.owner === address) {
         // send transaction
         item.to = tx.to
-        item.feeAmount = baseAsset.currency.baseUnit(tx.fee).toDefault() // in SOL
+        item.feeAmount = baseAsset.currency.baseUnit(tx.fee) // in SOL
         item.feeCoinName = baseAsset.name
         item.coinAmount = item.coinAmount.negate()
 
@@ -259,7 +260,7 @@ export class SolanaMonitor extends BaseMonitor {
         }
       } else if (tx.unparsed) {
         if (tx.fee !== 0) {
-          item.feeAmount = baseAsset.currency.baseUnit(tx.fee).toDefault() // in SOL
+          item.feeAmount = baseAsset.currency.baseUnit(tx.fee) // in SOL
           item.feeCoinName = baseAsset.name
         }
 
@@ -294,13 +295,21 @@ export class SolanaMonitor extends BaseMonitor {
 
   async getAccount({ refresh, address, tokenAccounts, accountState, walletAccount }) {
     const tokens = Object.keys(this.assets).filter((name) => name !== this.asset.name)
-    const [solBalance, splBalances] = await Promise.all([
-      this.api.getBalance(address),
-      this.api.getTokensBalance({ address, filterByTokens: tokens, tokenAccounts }),
-    ])
+    const accountInfo = await this.api.getAccountInfo(address).catch(() => {})
+    const accountSize = accountInfo?.space || 0
+    const solBalance = accountInfo?.lamports || 0
+
+    const rentExemptValue = await this.api.getMinimumBalanceForRentExemption(accountSize)
+    const rentExemptAmount = this.asset.currency.baseUnit(rentExemptValue)
+
+    const splBalances = await this.api.getTokensBalance({
+      address,
+      filterByTokens: tokens,
+      tokenAccounts,
+    })
 
     const tokenBalances = _.mapValues(splBalances, (balance, name) =>
-      this.assets[name].currency.baseUnit(balance).toDefault()
+      this.assets[name].currency.baseUnit(balance)
     )
 
     const solBalanceChanged = this.#balanceChanged({
@@ -328,20 +337,26 @@ export class SolanaMonitor extends BaseMonitor {
       .add(stakedBalance)
       .add(withdrawableBalance)
       .add(pendingBalance)
-      .toDefault()
 
     return {
       account: {
         balance,
         tokenBalances,
+        rentExemptAmount,
       },
       staking,
     }
   }
 
   async updateState({ account, cursorState, walletAccount, staking }) {
-    const { balance, tokenBalances } = account
-    const newData = { balance, tokenBalances, stakingInfo: staking, ...cursorState }
+    const { balance, tokenBalances, rentExemptAmount } = account
+    const newData = {
+      balance,
+      rentExemptAmount,
+      tokenBalances,
+      stakingInfo: staking,
+      ...cursorState,
+    }
     return this.updateAccountState({ newData, walletAccount })
   }
 
@@ -361,11 +376,11 @@ export class SolanaMonitor extends BaseMonitor {
       isDelegating: Object.values(stakingInfo.accounts).some(({ state }) =>
         ['active', 'activating', 'inactive'].includes(state)
       ), // true if at least 1 account is delegating
-      locked: this.asset.currency.baseUnit(stakingInfo.locked).toDefault(),
+      locked: this.asset.currency.baseUnit(stakingInfo.locked),
       activating: this.asset.currency.baseUnit(stakingInfo.activating),
-      withdrawable: this.asset.currency.baseUnit(stakingInfo.withdrawable).toDefault(),
-      pending: this.asset.currency.baseUnit(stakingInfo.pending).toDefault(), // still undelegating (not yet available for withdraw)
-      earned: this.asset.currency.baseUnit(rewards).toDefault(),
+      withdrawable: this.asset.currency.baseUnit(stakingInfo.withdrawable),
+      pending: this.asset.currency.baseUnit(stakingInfo.pending), // still undelegating (not yet available for withdraw)
+      earned: this.asset.currency.baseUnit(rewards),
       accounts: stakingInfo.accounts, // Obj
     }
   }

package/src/tx-send.js

@@ -5,7 +5,6 @@ import {
   TOKEN_2022_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
 } from '@exodus/solana-lib'
-import { transactionToBase58 } from '@exodus/solana-lib/src/tx/common.js'
 import assert from 'minimalistic-assert'
 
 export const createAndBroadcastTXFactory =
@@ -34,6 +33,7 @@ export const createAndBroadcastTXFactory =
       expectedMintAddress,
       metadataAddress,
       creators,
+      priorityFee,
       // </MagicEden>
       reference,
       memo,
@@ -129,7 +129,7 @@ export const createAndBroadcastTXFactory =
       from,
       to: address,
       amount,
-      fee: feeAmount,
+      fee: feeData.fee, // feeAmount includes the priortyFee
       recentBlockhash,
       feeData,
       reference,
@@ -139,26 +139,14 @@ export const createAndBroadcastTXFactory =
       ...magicEdenParams,
     })
 
-    let { priorityFee } = feeData
-
     const transactionForFeeEstimation = prepareForSigning(unsignedTransaction)
 
-    if (!priorityFee) {
-      try {
-        priorityFee = await api.getPriorityFee(transactionToBase58(transactionForFeeEstimation))
-      } catch (e) {
-        console.warn(`Failed to fetch priority fee: ${e.message}`)
-        priorityFee = feeData.fallbackPriorityFee
-      }
-    }
-
     const { unitsConsumed: computeUnits, err } = await api.simulateUnsignedTransaction({
       message: transactionForFeeEstimation.message,
     })
+    if (err) throw new Error(JSON.stringify(err))
 
-    if (err) throw new Error(err)
-
-    unsignedTransaction.txData.priorityFee = priorityFee
+    unsignedTransaction.txData.priorityFee = priorityFee ?? 0
     unsignedTransaction.txData.computeUnits = computeUnits * feeData.computeUnitsMultiplier
 
     const { txId, rawTx } = await assetClientInterface.signTransaction({