@exodus/solana-api 3.12.0 → 3.13.0

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.13.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.12.1...@exodus/solana-api@3.13.0) (2025-01-08)
+
+
+### Features
+
+
+* feat: add SOL waitForTransactionStatus method (#4800)
+
+
+
+## [3.12.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.12.0...@exodus/solana-api@3.12.1) (2025-01-02)
+
+
+### Bug Fixes
+
+
+* fix: solana nft send (#4768)
+
+
+
 ## [3.12.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-api@3.11.9...@exodus/solana-api@3.12.0) (2025-01-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Solana",
   "type": "module",
   "main": "src/index.js",
@@ -30,7 +30,7 @@
     "@exodus/fetch": "^1.2.0",
     "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.9.3",
+    "@exodus/solana-lib": "^3.9.4",
     "@exodus/solana-meta": "^2.0.2",
     "@exodus/timer": "^1.1.1",
     "bn.js": "^4.11.0",
@@ -47,7 +47,7 @@
     "@exodus/assets-testing": "^1.0.0",
     "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc3"
   },
-  "gitHead": "70de901b0d9b85f1045949400105203c700fc223",
+  "gitHead": "aac8ba83fb14935634067e0870c88939afa92b00",
   "bugs": {
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Asolana-api"
   },

package/src/api.js

@@ -178,6 +178,32 @@ export class Api {
     return this.rpcCall('getBlockTime', [slot])
   }
 
+  async waitForTransactionStatus(txIds, status = 'finalized', timeoutMs = ms('1m')) {
+    if (!Array.isArray(txIds)) txIds = [txIds]
+    const startTime = Date.now()
+
+    while (true) {
+      const response = await this.rpcCall('getSignatureStatuses', [
+        txIds,
+        { searchTransactionHistory: true },
+      ])
+      const data = response.value
+      const allTxsAreConfirmed = data.every((elem) => elem?.confirmationStatus === status)
+      if (allTxsAreConfirmed) {
+        return true
+      }
+
+      // Check if the timeout has elapsed
+      if (Date.now() - startTime >= timeoutMs) {
+        // timeout
+        throw new Error('waitForTransactionStatus timeout')
+      }
+
+      // Wait for the specified interval before the next request
+      await new Promise((resolve) => setTimeout(resolve, ms('10s')))
+    }
+  }
+
   async getSignaturesForAddress(address, { until, before, limit } = {}) {
     until = until || undefined
     return this.rpcCall('getSignaturesForAddress', [address, { until, before, limit }], { address })

package/src/tx-send.js

@@ -8,19 +8,17 @@ import {
 import assert from 'minimalistic-assert'
 
 export const createAndBroadcastTXFactory =
-  (api) =>
-  async ({ asset, walletAccount, address, amount, options = {} }, { assetClientInterface }) => {
+  ({ api, assetClientInterface }) =>
+  async ({ asset, walletAccount, address, amount, options = {} }) => {
     const assetName = asset.name
     assert(assetClientInterface, `assetClientInterface must be supplied in sendTx for ${assetName}`)
 
     const {
       feeAmount,
-      method,
       stakeAddresses,
       seed,
       pool,
-      customMintAddress,
-      tokenStandard,
+      nft,
       // <MagicEden>
       initializerAddress,
       initializerDepositTokenAddress,
@@ -38,12 +36,22 @@ export const createAndBroadcastTXFactory =
       reference,
       memo,
     } = options
+
+    let { method, customMintAddress, tokenStandard } = options
+
     const { baseAsset } = asset
     const from = await assetClientInterface.getReceiveAddress({
       assetName: baseAsset.name,
       walletAccount,
     })
 
+    if (nft) {
+      customMintAddress = nft.mintAddress
+      tokenStandard = nft.tokenStandard
+      method = tokenStandard === 4 ? 'metaplexTransfer' : undefined
+      amount = asset.currency.baseUnit(1)
+    }
+
     const isToken = asset.assetType === api.tokenAssetType
 
     // Check if receiver has address active when sending tokens.
@@ -72,15 +80,13 @@ export const createAndBroadcastTXFactory =
     let tokenParams = Object.create(null)
     if (isToken || customMintAddress) {
       const tokenMintAddress = customMintAddress || asset.mintAddress
-      const tokenProgram =
+      const tokenProgramPublicKey =
         (await api.getAddressType(tokenMintAddress)) === 'token-2022'
           ? TOKEN_2022_PROGRAM_ID
           : TOKEN_PROGRAM_ID
-      const tokenAddress = findAssociatedTokenAddress(
-        address,
-        tokenMintAddress,
-        tokenProgram.toBase58()
-      )
+
+      const tokenProgram = tokenProgramPublicKey.toBase58()
+      const tokenAddress = findAssociatedTokenAddress(address, tokenMintAddress, tokenProgram)
       const [destinationAddressType, isAssociatedTokenAccountActive, fromTokenAccountAddresses] =
         await Promise.all([
           api.getAddressType(address),