@exodus/solana-api 3.11.9 → 3.12.0

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.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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.11.9",
+  "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",
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "44b274a6a6f0228014aa0eaac5af850dcaf76fed",
+  "gitHead": "70de901b0d9b85f1045949400105203c700fc223",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/api.js

@@ -186,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
@@ -194,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)

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
         }
 
@@ -308,7 +309,7 @@ export class SolanaMonitor extends BaseMonitor {
     })
 
     const tokenBalances = _.mapValues(splBalances, (balance, name) =>
-      this.assets[name].currency.baseUnit(balance).toDefault()
+      this.assets[name].currency.baseUnit(balance)
     )
 
     const solBalanceChanged = this.#balanceChanged({
@@ -336,7 +337,6 @@ export class SolanaMonitor extends BaseMonitor {
       .add(stakedBalance)
       .add(withdrawableBalance)
       .add(pendingBalance)
-      .toDefault()
 
     return {
       account: {
@@ -376,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
     }
   }