diff --git a/CHANGELOG.md b/CHANGELOG.md index f619ac8e5e9..0b1d05262f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fast Sync ### Additions and Improvements +- Add Osaka, BPO1 and BPO2 fork times for mainnet [#9380](https://github.com/hyperledger/besu/pull/9380) - Add blockTimestamp to receipt logs for `eth_getBlockReceipts` and `eth_getTransactionReceipt` results [#9294](https://github.com/hyperledger/besu/pull/9294) - Upgrade to execution-spec-tests v5.3.0 [#9301](https://github.com/hyperledger/besu/pull/9301) - Update to netty 4.2.7.Final [#9330](https://github.com/hyperledger/besu/pull/9330) diff --git a/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 097a6303904..873a468fb2b 100644 --- a/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -115,8 +115,11 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L), new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 1710338135L), new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 1746612311L), - new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L), - new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L)) + new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 1764798551), + new ForkId(Bytes.ofUnsignedInt(0x5167e2a6L), 1765290071), + new ForkId(Bytes.ofUnsignedInt(0xcba2a1c0L), 1767747671), + new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0), + new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0)) }, new Object[] { NetworkName.MORDOR, diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json index 7c9fb99a01a..3ba94ccf767 100644 --- a/config/src/main/resources/mainnet.json +++ b/config/src/main/resources/mainnet.json @@ -20,6 +20,9 @@ "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa", "withdrawalRequestContractAddress": "0x00000961ef480eb55e80d19ad83579a64c007002", "consolidationRequestContractAddress": "0x0000bbddc7ce488642fb579f8b00f3a590007251", + "osakaTime": 1764798551, + "bpo1Time": 1765290071, + "bpo2Time": 1767747671, "blobSchedule": { "cancun": { "target": 3, @@ -30,6 +33,16 @@ "target": 6, "max": 9, "baseFeeUpdateFraction": 5007716 + }, + "bpo1": { + "target": 10, + "max": 15, + "baseFeeUpdateFraction": 8346193 + }, + "bpo2": { + "target": 14, + "max": 21, + "baseFeeUpdateFraction": 11684671 } }, "ethash": { diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java index 127ec43a3af..9eed6337585 100644 --- a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java +++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java @@ -54,6 +54,9 @@ public static Stream getTestParametersForConfig() throws IOException postMergeOverrides.put("shanghaiTime", "999999999999"); postMergeOverrides.put("cancunTime","999999999999"); postMergeOverrides.put("pragueTime","999999999999"); + postMergeOverrides.put("osakaTime","999999999999"); + postMergeOverrides.put("bpo1Time","999999999999"); + postMergeOverrides.put("bpo2Time","999999999999"); return Stream.of( Arguments.of( "/BasicTests/difficultyMainNetwork.json",