From 62b207f84bdb23972fafe7616492d09f410a5eea Mon Sep 17 00:00:00 2001
From: Hesham <hesham@fuse.io>
Date: Wed, 13 Dec 2023 15:38:38 +0100
Subject: [PATCH 1/2] Update merge configuration

---
 src/Nethermind/Nethermind.Runner/configs/fuse.cfg            | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg    | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg  | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/spark.cfg           | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg   | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse.cfg
index ed634062dd0..d86c86cab12 100644
--- a/src/Nethermind/Nethermind.Runner/configs/fuse.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/fuse.cfg
@@ -47,5 +47,8 @@
   },
   "Mining": {
     "MinGasPrice": "10000000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg
index 7e68f9e166f..5f4a142ff68 100644
--- a/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/fuse_archive.cfg
@@ -36,5 +36,8 @@
   },
   "Mining": {
     "MinGasPrice": "10000000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg
index 4d1586bf0af..c73fc3fd1ae 100644
--- a/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/fuse_validator.cfg
@@ -49,5 +49,8 @@
     "Enabled": true,
     "MinGasPrice": "10000000000",
     "TargetBlockGasLimit": "20000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/spark.cfg b/src/Nethermind/Nethermind.Runner/configs/spark.cfg
index 909ab24851b..b28df7f80af 100644
--- a/src/Nethermind/Nethermind.Runner/configs/spark.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/spark.cfg
@@ -52,5 +52,8 @@
   },
   "Mining": {
     "MinGasPrice": "10000000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg
index 4e8517c74ce..40d548195fc 100644
--- a/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/spark_archive.cfg
@@ -36,5 +36,8 @@
   },
   "Mining": {
     "MinGasPrice": "10000000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }
diff --git a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg
index 56b15ded930..532a92e516f 100644
--- a/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/spark_validator.cfg
@@ -49,5 +49,8 @@
     "Enabled": true,
     "MinGasPrice": "10000000000",
     "TargetBlockGasLimit": "20000000"
-  }
+  },
+  "Merge": {
+    "Enabled": false
+  }  
 }

From 516e73a436bb94920fb8026c0230dfca70a65d92 Mon Sep 17 00:00:00 2001
From: Hesham <hesham@fuse.io>
Date: Wed, 13 Dec 2023 15:48:21 +0100
Subject: [PATCH 2/2] Fix gas price estimation whitespace

---
 .../Nethermind.JsonRpc/Modules/Eth/GasPrice/GasPriceOracle.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/GasPrice/GasPriceOracle.cs b/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/GasPrice/GasPriceOracle.cs
index 77db179764e..54f0528bf51 100644
--- a/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/GasPrice/GasPriceOracle.cs
+++ b/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/GasPrice/GasPriceOracle.cs
@@ -56,7 +56,7 @@ public UInt256 GetGasPriceEstimate()
 
             IEnumerable<UInt256> txGasPrices = GetSortedGasPricesFromRecentBlocks(headBlock.Number);
             UInt256 gasPriceEstimate = GetGasPriceAtPercentile(txGasPrices.ToList()) ?? GetMinimumGasPrice(headBlock.BaseFeePerGas);
-			gasPriceEstimate = UInt256.Max(gasPriceEstimate, GetMinimumGasPrice(headBlock.BaseFeePerGas));
+            gasPriceEstimate = UInt256.Max(gasPriceEstimate, GetMinimumGasPrice(headBlock.BaseFeePerGas));
             gasPriceEstimate = UInt256.Min(gasPriceEstimate!, EthGasPriceConstants.MaxGasPrice);
             _gasPriceEstimation.Set(headBlockHash, gasPriceEstimate);
             return gasPriceEstimate!;