@exodus/solana-api 3.26.3 → 3.26.5

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.26.5](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.26.4...@exodus/solana-api@3.26.5) (2025-12-29)
+
+
+### Bug Fixes
+
+
+* fix: solana fee handling in createTxFactory (#7185)
+
+
+
+## [3.26.4](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.26.3...@exodus/solana-api@3.26.4) (2025-12-27)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
 ## [3.26.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.26.2...@exodus/solana-api@3.26.3) (2025-12-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.26.3",
+  "version": "3.26.5",
   "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": "ae424af3e4254f05509527496806913d56e39aca",
+  "gitHead": "1d62bfbf0924dc4c6eb52f6af2417c220f7454cb",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

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

@@ -223,7 +223,7 @@ export const createTxFactory = ({ assetClientInterface, api, feePayerClient }) =
       )
     }
 
-    const fee = feeData.baseFee
+    const calculatedFee = feeData.baseFee
       .add(
         asset.feeAsset.currency
           .baseUnit(unsignedTx.txData.priorityFee ?? 0)
@@ -232,32 +232,34 @@ export const createTxFactory = ({ assetClientInterface, api, feePayerClient }) =
       )
       .add(tokenCreationFee)
 
-    unsignedTx.txMeta.fee = fee.toBaseNumber()
-
     const tx = await maybeAddFeePayerWithAuth({
       unsignedTx,
       feePayerClient,
       enableFeePayer: feeData.enableFeePayer,
     })
 
-    if (tx.txMeta.usedFeePayer) {
-      tx.txMeta.fee = asset.feeAsset.currency.ZERO
-    } else {
+    const fee = tx.txMeta.usedFeePayer ? asset.feeAsset.currency.ZERO : calculatedFee
+    tx.txMeta.fee = fee.toBaseNumber()
+
+    if (!tx.txMeta.usedFeePayer) {
       const rentExemptValue = await api.getRentExemptionMinAmount(toAddress)
       const rentExemptAmount = baseAsset.currency.baseUnit(rentExemptValue)
+      const senderRentExemptAmount = baseAsset.currency.baseUnit(
+        await api.getMinimumBalanceForRentExemption(0)
+      )
+
+      const baseAssetBalance = baseAsset.currency.baseUnit(await api.getBalance(fromAddress))
 
       // differentiate between SOL and Solana token
       let isEnoughForRent = false
       if (asset.name === baseAsset.name && !nft) {
         // sending SOL
-        isEnoughForRent = amount.gte(rentExemptAmount)
+        const remaining = baseAssetBalance.sub(calculatedFee).sub(amount)
+        isEnoughForRent =
+          amount.gte(rentExemptAmount) && (remaining.isZero || remaining.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)
+        isEnoughForRent = baseAssetBalance.sub(calculatedFee).gte(senderRentExemptAmount)
       }
 
       if (!isEnoughForRent) {
@@ -267,7 +269,7 @@ export const createTxFactory = ({ assetClientInterface, api, feePayerClient }) =
       }
     }
 
-    return tx
+    return { unsignedTx: tx, fee }
   }
 }
 

package/src/get-fees.js

@@ -49,14 +49,14 @@ export const getFeeAsyncFactory = ({ createTx }) => {
       }
 
       try {
-        unsignedTx = await createTx({
+        ;({ unsignedTx } = await createTx({
           asset,
           walletAccount,
           feeData,
           amount: amount ?? asset.currency.baseUnit(1),
           toAddress: toAddress ?? rest.fromAddress,
           ...rest,
-        })
+        }))
       } catch (err) {
         console.log('error computing right SOL fee:', err)
         // simulating a tx will fail if the user has not enough balance

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

@@ -114,13 +114,17 @@ export class SolanaWebsocketMonitor extends SolanaClarityMonitor {
 
     // subscribe to new tokenAccounts
     for (const mintAddress of unknownTokensList) {
-      await this.wsApi.accountSubscribe({ owner: address, account: mintAddress })
       const tokenName = this.api.tokens.get(mintAddress)?.name
       if (!tokenName) {
         console.log(`Unknown token mint address: ${mintAddress}`)
         continue
       }
 
+      const tokenAccountAddress = tokenAccounts.find(
+        (acc) => acc.mintAddress === mintAddress
+      )?.tokenAccountAddress
+      await this.wsApi.accountSubscribe({ owner: address, account: tokenAccountAddress })
+
       // update only token balances for known tokens
       const amount = splBalances[mintAddress]
       const newData = {

package/src/ws-api.js

@@ -186,14 +186,12 @@ export class WsApi {
     const mappedTransactions = []
     for (const tx of transactions) {
       // we get the token name using the token.mintAddress
-      let tokenName = tokens.get(tx.token?.mintAddress)?.name
-      if (tx.token && !tokenName) {
-        tokenName = 'unknown' // unknown token
-      }
+      const tokenName = tokens.get(tx.token?.mintAddress)?.name
+      if (tx.token && !tokenName) continue // skip unknown tokens
 
       const assetName = tokenName ?? baseAsset.name
       const asset = assets[assetName]
-      if (assetName === 'unknown' || !asset) return // skip unknown tokens
+      if (!asset) continue // asset not found
       const feeAsset = asset.feeAsset
 
       const coinAmount = tx.amount ? asset.currency.baseUnit(tx.amount) : asset.currency.ZERO