From 83e321672fd353ba6c411cd0a5e2737adcbd2547 Mon Sep 17 00:00:00 2001
From: Mihajlo Pavlovic <mihajlo.pavlovic@origin-trail.com>
Date: Tue, 16 Jan 2024 12:57:15 +0100
Subject: [PATCH 1/2] Set Gsnosis default gas price to 2 Gwei

---
 .../implementation/gnosis/gnosis-service.js      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/modules/blockchain/implementation/gnosis/gnosis-service.js b/src/modules/blockchain/implementation/gnosis/gnosis-service.js
index a265283c0a..92ba352f81 100644
--- a/src/modules/blockchain/implementation/gnosis/gnosis-service.js
+++ b/src/modules/blockchain/implementation/gnosis/gnosis-service.js
@@ -26,9 +26,23 @@ class GnosisService extends Web3Service {
             this.logger.debug(`Gas price on Gnosis: ${gasPrice}`);
             return gasPrice;
         } catch (error) {
-            return undefined;
+            this.logger.debug(
+                `Failed to fetch the gas price from the Gnosis: ${error}. Using default value: 2 Gwei.`,
+            );
+            this.convertToWei(2, 'gwei');
         }
     }
+
+    async healthCheck() {
+        try {
+            const blockNumber = await this.getBlockNumber();
+            if (blockNumber) return true;
+        } catch (e) {
+            this.logger.error(`Error on checking Gnosis blockchain. ${e}`);
+            return false;
+        }
+        return false;
+    }
 }
 
 export default GnosisService;

From 87e4dfadd9aed7581583aa603e76153e3a1259cc Mon Sep 17 00:00:00 2001
From: Mihajlo Pavlovic <mihajlo.pavlovic@origin-trail.com>
Date: Tue, 16 Jan 2024 13:17:26 +0100
Subject: [PATCH 2/2] Turn defualt gas price value to const, turn log to warn

---
 src/constants/constants.js                                | 2 ++
 .../blockchain/implementation/gnosis/gnosis-service.js    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/constants/constants.js b/src/constants/constants.js
index da56d038a7..16d0f3588e 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -188,6 +188,8 @@ export const COMMAND_TX_GAS_INCREASE_FACTORS = {
     SUBMIT_PROOFS: 1.2,
 };
 
+export const GNOSIS_DEFAULT_GAS_PRICE = 2;
+
 export const WEBSOCKET_PROVIDER_OPTIONS = {
     reconnect: {
         auto: true,
diff --git a/src/modules/blockchain/implementation/gnosis/gnosis-service.js b/src/modules/blockchain/implementation/gnosis/gnosis-service.js
index 92ba352f81..089ad52f81 100644
--- a/src/modules/blockchain/implementation/gnosis/gnosis-service.js
+++ b/src/modules/blockchain/implementation/gnosis/gnosis-service.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import Web3Service from '../web3-service.js';
-import { BLOCK_TIME_MILLIS } from '../../../../constants/constants.js';
+import { BLOCK_TIME_MILLIS, GNOSIS_DEFAULT_GAS_PRICE } from '../../../../constants/constants.js';
 
 class GnosisService extends Web3Service {
     constructor(ctx) {
@@ -26,10 +26,10 @@ class GnosisService extends Web3Service {
             this.logger.debug(`Gas price on Gnosis: ${gasPrice}`);
             return gasPrice;
         } catch (error) {
-            this.logger.debug(
-                `Failed to fetch the gas price from the Gnosis: ${error}. Using default value: 2 Gwei.`,
+            this.logger.warn(
+                `Failed to fetch the gas price from the Gnosis: ${error}. Using default value: ${GNOSIS_DEFAULT_GAS_PRICE} Gwei.`,
             );
-            this.convertToWei(2, 'gwei');
+            this.convertToWei(GNOSIS_DEFAULT_GAS_PRICE, 'gwei');
         }
     }