@exodus/solana-api 3.14.2 → 3.14.4

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.14.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.14.3...@exodus/solana-api@3.14.4) (2025-03-20)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
+## [3.14.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.14.2...@exodus/solana-api@3.14.3) (2025-03-14)
+
+
+### Bug Fixes
+
+
+* fix(SOL): set amount as lamports for internal multi send (#5253)
+
+
+
 ## [3.14.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.14.1...@exodus/solana-api@3.14.2) (2025-03-12)
 
 

package/package.json

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

package/src/api.js

@@ -487,7 +487,7 @@ export class Api {
                 sent: [
                   {
                     address: solanaTransferTx.to,
-                    amount: solanaTransferTx.amount,
+                    amount: lamports,
                   },
                 ],
               }
@@ -495,7 +495,7 @@ export class Api {
             }
 
             solanaTransferTx.to.push(destination)
-            solanaTransferTx.data.sent.push({ address: destination, amount })
+            solanaTransferTx.data.sent.push({ address: destination, amount: lamports })
           } else {
             solanaTransferTx = {
               source,
@@ -508,7 +508,7 @@ export class Api {
                 sent: [
                   {
                     address: destination,
-                    amount,
+                    amount: lamports,
                   },
                 ],
               },
@@ -841,25 +841,28 @@ export class Api {
       : tokenAccounts
   }
 
-  async getTokensBalance({ address, filterByTokens = [], tokenAccounts }) {
-    const accounts = tokenAccounts || (await this.getTokenAccountsByOwner(address))
+  async getTokensBalancesAndAccounts({ address, filterByTokens = [] }) {
+    const accounts = await this.getTokenAccountsByOwner(address)
 
-    return accounts.reduce((acc, { tokenName, balance }) => {
-      if (
-        tokenName === 'unknown' ||
-        (filterByTokens.length > 0 && !filterByTokens.includes(tokenName))
-      )
-        return acc // filter by supported tokens only
-      if (acc[tokenName]) {
-        acc[tokenName] += Number(balance)
-      }
-      // e.g { 'serum': 123 }
-      else {
-        acc[tokenName] = Number(balance)
-      } // merge same token account balance
+    return {
+      balances: accounts.reduce((acc, { tokenName, balance }) => {
+        if (
+          tokenName === 'unknown' ||
+          (filterByTokens.length > 0 && !filterByTokens.includes(tokenName))
+        )
+          return acc // filter by supported tokens only
+        if (acc[tokenName]) {
+          acc[tokenName] += Number(balance)
+        }
+        // e.g { 'serum': 123 }
+        else {
+          acc[tokenName] = Number(balance)
+        } // merge same token account balance
 
-      return acc
-    }, {})
+        return acc
+      }, {}),
+      accounts,
+    }
   }
 
   async isAssociatedTokenAccountActive(tokenAddress) {

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

@@ -143,19 +143,6 @@ export class SolanaMonitor extends BaseMonitor {
     return true
   }
 
-  async getAccountsAndBalances({ refresh, address, accountState, walletAccount }) {
-    const tokenAccounts = await this.api.getTokenAccountsByOwner(address)
-    const { account, staking } = await this.getAccount({
-      refresh,
-      address,
-      tokenAccounts,
-      accountState,
-      walletAccount,
-    })
-
-    return { account, tokenAccounts, staking }
-  }
-
   async tick({ walletAccount, refresh }) {
     // Check for new wallet account
     await this.initWalletAccount({ walletAccount })
@@ -300,21 +287,22 @@ export class SolanaMonitor extends BaseMonitor {
     }
   }
 
-  async getAccount({ refresh, address, tokenAccounts, accountState, walletAccount }) {
+  async getAccountsAndBalances({ refresh, address, accountState, walletAccount }) {
     const tokens = Object.keys(this.assets).filter((name) => name !== this.asset.name)
-    const accountInfo = await this.api.getAccountInfo(address).catch(() => {})
+    const [accountInfo, { balances: splBalances, accounts: tokenAccounts }] = await Promise.all([
+      this.api.getAccountInfo(address).catch(() => {}),
+      this.api.getTokensBalancesAndAccounts({
+        address,
+        filterByTokens: tokens,
+      }),
+    ])
+
     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)
     )
@@ -352,6 +340,7 @@ export class SolanaMonitor extends BaseMonitor {
         rentExemptAmount,
       },
       staking,
+      tokenAccounts,
     }
   }