improve timing defaults

blockworks-foundation · Jan 15, 2024 · 6a13044 · 6a13044
1 parent 111a456
commit 6a13044
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blockworks-foundation/mangolana",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/src/globalTypes.ts b/src/globalTypes.ts
@@ -23,15 +23,15 @@ export interface TimeoutStrategy {
 
 /**
  * @param timeout optional (secs) after how much secs not confirmed transaction will be considered timeout, default: 90
- * @param getSignatureStatusesPoolIntervalMs optional (ms) pool interval of getSignatureStatues, default: 2000
+ * @param getSignatureStatusesPoolIntervalMs optional (ms) pool interval of getSignatureStatues, default: 4000
  */
 export interface Time {
   timeout: number;
 }
 /**
  * @param startBlockCheckAfterSecs optional (secs) after that time we will start to pool current blockheight and check if transaction will reach blockchain, default: 90
  * @param block BlockhashWithExpiryBlockHeight
- * @param getSignatureStatusesPoolIntervalMs optional (ms) pool interval of getSignatureStatues and blockheight, default: 2000
+ * @param getSignatureStatusesPoolIntervalMs optional (ms) pool interval of getSignatureStatues and blockheight, default: 4000
  */
 export interface BlockHeight {
   startBlockCheckAfterSecs?: number;
@@ -42,7 +42,7 @@ export class TimeStrategyClass implements TimeStrategy {
   getSignatureStatusesPoolIntervalMs: number;
   constructor({
     timeout = 90,
-    getSignatureStatusesPoolIntervalMs = 5000,
+    getSignatureStatusesPoolIntervalMs = 4000,
   }: {
     timeout: number;
     getSignatureStatusesPoolIntervalMs?: number;
@@ -58,7 +58,7 @@ export class BlockHeightStrategyClass implements BlockHeightStrategy {
   constructor({
     startBlockCheckAfterSecs = 10,
     block,
-    getSignatureStatusesPoolIntervalMs = 5000,
+    getSignatureStatusesPoolIntervalMs = 4000,
   }: {
     block: BlockhashWithExpiryBlockHeight;
     getSignatureStatusesPoolIntervalMs?: number;

diff --git a/src/transactions.ts b/src/transactions.ts
@@ -55,14 +55,14 @@ export type awaitTransactionSignatureConfirmationProps = {
  * TimeStrategy: pure timeout strategy
  *
  *  timeout: optional, (secs) after how much secs not confirmed transaction will be considered timeout, default: 90
- *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues, default: 2000
+ *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues, default: 4000
  *
  *
  * BlockHeightStrategy: blockheight pool satrategy
  *
  *  startBlockCheckAfterSecs: optional, (secs) after that time we will start to pool current blockheight and check if transaction will reach blockchain, default: 90
  *  block: BlockhashWithExpiryBlockHeight
- *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 2000
+ *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 4000
  * @param config.logFlowInfo when true it will console log process of processing transactions
  */
 export const awaitTransactionSignatureConfirmation = async ({
@@ -118,7 +118,7 @@ const confirmWithSignatureStatuses = (
   return new Promise<RpcResponseAndContext<SignatureStatus>>(async (resolve, reject) => {
     try {
       let intervalTimeout: NodeJS.Timer | null = null;
-      const retryTimer = timeoutConfig.getSignatureStatusesPoolIntervalMs || 5000;
+      const retryTimer = timeoutConfig.getSignatureStatusesPoolIntervalMs || 4000;
       const onAbort = () => {
         if (intervalTimeout) {
           clearInterval(intervalTimeout);
@@ -244,7 +244,7 @@ const timeoutCheck = (
       };
       internalSignal.addEventListener('abort', onAbort);
       externalSignal?.addEventListener('abort', onAbort);
-      const retrySleep = timeoutConfig.getSignatureStatusesPoolIntervalMs || 5000;
+      const retrySleep = timeoutConfig.getSignatureStatusesPoolIntervalMs || 4000;
       setTimeoutTimer = setTimeout(async () => {
         try {
           if (timeoutBlockHeight !== 0) {
@@ -303,17 +303,17 @@ export type sendAndConfirmSignedTransactionProps = {
  * TimeStrategy: pure timeout strategy
  *
  *  timeout: optional, (secs) after how much secs not confirmed transaction will be considered timeout, default: 90
- *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues, default: 5000
+ *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues, default: 4000
  *
  *
  * BlockHeightStrategy: blockheight pool satrategy
  *
  *  startBlockCheckAfterSecs: optional, (secs) after that time we will start to pool current blockheight and check if transaction will reach blockchain, default: 90
  *  block: BlockhashWithExpiryBlockHeight
- *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 2000
+ *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 4000
  *
  * @param config.resendTxUntilConfirmed force resend transaction in the mean time of waiting for confirmation, default false
- * @param config.resendPoolTimeMs when resendTxUntilConfirmed is true it will resend transaction every value of ms until there is timeout, default 2000
+ * @param config.resendPoolTimeMs when resendTxUntilConfirmed is true it will resend transaction every value of ms until there is timeout, default: 2000
  * @param config.logFlowInfo when true it will console log process of processing transactions
  * @param config.skipPreflight
  */
@@ -442,7 +442,7 @@ export type sendSignAndConfirmTransactionsProps = {
  *
  *  startBlockCheckAfterSecs: optional, (secs) after that time we will start to pool current blockheight and check if transaction will reach blockchain, default: 90
  *  block: BlockhashWithExpiryBlockHeight
- *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 2000
+ *  getSignatureStatusesPoolIntervalMs: optional, (ms) pool interval of getSignatureStatues and blockheight, default: 4000
  *
  *
  * @param callbacks sets of callbacks