Merge pull request #106 from OriginTrail/fix/already-known-retry-mech…

…anism
OriginTrail · Sep 7, 2023 · ecc52d2 · ecc52d2
2 parents dc51e20 + 9153b6b
commit ecc52d2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/dist/dkg.min.js b/dist/dkg.min.js
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.12",
+    "version": "6.0.13",
     "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
@@ -54,7 +54,9 @@ class BlockchainServiceBase {
             return await web3Instance.eth.getGasPrice();
         } catch (error) {
             // eslint-disable-next-line no-console
-            console.warn(`Failed to fetch the gas price from the network: ${error}. Using default value: 100 Gwei.`);
+            console.warn(
+                `Failed to fetch the gas price from the network: ${error}. Using default value: 100 Gwei.`,
+            );
             return Web3.utils.toWei('100', 'Gwei');
         }
     }
@@ -74,13 +76,13 @@ class BlockchainServiceBase {
 
         let gasPrice = Number(
             blockchain.previousTxGasPrice ||
-            blockchain.gasPrice ||
-            await this.getNetworkGasPrice(blockchain)
+                blockchain.gasPrice ||
+                (await this.getNetworkGasPrice(blockchain)),
         );
 
         if (blockchain.retryTx) {
             // Increase gas price by 20%
-            gasPrice *= 1.2;
+            gasPrice = Math.round(gasPrice * 1.2);
         }
 
         return {
@@ -504,8 +506,8 @@ class BlockchainServiceBase {
 
         return {
             blockchainToken: blockchainTokenBalance,
-            trac: tracBalance
-        }
+            trac: tracBalance,
+        };
     }
 
     async getLatestBlock(blockchain) {

diff --git a/services/blockchain-service/implementations/node-blockchain-service.js b/services/blockchain-service/implementations/node-blockchain-service.js
@@ -83,10 +83,8 @@ class NodeBlockchainService extends BlockchainServiceBase {
                 if (
                     !transactionRetried &&
                     blockchain.handleNotMinedError &&
-                    (
-                        e.message.includes('Transaction was not mined')
-                        || e.message.includes('Already known')
-                    )
+                    (e.message.includes('Transaction was not mined') ||
+                        e.message.includes('already known'))
                 ) {
                     transactionRetried = true;
                     // eslint-disable-next-line no-param-reassign