From 65611c15a58346966f2a9fd95ce1e9877a21103d Mon Sep 17 00:00:00 2001 From: Aere Network Date: Sun, 6 Sep 2026 14:20:12 +0300 Subject: [PATCH] Patch 0004 regenerated so the patch ITSELF carries the Apache-2.0 4(b) change notice in the file header, with enough context that the upstream copyright line is visible in the diff: sections 4(c) and 4(d) were previously NOT MEASURABLE from the patch, because the repository does not ship LondonFeeMarket.java and the diff never showed its header. Self-checked: applied to the clean upstream file it reproduces the production file exactly --- patches/0004-aere-basefee-floor.patch | 28 ++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/patches/0004-aere-basefee-floor.patch b/patches/0004-aere-basefee-floor.patch index afd68eb..fbc713b 100644 --- a/patches/0004-aere-basefee-floor.patch +++ b/patches/0004-aere-basefee-floor.patch @@ -17,10 +17,33 @@ operator's property was dead on a node built from the public recipe (found 2026-09-05 by comparing the fleet's jars with the public build class by class). --- diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java -index 0ee4f7409..558076166 100644 +index 0ee4f74..72913d4 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java -@@ -17,121 +17,230 @@ package org.hyperledger.besu.ethereum.mainnet.feemarket; +@@ -1,136 +1,252 @@ + /* + * Copyright ConsenSys AG. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 ++ * ++ * Modifications Copyright contributors to the Aere Network. ++ * ++ * This file was modified by contributors to the Aere Network, as required by section 4(b) of the ++ * Apache License 2.0. The copyright header above is the upstream one and is left exactly as it was ++ * found, as section 4(c) requires. The change is the chain 2800 base-fee floor below, armed only ++ * by the aere.basefee.floor.* properties; with them absent this file behaves exactly as upstream. + */ + package org.hyperledger.besu.ethereum.mainnet.feemarket; + import org.hyperledger.besu.config.GenesisConfig; import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.ethereum.core.Transaction; @@ -254,4 +277,3 @@ index 0ee4f7409..558076166 100644 public boolean isBeforeForkBlock(final long blockNumber) { return londonForkBlockNumber > blockNumber; } - }