@exodus/solana-api 3.13.6 → 3.14.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.14.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.7...@exodus/solana-api@3.14.0) (2025-03-10)
+
+
+### Features
+
+
+* feat: SOL internal sends in txLog (#5199)
+
+
+
+## [3.13.7](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.6...@exodus/solana-api@3.13.7) (2025-03-03)
+
+
+### Bug Fixes
+
+
+* fix: await result in retry (#5113)
+
+* fix: SOL getAccountInfo commitment (#5114)
+
+
+
 ## [3.13.6](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.13.5...@exodus/solana-api@3.13.6) (2025-02-17)
 
 

package/README.md

@@ -1,8 +1,24 @@
-# @exodus/solana-api
+# @exodus/solana-api · [![npm version](https://img.shields.io/badge/npm-public-blue.svg?style=flat)](https://www.npmjs.com/package/@exodus/solana-api)
 
-Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana. See [Asset Packages](../../docs/asset-packages.md) for more detail on this package's role.
+The **solana-api** provides utilities for interacting with the Solana blockchain.
+It offers functionality to query transaction data, monitor network health, and broadcast transactions, specifically:
 
-## Known Issues
+- Provides an interface for communicating with the Solana backend, exposing methods to fetch transaction and account details, check node health, query staked amounts, and retrieve withdrawal histories.
+- Includes functions for broadcasting transactions to the Solana network.
+- Monitors transactions, retrieves staking data, and logs transaction history, ensuring the wallet’s state remains in sync with on-chain data.
 
-- To get all transactions data from an address we gotta call 3 rpcs `getSignaturesForAddress` (get txIds) -> `getTransaction` (get tx details) -> `getBlockTime` (get tx timestamp). Pretty annoying and resource-consuming backend-side. (https://github.com/solana-labs/solana/issues/12411)
-- calling `getBlockTime` might results in an error if the slot/block requested is too old (https://github.com/solana-labs/solana/issues/12413), looks like some Solana validators can choose to not keep all the ledger blocks (fix in progress by solana team).
+---
+
+## Installation
+
+Install the package via `yarn`:
+
+```bash
+yarn add @exodus/solana-api
+```
+
+## License
+
+This project is licensed under the MIT License.
+You are free to use, modify, and distribute this software under the terms of the MIT License.
+For more details, see the [LICENSE](LICENSE) file.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.13.6",
+  "version": "3.14.0",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -27,7 +27,7 @@
     "@exodus/assets": "^11.0.0",
     "@exodus/basic-utils": "^3.0.1",
     "@exodus/currency": "^6.0.1",
-    "@exodus/fetch": "^1.2.0",
+    "@exodus/fetch": "^1.7.3",
     "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solana-lib": "^3.9.4",
@@ -40,14 +40,13 @@
     "make-concurrent": "^4.0.0",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.3",
-    "url-join": "^4.0.0",
-    "wretch": "^1.5.2"
+    "url-join": "^4.0.0"
   },
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "99d356ad160e39cb3820c7766e503916966605f0",
+  "gitHead": "0ad4bff46edd70ed69c9351d682d36b3436dbd1f",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/api.js

@@ -1,5 +1,6 @@
 import createApiCJS from '@exodus/asset-json-rpc'
 import { memoize } from '@exodus/basic-utils'
+import wretch from '@exodus/fetch/wretch'
 import { retry } from '@exodus/simple-retry'
 import {
   buildRawTransaction,
@@ -18,11 +19,10 @@ import BN from 'bn.js'
 import lodash from 'lodash'
 import ms from 'ms'
 import urljoin from 'url-join'
-import wretch from 'wretch'
 
 import { Connection } from './connection.js'
 import { getStakeActivation } from './get-stake-activation/index.js'
-import { isSplTransferInstruction } from './txs-utils.js'
+import { isSolTransferInstruction, isSplTransferInstruction } from './txs-utils.js'
 
 const createApi = createApiCJS.default || createApiCJS
 
@@ -215,9 +215,13 @@ export class Api {
     const fetchRetry = retry(
       async () => {
         try {
-          return this.rpcCall('getSignaturesForAddress', [address, { until, before, limit }], {
-            address,
-          })
+          return await this.rpcCall(
+            'getSignaturesForAddress',
+            [address, { until, before, limit }],
+            {
+              address,
+            }
+          )
         } catch (error) {
           if (
             error.message &&
@@ -445,7 +449,11 @@ export class Api {
         return [...acc, ...val.instructions]
       }, [])
       .filter(
-        (ix) => ix.parsed && isSplTransferInstruction({ program: ix.program, type: ix.parsed.type })
+        (ix) =>
+          ix.parsed &&
+          (isSplTransferInstruction({ program: ix.program, type: ix.parsed.type }) ||
+            (!includeUnparsed &&
+              isSolTransferInstruction({ program: ix.program, type: ix.parsed.type })))
       )
       .map((ix) => {
         const source = lodash.get(ix, 'parsed.info.source')
@@ -466,6 +474,49 @@ export class Api {
           return
         }
 
+        if (
+          source === ownerAddress &&
+          isSolTransferInstruction({ program: ix.program, type: ix.parsed.type })
+        ) {
+          const lamports = Number(lodash.get(ix, 'parsed.info.lamports', 0))
+          if (solanaTransferTx) {
+            solanaTransferTx.lamports += lamports
+            if (!Array.isArray(solanaTransferTx.to)) {
+              solanaTransferTx.data = {
+                sent: [
+                  {
+                    address: solanaTransferTx.to,
+                    amount: solanaTransferTx.amount,
+                  },
+                ],
+              }
+              solanaTransferTx.to = [solanaTransferTx.to]
+            }
+
+            solanaTransferTx.to.push(destination)
+            solanaTransferTx.data.sent.push({ address: destination, amount })
+          } else {
+            solanaTransferTx = {
+              source,
+              owner: source,
+              from: source,
+              to: [destination],
+              lamports,
+              data: {
+                sent: [
+                  {
+                    address: destination,
+                    amount,
+                  },
+                ],
+              },
+              fee,
+            }
+          }
+
+          return
+        }
+
         const tokenAccount = tokenAccountsByOwner.find(({ tokenAccountAddress }) => {
           return [source, destination].includes(tokenAccountAddress)
         })
@@ -553,6 +604,7 @@ export class Api {
           to: solanaTransferTx.destination,
           amount: solanaTransferTx.lamports, // number
           fee: isSending ? fee : 0,
+          data: solanaTransferTx.data,
         }
       }
 
@@ -833,7 +885,7 @@ export class Api {
   async getAccountInfo(address, encoding = 'jsonParsed') {
     const { value } = await this.rpcCall(
       'getAccountInfo',
-      [address, { encoding, commitment: 'single' }],
+      [address, { encoding, commitment: 'confirmed' }],
       { address }
     )
     return value

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

@@ -249,11 +249,18 @@ export class SolanaMonitor extends BaseMonitor {
 
       if (tx.owner === address) {
         // send transaction
-        item.to = tx.to
+        item.to = Array.isArray(tx.to) ? undefined : tx.to
         item.feeAmount = baseAsset.currency.baseUnit(tx.fee) // in SOL
         item.feeCoinName = baseAsset.name
         item.coinAmount = item.coinAmount.negate()
 
+        if (tx.data?.sent) {
+          item.data.sent = tx.data.sent.map((s) => ({
+            address: s.address,
+            amount: baseAsset.currency.baseUnit(s.amount).toDefaultString({ unit: true }),
+          }))
+        }
+
         if (tx.to === tx.owner) {
           item.selfSend = true
           item.coinAmount = asset.currency.ZERO

package/src/txs-utils.js

@@ -15,3 +15,6 @@ export const isSolanaRewardsActivityTx = (tx) =>
 
 export const isSplTransferInstruction = ({ program, type }) =>
   program === 'spl-token' && TRANSFER_INSTRUCTION_TYPES.has(type)
+
+export const isSolTransferInstruction = ({ program, type }) =>
+  program === 'system' && TRANSFER_INSTRUCTION_TYPES.has(type)