@exodus/solana-api 3.13.1 → 3.13.3

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.13.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.2...@exodus/solana-api@3.13.3) (2025-01-17)
+
+**Note:** Version bump only for package @exodus/solana-api
+
+
+
+
+
+## [3.13.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.1...@exodus/solana-api@3.13.2) (2025-01-09)
+
+
+### Bug Fixes
+
+
+* fix: solana missing txId of dexTxs (#4818)
+
+
+### License
+
+
+* license: re-license under MIT license (#4814)
+
+
+
 ## [3.13.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.0...@exodus/solana-api@3.13.1) (2025-01-09)
 
 

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2024 Exodus Movement, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.13.1",
+  "version": "3.13.3",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -12,7 +12,7 @@
     "!src/**/__tests__"
   ],
   "author": "Exodus Movement, Inc.",
-  "license": "ISC",
+  "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "8593d378a2c8054dea5d94dac3bf96b124842903",
+  "gitHead": "ce5cac014bcbb982ac6680145228c21865deb9f8",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/api.js

@@ -311,6 +311,7 @@ export class Api {
     innerInstructions = innerInstructions || []
 
     let { instructions, accountKeys } = txDetails.transaction.message
+    const txId = txDetails.transaction.signatures[0]
 
     const getUnparsedTx = () => {
       const ownerIndex = accountKeys.findIndex((accountKey) => accountKey.pubkey === ownerAddress)
@@ -374,7 +375,7 @@ export class Api {
           const { from, to, owner } = match
 
           return {
-            id: txDetails.transaction.signatures[0],
+            id: txId,
             slot: txDetails.slot,
             owner,
             from,
@@ -448,6 +449,8 @@ export class Api {
 
         // owner if it's a send tx
         return {
+          id: txId,
+          slot: txDetails.slot,
           owner: isSending ? ownerAddress : null,
           from: isSending ? ownerAddress : source,
           to: isSending ? destination : ownerAddress,
@@ -538,7 +541,7 @@ export class Api {
       if (tokenTxs.length > 0) {
         // found spl-token simple transfer/transferChecked instruction
         tx.tokenTxs = tokenTxs.map((tx) => ({
-          id: txDetails.transaction.signatures[0],
+          id: txId,
           slot: txDetails.slot,
           ...tx,
         }))

package/src/get-balances.js

@@ -46,6 +46,9 @@ export const getBalancesFactory =
 
     const spendable = balanceWithoutStaking.sub(walletReserve).sub(networkReserve).clampLowerZero()
 
+    // leave enough amount for accountReserve if it's not reserved already
+    const stakeable = walletReserve.isZero ? spendable.sub(accountReserve) : spendable
+
     const staked = locked
     const unstaking = pending
 
@@ -56,6 +59,7 @@ export const getBalancesFactory =
       // new
       total,
       spendable,
+      stakeable,
       staked,
       unstaking,
       networkReserve,