@huma-finance/widgets 0.0.73-beta.917 → 0.0.73-beta.922

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.73-beta.917+5aaf637",
+  "version": "0.0.73-beta.922+faafb9d",
   "publishConfig": {
     "access": "public"
   },
@@ -29,9 +29,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.73-beta.917+5aaf637",
-    "@huma-finance/shared": "^0.0.73-beta.917+5aaf637",
-    "@huma-finance/web-shared": "^0.0.73-beta.917+5aaf637",
+    "@huma-finance/sdk": "^0.0.73-beta.922+faafb9d",
+    "@huma-finance/shared": "^0.0.73-beta.922+faafb9d",
+    "@huma-finance/web-shared": "^0.0.73-beta.922+faafb9d",
     "@mui/x-date-pickers": "^5.0.7",
     "@notifi-network/notifi-frontend-client": "^1.1.2",
     "@notifi-network/notifi-react": "^1.1.2",
@@ -201,5 +201,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "5aaf637491bd7d8ed40d295f5fdcb596401bf2f8"
+  "gitHead": "faafb9de87c976813ef26c6e352972cb5ad0b57c"
 }

package/src/components/SolanaTxSendModal.tsx

@@ -32,7 +32,7 @@ export function SolanaTxSendModal({
   const { connection } = useConnection()
   const [signature, setSignature] = useState<string>('')
   const [showRetryScreen, setShowRetryScreen] = useState<boolean>(false)
-  const [useHighPriority, setUseHighPriority] = useState<boolean>(false)
+  const [useHighPriority, setUseHighPriority] = useState<boolean>(true)
   const [refreshCount, refresh] = useForceRefresh()
 
   const styles = {
@@ -77,15 +77,14 @@ export function SolanaTxSendModal({
         return
       }
 
-      let signatureResult = ''
       try {
         // Optimize transaction
         // Make a copy of the tx so we can use the original tx for retries
         const txCopy = new Transaction()
         txCopy.instructions = [...tx.instructions]
-        const recentBlockhash = await connection.getLatestBlockhash('confirmed')
-        txCopy.recentBlockhash = recentBlockhash.blockhash
-        txCopy.lastValidBlockHeight = recentBlockhash.lastValidBlockHeight
+        const txBlockhashData = await connection.getLatestBlockhash('confirmed')
+        txCopy.recentBlockhash = txBlockhashData.blockhash
+        txCopy.lastValidBlockHeight = txBlockhashData.lastValidBlockHeight
         txCopy.feePayer = publicKey
         // Extract writable accounts
         const txAccounts = extractWritableAccounts(txCopy)
@@ -99,39 +98,22 @@ export function SolanaTxSendModal({
           useHighPriority ? 'High' : undefined,
           process.env.REACT_APP_HELIUS_API_KEY,
         )
-        signatureResult = await sendTransaction(optimizedTx, connection, {
-          preflightCommitment: 'confirmed',
-          skipPreflight: true,
-        })
+        const signedTx = await signTransaction(optimizedTx)
+        const signatureResult = await connection.sendRawTransaction(
+          signedTx.serialize(),
+          {
+            preflightCommitment: 'confirmed',
+            skipPreflight: true,
+            maxRetries: 0,
+          },
+        )
         setSignature(signatureResult)
         dispatch(setSolanaSignature(signatureResult))
-        await connection.confirmTransaction({
-          blockhash: optimizedTx.recentBlockhash!,
-          lastValidBlockHeight: optimizedTx.lastValidBlockHeight!,
-          signature: signatureResult,
-        })
-        const txResult = await connection.getParsedTransaction(
-          signatureResult,
-          'confirmed',
-        )
-        if (txResult?.meta?.err) {
-          dispatch(
-            setError({
-              errorMessage:
-                'Your transaction was confirmed but had errors. Please check the transaction details on the explorer for more information.',
-            }),
-          )
-          return
-        }
-        handleSuccess({ signature: signatureResult })
-      } catch (error: unknown) {
-        console.log(error)
 
-        let signatureStatusRetries = 0
-        while (signatureStatusRetries < 5) {
-          // Attempt to load the signature status using transaction history
-          // eslint-disable-next-line no-await-in-loop
-          await sleep(1000)
+        // Loop and poll the transaction continuously until it is either confirmed or
+        // the block height has been exceeded
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
           // eslint-disable-next-line no-await-in-loop
           const result = await connection.getSignatureStatus(signatureResult, {
             searchTransactionHistory: true,
@@ -153,16 +135,27 @@ export function SolanaTxSendModal({
             return
           }
 
-          signatureStatusRetries += 1
+          // eslint-disable-next-line no-await-in-loop
+          const latestBlockhash = await connection.getLatestBlockhash(
+            'confirmed',
+          )
+          if (
+            latestBlockhash.lastValidBlockHeight -
+              optimizedTx.lastValidBlockHeight! >
+            100
+          ) {
+            setShowRetryScreen(true)
+            return
+          }
+
+          // eslint-disable-next-line no-await-in-loop
+          await sleep(1000)
         }
+      } catch (error: unknown) {
+        console.log(error)
 
         const err = error as Error
-        if (err?.message?.includes('block height exceeded')) {
-          // Allow the user to retry the transaction
-          setShowRetryScreen(true)
-        } else {
-          dispatch(setError({ errorMessage: err?.message || '' }))
-        }
+        dispatch(setError({ errorMessage: err?.message || '' }))
       }
     }
     sendTx()