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 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!; 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 + } }