fix: increase gas multiple on each resend attempt

Author: arcoraven

src/tests/math.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getPercentile } from "../utils/math";
+import { clamp, getPercentile } from "../utils/math";
 
 describe("getPercentile", () => {
   it("should correctly calculate the p50 (median) of a sorted array", () => {
@@ -27,3 +27,25 @@ describe("getPercentile", () => {
     expect(getPercentile(numbers, 50)).toBe(0);
   });
 });
+
+describe("clamp", () => {
+  it("clamps the value correctly below the minimum", () => {
+    expect(clamp(0, { min: 2, max: 10 })).toBe(2);
+  });
+
+  it("clamps the value correctly at the minimum", () => {
+    expect(clamp(1, { min: 2, max: 10 })).toBe(2);
+  });
+
+  it("returns the value when within bounds", () => {
+    expect(clamp(3, { min: 2, max: 10 })).toBe(6);
+  });
+
+  it("clamps the value correctly at the maximum", () => {
+    expect(clamp(5, { min: 2, max: 10 })).toBe(10);
+  });
+
+  it("clamps the value correctly above the maximum", () => {
+    expect(clamp(6, { min: 2, max: 10 })).toBe(10);
+  });
+});

src/utils/math.ts

@@ -7,3 +7,8 @@ export const getPercentile = (arr: number[], percentile: number): number => {
   const index = Math.floor((percentile / 100) * (arr.length - 1));
   return arr[index];
 };
+
+export const clamp = (
+  val: number,
+  { min, max }: { min: number; max: number },
+) => Math.max(min, Math.min(val * 2, max));

src/worker/tasks/sendTransactionWorker.ts

@@ -1,18 +1,18 @@
-import { type Job, type Processor, Worker } from "bullmq";
+import { Worker, type Job, type Processor } from "bullmq";
 import assert from "node:assert";
 import superjson from "superjson";
 import {
-  type Hex,
   getAddress,
   getContract,
   readContract,
   toSerializableTransaction,
+  type Hex,
 } from "thirdweb";
 import { stringify } from "thirdweb/utils";
 import {
-  type UserOperation,
   bundleUserOp,
   createAndSignUserOp,
+  type UserOperation,
 } from "thirdweb/wallets/smart";
 import { getContractAddress } from "viem";
 import { TransactionDB } from "../../db/transactions/db";
@@ -33,6 +33,7 @@ import {
   prettifyError,
   prettifyTransactionError,
 } from "../../utils/error";
+import { clamp } from "../../utils/math";
 import { getChecksumAddress } from "../../utils/primitiveTypes";
 import { recordMetrics } from "../../utils/prometheus";
 import { redis } from "../../utils/redis/redis";
@@ -48,8 +49,8 @@ import { reportUsage } from "../../utils/usage";
 import { MineTransactionQueue } from "../queues/mineTransactionQueue";
 import { logWorkerExceptions } from "../queues/queues";
 import {
-  type SendTransactionData,
   SendTransactionQueue,
+  type SendTransactionData,
 } from "../queues/sendTransactionQueue";
 
 /**
@@ -400,18 +401,20 @@ const _resendTransaction = async (
     },
   });
 
-  // Double gas fee settings if they were not provded in `overrides`.
+  // Double the gas fee settings each attempt up to 10x.
+  // Do not update gas if overrides were provided.
+  const gasMultiple = BigInt(clamp(job.attemptsMade * 2, { min: 2, max: 10 }));
   if (populatedTransaction.gasPrice) {
-    populatedTransaction.gasPrice *= 2n;
+    populatedTransaction.gasPrice *= gasMultiple;
   }
   if (populatedTransaction.maxFeePerGas && !overrides?.maxFeePerGas) {
-    populatedTransaction.maxFeePerGas *= 2n;
+    populatedTransaction.maxFeePerGas *= gasMultiple;
   }
   if (
     populatedTransaction.maxPriorityFeePerGas &&
     !overrides?.maxPriorityFeePerGas
   ) {
-    populatedTransaction.maxPriorityFeePerGas *= 2n;
+    populatedTransaction.maxPriorityFeePerGas *= gasMultiple;
   }
 
   job.log(`Populated transaction: ${stringify(populatedTransaction)}`);