Merge pull request #2676 from OriginTrail/improvement/fixed-gas-limit…

…-removal Removed fixed gas limit for blockchain functions
OriginTrail · Sep 7, 2023 · 8fa0308 · 8fa0308
2 parents 40c317c + 6055570
commit 8fa0308
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/constants/constants.js b/src/constants/constants.js
@@ -542,12 +542,6 @@ export const CONTRACT_EVENT_FETCH_INTERVALS = {
     DEVELOPMENT: 4 * 1000,
 };
 
-export const FIXED_GAS_LIMIT_METHODS = {
-    submitCommit: 600000,
-    submitUpdateCommit: 600000,
-    sendProof: 500000,
-};
-
 export const BLOCK_TIME_MILLIS = {
     OTP: 12_000,
     HARDHAT: 5_000,

diff --git a/src/modules/blockchain/implementation/web3-service.js b/src/modules/blockchain/implementation/web3-service.js
@@ -8,7 +8,6 @@ import {
     DEFAULT_BLOCKCHAIN_EVENT_SYNC_PERIOD_IN_MILLS,
     MAXIMUM_NUMBERS_OF_BLOCKS_TO_FETCH,
     TRANSACTION_QUEUE_CONCURRENCY,
-    FIXED_GAS_LIMIT_METHODS,
     TRANSACTION_POLLING_TIMEOUT_MILLIS,
     TRANSACTION_CONFIRMATIONS,
     BLOCK_TIME_MILLIS,
@@ -348,14 +347,7 @@ class Web3Service {
         while (result === undefined) {
             try {
                 /* eslint-disable no-await-in-loop */
-                let gasLimit;
-
-                if (FIXED_GAS_LIMIT_METHODS[functionName]) {
-                    gasLimit = FIXED_GAS_LIMIT_METHODS[functionName];
-                } else {
-                    gasLimit = await contractInstance.estimateGas[functionName](...args);
-                }
-
+                const gasLimit = await contractInstance.estimateGas[functionName](...args);
                 const gas = gasLimit ?? this.convertToWei(900, 'kwei');
 
                 this.logger.info(