config updates + retry update (#434)

thirdweb-dev · Feb 29, 2024 · fef7cd9 · fef7cd9
1 parent cff0201
commit fef7cd9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/db/configuration/getConfiguration.ts b/src/db/configuration/getConfiguration.ts
@@ -178,8 +178,8 @@ export const getConfiguration = async (): Promise<Config> => {
         maxTxsToProcess: 30,
         minedTxListenerCronSchedule: "*/5 * * * * *",
         maxTxsToUpdate: 50,
-        retryTxListenerCronSchedule: "*/30 * * * * *",
-        minEllapsedBlocksBeforeRetry: 15,
+        retryTxListenerCronSchedule: "*/10 * * * * *",
+        minEllapsedBlocksBeforeRetry: 4,
         maxFeePerGasForRetries: ethers.utils
           .parseUnits("1000", "gwei")
           .toString(),

diff --git a/src/db/transactions/getTxToRetry.ts b/src/db/transactions/getTxToRetry.ts
@@ -29,6 +29,7 @@ WHERE
   AND "transactionHash" IS NOT NULL
   AND "retryCount" < ${config.maxRetriesPerTx}
 ORDER BY
+  "sentAt",
   "nonce"
 ASC
 LIMIT

diff --git a/src/worker/tasks/retryTx.ts b/src/worker/tasks/retryTx.ts
@@ -49,21 +49,21 @@ export const retryTx = async () => {
         }
 
         const gasOverrides = await getGasSettingsForRetry(tx, provider);
-        if (
-          gasOverrides.maxFeePerGas?.gt(config.maxFeePerGasForRetries) ||
-          gasOverrides.maxPriorityFeePerGas?.gt(
-            config.maxPriorityFeePerGasForRetries,
-          )
-        ) {
-          // Return if gas settings exceed configured limits. Try again later.
-          logger({
-            service: "worker",
-            level: "warn",
-            queueId: tx.id,
-            message: `${tx.chainId} chain gas price is higher than maximum threshold.`,
-          });
-          return;
-        }
+        // if (
+        //   gasOverrides.maxFeePerGas?.gt(config.maxFeePerGasForRetries) ||
+        //   gasOverrides.maxPriorityFeePerGas?.gt(
+        //     config.maxPriorityFeePerGasForRetries,
+        //   )
+        // ) {
+        //   // Return if gas settings exceed configured limits. Try again later.
+        //   logger({
+        //     service: "worker",
+        //     level: "warn",
+        //     queueId: tx.id,
+        //     message: `${tx.chainId} chain gas price is higher than maximum threshold.`,
+        //   });
+        //   return;
+        // }
 
         logger({
           service: "worker",