diff --git a/CHANGELOG.md b/CHANGELOG.md index d27da08ba5b..8d362cba104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Expose new method to query hardfork by block number Plugin API [#9115](https://github.com/hyperledger/besu/pull/9115) - Support loading multiple transaction selector plugins [#8743](https://github.com/hyperledger/besu/pull/9139) - Configurable limit for how much time plugins are allowed take, to propose transactions, during block creation [#9184](https://github.com/hyperledger/besu/pull/9184) +- Add Osaka, BPO1 and BPO2 fork times for holesky, hoodi and sepolia [#9196](https://github.com/hyperledger/besu/pull/9196/files) #### Performance - Add jmh benchmarks for some compute-related opcodes [#9069](https://github.com/hyperledger/besu/pull/9069) diff --git a/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 265f4336891..1f06af0ecb2 100644 --- a/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/app/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -66,15 +66,21 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0xb96cbd13L), 1677557088L), new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 1706655072L), new ForkId(Bytes.ofUnsignedInt(0x88cf81d9L), 1741159776L), - new ForkId(Bytes.ofUnsignedInt(0xed88b5fdL), 0L), - new ForkId(Bytes.ofUnsignedInt(0xed88b5fdL), 0L)) + new ForkId(Bytes.ofUnsignedInt(0xed88b5fdL), 1760427360L), + new ForkId(Bytes.ofUnsignedInt(0xe2ae4999L), 1761017184L), + new ForkId(Bytes.ofUnsignedInt(0x56078a1eL), 1761607008L), + new ForkId(Bytes.ofUnsignedInt(0x268956b6L), 0L), + new ForkId(Bytes.ofUnsignedInt(0x268956b6L), 0L)) }, new Object[] { NetworkName.HOODI, List.of( new ForkId(Bytes.ofUnsignedInt(0xbef71d30L), 1742999832L), - new ForkId(Bytes.ofUnsignedInt(0x0929e24eL), 0L), - new ForkId(Bytes.ofUnsignedInt(0x0929e24eL), 0L)) + new ForkId(Bytes.ofUnsignedInt(0x0929e24eL), 1761677592L), + new ForkId(Bytes.ofUnsignedInt(0xe7e0e7ffL), 1762365720L), + new ForkId(Bytes.ofUnsignedInt(0x3893353eL), 1762955544L), + new ForkId(Bytes.ofUnsignedInt(0x23aa1351L), 0L), + new ForkId(Bytes.ofUnsignedInt(0x23aa1351L), 0L)) }, new Object[] { NetworkName.HOLESKY, @@ -82,8 +88,11 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0xc61a6098L), 1696000704L), new ForkId(Bytes.ofUnsignedInt(0xfd4f016bL), 1707305664L), new ForkId(Bytes.ofUnsignedInt(0x9b192ad0L), 1740434112L), - new ForkId(Bytes.ofUnsignedInt(0xdfbd9bedL), 0L), - new ForkId(Bytes.ofUnsignedInt(0xdfbd9bedL), 0L)) + new ForkId(Bytes.ofUnsignedInt(0xdfbd9bedL), 1759308480L), + new ForkId(Bytes.ofUnsignedInt(0x783def52L), 1759800000L), + new ForkId(Bytes.ofUnsignedInt(0xa280a45cL), 1760389824L), + new ForkId(Bytes.ofUnsignedInt(0x9bc6cb31L), 0L), + new ForkId(Bytes.ofUnsignedInt(0x9bc6cb31L), 0L)) }, new Object[] { NetworkName.MAINNET, diff --git a/config/src/main/resources/holesky.json b/config/src/main/resources/holesky.json index 8c96b916446..c6e7e3fc533 100644 --- a/config/src/main/resources/holesky.json +++ b/config/src/main/resources/holesky.json @@ -16,6 +16,9 @@ "shanghaiTime": 1696000704, "cancunTime": 1707305664, "pragueTime": 1740434112, + "osakaTime": 1759308480, + "bpo1Time": 1759800000, + "bpo2Time": 1760389824, "blobSchedule": { "cancun": { "target": 3, @@ -26,6 +29,21 @@ "target": 6, "max": 9, "baseFeeUpdateFraction": 5007716 + }, + "osaka": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + }, + "bpo1": { + "target": 10, + "max": 15, + "baseFeeUpdateFraction": 8346193 + }, + "bpo2": { + "target": 14, + "max": 21, + "baseFeeUpdateFraction": 11684671 } }, "ethash": {}, diff --git a/config/src/main/resources/hoodi.json b/config/src/main/resources/hoodi.json index 2f2735130fa..f531d8fa9e7 100644 --- a/config/src/main/resources/hoodi.json +++ b/config/src/main/resources/hoodi.json @@ -20,6 +20,9 @@ "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa", "withdrawalRequestContractAddress": "0x00000961ef480eb55e80d19ad83579a64c007002", "consolidationRequestContractAddress": "0x0000bbddc7ce488642fb579f8b00f3a590007251", + "osakaTime": 1761677592, + "bpo1Time": 1762365720, + "bpo2Time": 1762955544, "blobSchedule": { "cancun": { "target": 3, @@ -30,6 +33,21 @@ "target": 6, "max": 9, "baseFeeUpdateFraction": 5007716 + }, + "osaka": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + }, + "bpo1": { + "target": 10, + "max": 15, + "baseFeeUpdateFraction": 8346193 + }, + "bpo2": { + "target": 14, + "max": 21, + "baseFeeUpdateFraction": 11684671 } }, diff --git a/config/src/main/resources/sepolia.json b/config/src/main/resources/sepolia.json index ab6f6b57191..8f774e3a058 100644 --- a/config/src/main/resources/sepolia.json +++ b/config/src/main/resources/sepolia.json @@ -16,6 +16,9 @@ "shanghaiTime": 1677557088, "cancunTime": 1706655072, "pragueTime": 1741159776, + "osakaTime": 1760427360, + "bpo1Time": 1761017184, + "bpo2Time": 1761607008, "blobSchedule": { "cancun": { "target": 3, @@ -26,6 +29,21 @@ "target": 6, "max": 9, "baseFeeUpdateFraction": 5007716 + }, + "osaka": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + }, + "bpo1": { + "target": 10, + "max": 15, + "baseFeeUpdateFraction": 8346193 + }, + "bpo2": { + "target": 14, + "max": 21, + "baseFeeUpdateFraction": 11684671 } }, "ethash":{},