Merge pull request #102 from OriginTrail/bugfix/tx-retry

Changed logic for increasing gas price, while retrying tx
OriginTrail · Sep 7, 2023 · 0632717 · 0632717
2 parents 4ea85ad + dda4a16
commit 0632717
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dkg.js",
-    "version": "6.0.10",
+    "version": "6.0.11",
     "description": "Javascript library for interaction with the OriginTrail Decentralized Knowledge Graph",
     "main": "index.js",
     "scripts": {

diff --git a/services/blockchain-service/blockchain-service-base.js b/services/blockchain-service/blockchain-service-base.js
@@ -49,36 +49,39 @@ class BlockchainServiceBase {
         return;
     }
 
+    async getNetworkGasPrice(blockchain) {
+        const web3Instance = await this.getWeb3Instance(blockchain);
+
+        try {
+            return await web3Instance.eth.getGasPrice();
+        } catch (error) {
+            console.warn(`Failed to fetch the gas price from the network: ${error}. Using default value: 100 Gwei.`);
+            return Web3.utils.toWei('100', 'Gwei');
+        }
+    }
+
     async callContractFunction(contractName, functionName, args, blockchain) {
         const contractInstance = await this.getContractInstance(contractName, blockchain);
         return contractInstance.methods[functionName](...args).call();
     }
 
     async prepareTransaction(contractInstance, functionName, args, blockchain) {
         const publicKey = await this.getPublicKey(blockchain);
-        const web3Instance = await this.getWeb3Instance(blockchain);
         const gasLimit = await contractInstance.methods[functionName](...args).estimateGas({
             from: blockchain.publicKey,
         });
 
         const encodedABI = await contractInstance.methods[functionName](...args).encodeABI();
 
-        let gasPrice;
-        if (blockchain.gasPrice === undefined) {
-            gasPrice = await web3Instance.eth.getGasPrice();
-        }
-
-        // Gas price increase for handling `Transaction not mined` error
-        if (blockchain.retryTx && gasPrice <= blockchain.gasPrice) {
-            gasPrice = Number(blockchain.gasPrice) + 1;
-        } else if (blockchain.gasPrice) {
-            // Gas price provided by developers
-            gasPrice = blockchain.gasPrice;
-        }
+        let gasPrice = Number(
+            blockchain.previousTxGasPrice ||
+            blockchain.gasPrice ||
+            await this.getNetworkGasPrice(blockchain)
+        );
 
-        // Fallback
-        if (!gasPrice) {
-            gasPrice = Web3.utils.toWei('100', 'Gwei');
+        if (blockchain.retryTx) {
+            // Increase gas price by 20%
+            gasPrice *= 1.2;
         }
 
         return {

diff --git a/services/blockchain-service/implementations/node-blockchain-service.js b/services/blockchain-service/implementations/node-blockchain-service.js
@@ -54,7 +54,7 @@ class NodeBlockchainService extends BlockchainServiceBase {
     async executeContractFunction(contractName, functionName, args, blockchain) {
         const web3Instance = await this.getWeb3Instance(blockchain);
         let result;
-        let gasPrice;
+        let previousTxGasPrice;
         let transactionRetried = false;
 
         while (result === undefined) {
@@ -68,7 +68,7 @@ class NodeBlockchainService extends BlockchainServiceBase {
                     args,
                     blockchain,
                 );
-                gasPrice = tx.gasPrice;
+                previousTxGasPrice = tx.gasPrice;
                 // eslint-disable-next-line no-await-in-loop
                 const createdTransaction = await web3Instance.eth.accounts.signTransaction(
                     tx,
@@ -92,7 +92,7 @@ class NodeBlockchainService extends BlockchainServiceBase {
                     // eslint-disable-next-line no-param-reassign
                     blockchain.retryTx = true;
                     // eslint-disable-next-line no-param-reassign
-                    blockchain.gasPrice = gasPrice;
+                    blockchain.previousTxGasPrice = previousTxGasPrice;
                 } else {
                     throw e;
                 }