Skip to content

Commit 62d92ea

Browse files
chore: add fusaka mainnet timestamps (#9380)
Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
1 parent 31f0858 commit 62d92ea

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- Fast Sync
1616

1717
### Additions and Improvements
18+
- Add Osaka, BPO1 and BPO2 fork times for mainnet [#9380](https://github.com/hyperledger/besu/pull/9380)
1819
- Add blockTimestamp to receipt logs for `eth_getBlockReceipts` and `eth_getTransactionReceipt` results [#9294](https://github.com/hyperledger/besu/pull/9294)
1920
- Upgrade to execution-spec-tests v5.3.0 [#9301](https://github.com/hyperledger/besu/pull/9301)
2021
- Update to netty 4.2.7.Final [#9330](https://github.com/hyperledger/besu/pull/9330)

app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,11 @@ public static Collection<Object[]> parameters() {
115115
new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
116116
new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 1710338135L),
117117
new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 1746612311L),
118-
new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L),
119-
new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L))
118+
new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 1764798551),
119+
new ForkId(Bytes.ofUnsignedInt(0x5167e2a6L), 1765290071),
120+
new ForkId(Bytes.ofUnsignedInt(0xcba2a1c0L), 1767747671),
121+
new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0),
122+
new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0))
120123
},
121124
new Object[] {
122125
NetworkName.MORDOR,

config/src/main/resources/mainnet.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
"depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa",
2121
"withdrawalRequestContractAddress": "0x00000961ef480eb55e80d19ad83579a64c007002",
2222
"consolidationRequestContractAddress": "0x0000bbddc7ce488642fb579f8b00f3a590007251",
23+
"osakaTime": 1764798551,
24+
"bpo1Time": 1765290071,
25+
"bpo2Time": 1767747671,
2326
"blobSchedule": {
2427
"cancun": {
2528
"target": 3,
@@ -30,6 +33,16 @@
3033
"target": 6,
3134
"max": 9,
3235
"baseFeeUpdateFraction": 5007716
36+
},
37+
"bpo1": {
38+
"target": 10,
39+
"max": 15,
40+
"baseFeeUpdateFraction": 8346193
41+
},
42+
"bpo2": {
43+
"target": 14,
44+
"max": 21,
45+
"baseFeeUpdateFraction": 11684671
3346
}
3447
},
3548
"ethash": {

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public static Stream<Arguments> getTestParametersForConfig() throws IOException
5454
postMergeOverrides.put("shanghaiTime", "999999999999");
5555
postMergeOverrides.put("cancunTime","999999999999");
5656
postMergeOverrides.put("pragueTime","999999999999");
57+
postMergeOverrides.put("osakaTime","999999999999");
58+
postMergeOverrides.put("bpo1Time","999999999999");
59+
postMergeOverrides.put("bpo2Time","999999999999");
5760
return Stream.of(
5861
Arguments.of(
5962
"/BasicTests/difficultyMainNetwork.json",

0 commit comments

Comments
 (0)