Fix Last Valid Block Height Issue (#146)

helius-labs · Oct 2, 2024 · cb2db7a · cb2db7a
1 parent 6fbb3e7
commit cb2db7a
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/RpcClient.ts b/src/RpcClient.ts
@@ -739,6 +739,12 @@ export class RpcClient {
 
       const commitment = sendOptions?.preflightCommitment || 'confirmed';
 
+      const currentBlockHeight = await this.connection.getBlockHeight();
+      const lastValidBlockHeight = Math.min(
+        blockhash.lastValidBlockHeight,
+        currentBlockHeight + lastValidBlockHeightOffset
+      );
+
       let error: Error;
 
       // We will retry the transaction on TransactionExpiredBlockheightExceededError
@@ -767,9 +773,7 @@ export class RpcClient {
               abortSignal,
               signature,
               blockhash: blockhash.blockhash,
-              lastValidBlockHeight:
-                blockhash.lastValidBlockHeight +
-                lastValidBlockHeightOffset,
+              lastValidBlockHeight: lastValidBlockHeight,
             },
             commitment
           );
@@ -961,15 +965,20 @@ export class RpcClient {
       jitoApiUrl
     );
 
+    const currentBlockHeight = await this.connection.getBlockHeight();
+    const lastValidBlockHeight = Math.min(
+      blockhash.lastValidBlockHeight,
+      currentBlockHeight + lastValidBlockHeightOffset
+    );
+
     // Poll for confirmation status
     const timeout = 60000; // 60 second timeout
     const interval = 5000; // 5 second interval
     const startTime = Date.now();
 
     while (
       Date.now() - startTime < timeout ||
-      (await this.connection.getBlockHeight()) <=
-        blockhash.lastValidBlockHeight + lastValidBlockHeightOffset
+      (await this.connection.getBlockHeight()) <= lastValidBlockHeight
     ) {
       const bundleStatuses = await this.getBundleStatuses(
         [bundleId],