Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Breaking Changes

### Upcoming Breaking Changes
- Add Osaka, BPO1 and BPO2 fork times for mainnet [#9380](https://github.com/hyperledger/besu/pull/9380)
Comment thread
Gabriel-Trintinalia marked this conversation as resolved.
Outdated
- Deprecated CLI options
- `--Xbonsai-parallel-tx-processing-enabled` is deprecated since 25.7.0. Use `--bonsai-parallel-tx-processing-enabled` instead.
- `--Xsnapsync-server-enabled` is deprecated since 25.7.0. Use `--snapsync-server-enabled` instead.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,11 @@ public static Collection<Object[]> 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,
Expand Down
13 changes: 13 additions & 0 deletions config/src/main/resources/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa",
"withdrawalRequestContractAddress": "0x00000961ef480eb55e80d19ad83579a64c007002",
"consolidationRequestContractAddress": "0x0000bbddc7ce488642fb579f8b00f3a590007251",
"osakaTime": 1764798551,
"bpo1Time": 1765290071,
"bpo2Time": 1767747671,
"blobSchedule": {
"cancun": {
"target": 3,
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public static Stream<Arguments> 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",
Expand Down