From c8a6268207c462456922495239ec85e0896be0a8 Mon Sep 17 00:00:00 2001 From: Daniel Lehrner Date: Thu, 16 Jan 2025 17:34:49 +0100 Subject: [PATCH] remove hard coded baseFeeUpdateFraction from CancunFeeMarket & PragueFeeMarket Signed-off-by: Daniel Lehrner --- .../besu/ethereum/mainnet/feemarket/CancunFeeMarket.java | 7 +++++-- .../besu/ethereum/mainnet/feemarket/PragueFeeMarket.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java index fcae028c7467..5bbe37151dd8 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java +++ b/ethereum/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 baseFeePerGasOverride) { - this(londonForkBlockNumber, baseFeePerGasOverride, BLOB_GAS_PRICE_UPDATE_FRACTION); + this( + londonForkBlockNumber, + baseFeePerGasOverride, + BlobScheduleOptions.BlobSchedule.CANCUN_DEFAULT.getBaseFeeUpdateFraction()); } @Override diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java index 2468215e5407..e2f20852276b 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java +++ b/ethereum/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 baseFeePerGasOverride) { - this(londonForkBlockNumber, baseFeePerGasOverride, BLOB_BASE_FEE_UPDATE_FRACTION_ELECTRA); + this( + londonForkBlockNumber, + baseFeePerGasOverride, + BlobScheduleOptions.BlobSchedule.PRAGUE_DEFAULT.getBaseFeeUpdateFraction()); } @Override