@exodus/solana-api 3.18.0 → 3.18.2

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.18.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.18.1...@exodus/solana-api@3.18.2) (2025-05-07)
+
+
+### Bug Fixes
+
+
+* fix: throw only if unitsConsumed is not returned (#5561)
+
+
+
+## [3.18.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.18.0...@exodus/solana-api@3.18.1) (2025-05-05)
+
+
+### Bug Fixes
+
+
+* fix: SOL reserve and units consumed (#5540)
+
+
+
 ## [3.18.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.17.4...@exodus/solana-api@3.18.0) (2025-05-01)
 
 

package/package.json

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

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

@@ -30,6 +30,7 @@ export const createUnsignedTxForSend = async ({
   // staking
   method,
   stakeAddresses,
+  accounts,
   seed,
   pool,
   // <MagicEden>
@@ -119,6 +120,7 @@ export const createUnsignedTxForSend = async ({
   const stakingParams = {
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
   }
@@ -173,8 +175,10 @@ export const createUnsignedTxForSend = async ({
       message,
     })
     if (err) {
-      // we don't throw error here, because we can use this method to estimate fee
-      console.log('SOL estimate unitsConsumed err:', JSON.stringify(err))
+      // we use this method to compute unitsConsumed
+      // we can throw error here and fallback to ~0.025 SOL or estimate fee based on the method
+      console.log('error getting units consumed:', err)
+      if (!unitsConsumed) throw new Error(err)
     }
 
     return unitsConsumed + CU_FOR_COMPUTE_BUDGET_INSTRUCTIONS

package/src/get-fees.js

@@ -3,7 +3,7 @@ import assert from 'minimalistic-assert'
 
 import { createUnsignedTxForSend } from './create-unsigned-tx-for-send.js'
 
-const DEFAULT_RESERVE_FEE = '0.01' // SOL
+const DEFAULT_SAFE_FEE = '0.0025' // SOL (enough for rent exemption)
 
 export const getFeeAsyncFactory = ({ api }) => {
   assert(api, 'api is required')
@@ -37,16 +37,18 @@ export const getFeeAsyncFactory = ({ api }) => {
         for (const [addr, info] of Object.entries(stakingInfo.accounts || {})) {
           if (method === 'undelegate' && (info.state === 'active' || info.state === 'activating'))
             stakeAddresses.push(addr)
-          if (method === 'withdraw' && info.state === 'inactive') stakeAddresses.push(addr)
         }
 
         rest.stakeAddresses = stakeAddresses
+        rest.accounts = stakingInfo.accounts
+
         amount =
           method === 'undelegate'
             ? stakingInfo.locked // unstake all
             : method === 'withdraw'
               ? stakingInfo.withdrawable // withdraw all
               : amount
+        // withdraw won't use amount, will extract it from accounts
       }
 
       try {
@@ -64,7 +66,8 @@ export const getFeeAsyncFactory = ({ api }) => {
       } catch (err) {
         console.log('error computing right SOL fee:', err)
         // simulating a tx will fail if the user has not enough balance
-        fee = asset.feeAsset.currency.defaultUnit(DEFAULT_RESERVE_FEE)
+        // we fallback to a default fee (but we could leave some dust)
+        fee = asset.feeAsset.currency.defaultUnit(DEFAULT_SAFE_FEE)
       }
     }