Merge pull request #216 from rsksmart/use-estimateGas-on-ethereum

pmprete · web-flow · commit 974dae34d59e · 2021-05-28T23:33:12.000-03:00
addressing FTB-022 reported issue
diff --git a/federator/src/lib/TransactionSender.js b/federator/src/lib/TransactionSender.js
@@ -35,8 +35,13 @@ module.exports = class TransactionSender {
     }
 
     async getGasLimit(rawTx) {
+        const chainId = await this.getChainId();
         let estimatedGas = await this.client.eth.estimateGas({ gasPrice: rawTx.gasPrice, value: rawTx.value, to: rawTx.to, data: rawTx.data, from: rawTx.from});
-        estimatedGas = (estimatedGas < 300000) ? 300000 : 3500000;
+        
+        if (chainId >= 30 && chainId <= 33) {
+            estimatedGas = (estimatedGas < 300000) ? 300000 : 3500000;
+        }
+        
         return estimatedGas;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,13 @@ module.exports = class TransactionSender {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`async getGasLimit(rawTx) {`
	`38`	`+ const chainId = await this.getChainId();`
`38`	`39`	`let estimatedGas = await this.client.eth.estimateGas({ gasPrice: rawTx.gasPrice, value: rawTx.value, to: rawTx.to, data: rawTx.data, from: rawTx.from});`
`39`		`- estimatedGas = (estimatedGas < 300000) ? 300000 : 3500000;`
	`40`	`+`
	`41`	`+ if (chainId >= 30 && chainId <= 33) {`
	`42`	`+ estimatedGas = (estimatedGas < 300000) ? 300000 : 3500000;`
	`43`	`+ }`
	`44`	`+`
`40`	`45`	`return estimatedGas;`
`41`	`46`	`}`
`42`	`47`