ci(gas-info): handling timeout for Scroll (#224)

* ci(gas-info): handling timeout for Scroll * style(JS): prettier * docs(timeout): comments
axelarnetwork · May 2, 2024 · 2117c43 · 2117c43
1 parent 48acddd
commit 2117c43
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/axelar-chains-config/info/testnet.json b/axelar-chains-config/info/testnet.json
@@ -1125,7 +1125,8 @@
       },
       "confirmations": 2,
       "gasOptions": {
-        "gasLimit": 7000000
+        "gasLimit": 7000000,
+        "gasPriceAdjustment": 1.5
       },
       "onchainGasEstimate": {
         "l1ChainName": "ethereum",

diff --git a/evm/gas-service.js b/evm/gas-service.js
@@ -312,7 +312,11 @@ async function processCommand(config, chain, options) {
 
                 printInfo('TX', tx.hash);
 
-                const receipt = await tx.wait(chain.confirmations);
+                const receipt = await timeout(
+                    tx.wait(chain.confirmations),
+                    chain.timeout || 60000,
+                    new Error(`Timeout updating gas info for ${chain.name}`),
+                );
 
                 const eventEmitted = wasEventEmitted(receipt, gasService, 'GasInfoUpdated');
 

diff --git a/evm/operators.js b/evm/operators.js
@@ -274,7 +274,12 @@ async function processCommand(config, chain, options) {
                     new Error(`Timeout updating gas info for ${chain.name}`),
                 );
                 printInfo('TX', tx.hash);
-                await tx.wait(chain.confirmations);
+
+                await timeout(
+                    tx.wait(chain.confirmations),
+                    chain.timeout || 60000,
+                    new Error(`Timeout updating gas info for ${chain.name}`),
+                );
             } catch (error) {
                 for (let i = 0; i < chainsToUpdate.length; i++) {
                     addFailedChainUpdate(chain.name, chainsToUpdate[i]);

diff --git a/evm/utils.js b/evm/utils.js
@@ -1179,9 +1179,14 @@ function toBigNumberString(number) {
 
 function timeout(prom, time, exception) {
     let timer;
-    return Promise.race([prom, new Promise((resolve, reject) => (timer = setTimeout(reject, time, exception)))]).finally(() =>
-        clearTimeout(timer),
-    );
+
+    // Racing the promise with a timer
+    // If the timer resolves first, the promise is rejected with the exception
+    const race = Promise.race([prom, new Promise((resolve, reject) => (timer = setTimeout(reject, time, exception)))]);
+
+    race.finally(() => clearTimeout(timer));
+
+    return race;
 }
 
 module.exports = {