remove hard coded baseFeeUpdateFraction from CancunFeeMarket & Prague…

…FeeMarket Signed-off-by: Daniel Lehrner <[email protected]>
hyperledger · Jan 16, 2025 · c8a6268 · c8a6268
1 parent f439609
commit c8a6268
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.feemarket;
 
+import org.hyperledger.besu.config.BlobScheduleOptions;
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Wei;
 
@@ -26,7 +27,6 @@
 public class CancunFeeMarket extends LondonFeeMarket {
   private static final Logger LOG = LoggerFactory.getLogger(CancunFeeMarket.class);
   protected static final BigInteger BLOB_GAS_PRICE = BigInteger.ONE;
-  private static final long BLOB_GAS_PRICE_UPDATE_FRACTION = 3338477;
 
   protected final BigInteger baseFeeUpdateFraction;
 
@@ -41,7 +41,10 @@ public CancunFeeMarket(
 
   public CancunFeeMarket(
       final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
-    this(londonForkBlockNumber, baseFeePerGasOverride, BLOB_GAS_PRICE_UPDATE_FRACTION);
+    this(
+        londonForkBlockNumber,
+        baseFeePerGasOverride,
+        BlobScheduleOptions.BlobSchedule.CANCUN_DEFAULT.getBaseFeeUpdateFraction());
   }
 
   @Override

diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.feemarket;
 
+import org.hyperledger.besu.config.BlobScheduleOptions;
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Wei;
 
@@ -23,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 public class PragueFeeMarket extends CancunFeeMarket {
-  private static final long BLOB_BASE_FEE_UPDATE_FRACTION_ELECTRA = 5007716;
   private static final Logger LOG = LoggerFactory.getLogger(PragueFeeMarket.class);
 
   public PragueFeeMarket(
@@ -35,7 +35,10 @@ public PragueFeeMarket(
 
   public PragueFeeMarket(
       final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
-    this(londonForkBlockNumber, baseFeePerGasOverride, BLOB_BASE_FEE_UPDATE_FRACTION_ELECTRA);
+    this(
+        londonForkBlockNumber,
+        baseFeePerGasOverride,
+        BlobScheduleOptions.BlobSchedule.PRAGUE_DEFAULT.getBaseFeeUpdateFraction());
   }
 
   @Override