@exodus/solana-api 3.24.1 → 3.25.1

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.25.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.25.0...@exodus/solana-api@3.25.1) (2025-11-03)
+
+
+### Bug Fixes
+
+
+* fix(SOL): Fix mint address key mapping in clarity monitor balance aggregation (#6839)
+
+
+
+## [3.25.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.24.1...@exodus/solana-api@3.25.0) (2025-10-30)
+
+
+### Features
+
+
+* feat: Solana skip rent validation when usedFeePayer and update fee check logic (#6797)
+
+
+
 ## [3.24.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.24.0...@exodus/solana-api@3.24.1) (2025-10-29)
 
 

package/package.json

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

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

@@ -296,36 +296,39 @@ export const createTxFactory = ({ assetClientInterface, api, feePayerClient }) =
       )
       .add(tokenCreationFee)
 
-    // serialization friendlier
     unsignedTx.txMeta.fee = fee.toBaseNumber()
 
-    const rentExemptValue = await api.getRentExemptionMinAmount(toAddress)
-    const rentExemptAmount = baseAsset.currency.baseUnit(rentExemptValue)
-
-    // differentiate between SOL and Solana token
-    let isEnoughForRent = false
-    if (asset.name === baseAsset.name && !nft) {
-      // sending SOL
-      isEnoughForRent = amount.gte(rentExemptAmount)
-    } else {
-      // sending token/nft
-      const baseAssetBalance = await api.getBalance(fromAddress)
-      isEnoughForRent = baseAsset.currency
-        .baseUnit(baseAssetBalance)
-        .sub(fee || asset.feeAsset.currency.ZERO)
-        .gte(rentExemptAmount)
-    }
-
     const tx = await maybeAddFeePayerWithAuth({
       unsignedTx,
       feePayerClient,
       enableFeePayer: feeData.enableFeePayer,
     })
 
-    if (!isEnoughForRent && !tx.txMeta.usedFeePayer) {
-      const err = new Error('Sending SOL amount is too low to cover the rent exemption fee.')
-      err.rentExemptAmount = true
-      throw err
+    if (tx.txMeta.usedFeePayer) {
+      tx.txMeta.fee = asset.feeAsset.currency.ZERO
+    } else {
+      const rentExemptValue = await api.getRentExemptionMinAmount(toAddress)
+      const rentExemptAmount = baseAsset.currency.baseUnit(rentExemptValue)
+
+      // differentiate between SOL and Solana token
+      let isEnoughForRent = false
+      if (asset.name === baseAsset.name && !nft) {
+        // sending SOL
+        isEnoughForRent = amount.gte(rentExemptAmount)
+      } else {
+        // sending token/nft
+        const baseAssetBalance = await api.getBalance(fromAddress)
+        isEnoughForRent = baseAsset.currency
+          .baseUnit(baseAssetBalance)
+          .sub(fee || asset.feeAsset.currency.ZERO)
+          .gte(rentExemptAmount)
+      }
+
+      if (!isEnoughForRent) {
+        const err = new Error('Sending SOL amount is too low to cover the rent exemption fee.')
+        err.rentExemptAmount = true
+        throw err
+      }
     }
 
     return tx

package/src/get-fees.js

@@ -64,15 +64,15 @@ export const getFeeAsyncFactory = ({ createTx }) => {
       }
     }
 
-    if (unsignedTx?.txMeta?.fee) {
+    if (unsignedTx?.txMeta?.fee === undefined) {
+      fee = asset.feeAsset.currency.defaultUnit(DEFAULT_SAFE_FEE)
+    } else {
       fee = unsignedTx.txMeta.usedFeePayer
         ? asset.feeAsset.currency.ZERO
         : asset.feeAsset.currency.baseUnit(unsignedTx.txMeta.fee)
-    } else {
-      fee = asset.feeAsset.currency.defaultUnit(DEFAULT_SAFE_FEE)
     }
 
-    return { fee, unsignedTx }
+    return { fee, unsignedTx, usedFeePayer: unsignedTx?.txMeta?.usedFeePayer }
   }
 }
 

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

@@ -298,12 +298,9 @@ export class SolanaClarityMonitor extends BaseMonitor {
           } else {
             delegatedBalances[mintAddress] = fullBalanceCurrency
           }
-        }
 
-        // Store delegated amounts separately for the account state
-        if (this.assets[tokenName]) {
           const delegatedAmountCurrency = this.assets[tokenName].currency.baseUnit(delegatedAmount)
-          if (!delegatedAmountCurrency.isZero()) {
+          if (!delegatedAmountCurrency.equals(this.assets[tokenName].currency.ZERO)) {
             if (!delegatedTokenAmounts[tokenName]) {
               delegatedTokenAmounts[tokenName] = {}
             }
@@ -316,8 +313,23 @@ export class SolanaClarityMonitor extends BaseMonitor {
       }
     }
 
-    // Combine owned and delegated balances
-    const combinedBalances = { ...splBalances }
+    const combinedBalances = {}
+
+    const tokenNameToMintAddress = {}
+    for (const account of ownedTokenAccounts || []) {
+      if (account.tokenName && account.mintAddress) {
+        tokenNameToMintAddress[account.tokenName] = account.mintAddress
+      }
+    }
+
+    for (const [tokenName, balance] of Object.entries(splBalances)) {
+      const mintAddress = tokenNameToMintAddress[tokenName]
+
+      if (mintAddress) {
+        combinedBalances[mintAddress] = balance
+      }
+    }
+
     for (const [mintAddress, delegatedBalanceCurrency] of Object.entries(delegatedBalances)) {
       const tokenName = this.api.tokens.get(mintAddress)?.name
       if (tokenName && this.assets[tokenName]) {