@exodus/solana-api 2.1.3 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.1.3",
+  "version": "2.2.2",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -20,7 +20,8 @@
     "@exodus/fetch": "^1.2.0",
     "@exodus/models": "^8.7.2",
     "@exodus/nfts-core": "^0.5.0",
-    "@exodus/solana-lib": "^1.4.2",
+    "@exodus/simple-retry": "^0.0.6",
+    "@exodus/solana-lib": "^1.4.3",
     "@exodus/solana-web3.js": "1.31.0-exodus.5",
     "@ungap/url-search-params": "^0.2.2",
     "bignumber.js": "^9.0.1",
@@ -34,5 +35,5 @@
   "devDependencies": {
     "node-fetch": "~2.6.0"
   },
-  "gitHead": "a1edc6b3a0ced394f284bcfead32431baa2a27f0"
+  "gitHead": "78b7f5c6d314b393f038848ef5b5815d46b8dd35"
 }

package/src/api.js

@@ -1,6 +1,7 @@
 // @flow
 import BN from 'bn.js'
 import createApi from '@exodus/asset-json-rpc'
+import { retry } from '@exodus/simple-retry'
 import {
   getMetadataAccount,
   deserializeMetaplexMetadata,
@@ -801,14 +802,37 @@ export class Api {
   /**
    * Broadcast a signed transaction
    */
-  broadcastTransaction = async (signedTx: string): string => {
+  broadcastTransaction = async (signedTx: string, options): string => {
     console.log('Solana broadcasting TX:', signedTx) // base64
+    const defaultOptions = { encoding: 'base64', preflightCommitment: 'finalized' }
 
-    const params = [signedTx, { encoding: 'base64', commitment: 'finalized' }]
-    const result = await this.rpcCall('sendTransaction', params, { forceHttp: true })
+    const params = [signedTx, { ...defaultOptions, ...options }]
+    const errorMessagesToRetry = ['Blockhash not found']
 
-    console.log(`tx ${JSON.stringify(result)} sent!`)
-    return result || null
+    const broadcastTxWithRetry = retry(
+      async () => {
+        try {
+          const result = await this.rpcCall('sendTransaction', params, { forceHttp: true })
+          console.log(`tx ${JSON.stringify(result)} sent!`)
+
+          return result || null
+        } catch (error) {
+          if (
+            error.message &&
+            !errorMessagesToRetry.find((errorMessage) => error.message.includes(errorMessage))
+          ) {
+            error.finalError = true
+          }
+
+          console.warn(`Error broadcasting tx. Retrying...`, error)
+
+          throw error
+        }
+      },
+      { delayTimesMs: ['6s', '6s', '8s', '10s'] }
+    )
+
+    return broadcastTxWithRetry()
   }
 
   simulateTransaction = async (encodedTransaction, options) => {