add try/catch around getGasPrice (#370)

* add try/catch around getGasPrice * return 1gwei if fail * don't throw errors * add same case to legacy * handle cases where gas price can't be found * throw error --------- Co-authored-by: mouseless <[email protected]>
pimlicolabs · Dec 4, 2024 · ea121ff · ea121ff
1 parent a8bfdc7
commit ea121ff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -153,8 +153,15 @@ export class Executor {
     ): Promise<ReplaceTransactionResult> {
         const newRequest = { ...transactionInfo.transactionRequest }
 
-        const gasPriceParameters =
-            await this.gasPriceManager.getNetworkGasPrice()
+        let gasPriceParameters
+        try {
+            gasPriceParameters =
+                await this.gasPriceManager.tryGetNetworkGasPrice()
+        } catch (err) {
+            this.logger.error({ error: err }, "Failed to get network gas price")
+            this.markWalletProcessed(transactionInfo.executor)
+            return { status: "failed" }
+        }
 
         newRequest.maxFeePerGas = maxBigInt(
             gasPriceParameters.maxFeePerGas,
@@ -496,7 +503,8 @@ export class Executor {
 
         const wallets = Array.from(allWallets)
 
-        const gasPrice = await this.gasPriceManager.getNetworkGasPrice()
+        const gasPrice = await this.gasPriceManager.tryGetNetworkGasPrice()
+
         const promises = wallets.map((wallet) => {
             try {
                 flushStuckTransaction(
@@ -722,7 +730,7 @@ export class Executor {
         let gasPriceParameters: GasPriceParameters
         try {
             ;[gasPriceParameters, nonce] = await Promise.all([
-                this.gasPriceManager.getNetworkGasPrice(),
+                this.gasPriceManager.tryGetNetworkGasPrice(),
                 this.config.publicClient.getTransactionCount({
                     address: wallet.address,
                     blockTag: "pending"
@@ -1021,7 +1029,7 @@ export class Executor {
         let gasPriceParameters: GasPriceParameters
         try {
             ;[gasPriceParameters, nonce] = await Promise.all([
-                this.gasPriceManager.getNetworkGasPrice(),
+                this.gasPriceManager.tryGetNetworkGasPrice(),
                 this.config.publicClient.getTransactionCount({
                     address: wallet.address,
                     blockTag: "pending"

diff --git a/src/executor/executorManager.ts b/src/executor/executorManager.ts
@@ -776,7 +776,7 @@ export class ExecutorManager {
 
         // for all still not included check if needs to be replaced (based on gas price)
         const gasPriceParameters =
-            await this.gasPriceManager.getNetworkGasPrice()
+            await this.gasPriceManager.tryGetNetworkGasPrice()
         this.logger.trace(
             { gasPriceParameters },
             "fetched gas price parameters"

diff --git a/src/executor/senderManager.ts b/src/executor/senderManager.ts
@@ -138,7 +138,7 @@ export class SenderManager {
 
         if (Object.keys(balancesMissing).length > 0) {
             const { maxFeePerGas, maxPriorityFeePerGas } =
-                await this.gasPriceManager.getNetworkGasPrice()
+                await this.gasPriceManager.tryGetNetworkGasPrice()
 
             if (this.config.refillHelperContract) {
                 const instructions = []

diff --git a/src/handlers/gasPriceManager.ts b/src/handlers/gasPriceManager.ts
@@ -71,7 +71,7 @@ export class GasPriceManager {
                     this.updateBaseFee()
                 }
 
-                this.updateGasPrice()
+                this.tryUpdateGasPrice()
             }, this.config.gasPriceRefreshInterval * 1000)
         }
 
@@ -81,7 +81,7 @@ export class GasPriceManager {
 
     public init() {
         return Promise.all([
-            this.updateGasPrice(),
+            this.tryUpdateGasPrice(),
             this.config.legacyTransactions === false
                 ? this.updateBaseFee()
                 : Promise.resolve()
@@ -296,6 +296,7 @@ export class GasPriceManager {
         return { maxFeePerGas, maxPriorityFeePerGas }
     }
 
+    // This method throws if it can't get a valid RPC response.
     private async innerGetGasPrice(): Promise<GasPriceParameters> {
         let maxFeePerGas = 0n
         let maxPriorityFeePerGas = 0n
@@ -386,7 +387,8 @@ export class GasPriceManager {
         return baseFee
     }
 
-    private async updateGasPrice(): Promise<GasPriceParameters> {
+    // This method throws if it can't get a valid RPC response.
+    private async tryUpdateGasPrice(): Promise<GasPriceParameters> {
         const gasPrice = await this.innerGetGasPrice()
 
         this.maxFeePerGasQueue.saveValue(gasPrice.maxFeePerGas)
@@ -397,7 +399,7 @@ export class GasPriceManager {
 
     public async getGasPrice(): Promise<GasPriceParameters> {
         if (this.config.gasPriceRefreshInterval === 0) {
-            return await this.updateGasPrice()
+            return await this.tryUpdateGasPrice()
         }
 
         const maxFeePerGas = this.maxFeePerGasQueue.getLatestValue()
@@ -414,7 +416,8 @@ export class GasPriceManager {
         }
     }
 
-    public async getNetworkGasPrice(): Promise<GasPriceParameters> {
+    // This method throws if it can't get a valid RPC response.
+    public async tryGetNetworkGasPrice(): Promise<GasPriceParameters> {
         return await this.innerGetGasPrice()
     }