diff --git a/CHANGELOG.md b/CHANGELOG.md index 927fbf2f90d..f5a7056e7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Additions and Improvements - Add error messages on authentication failures with username and password [#6212](https://github.com/hyperledger/besu/pull/6212) +- Set Ethereum Classic mainnet activation block for Spiral network upgrade [#6267](https://github.com/hyperledger/besu/pull/6267) ### Bug fixes diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 5bc1c30bd61..7a83cd87515 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -147,8 +147,9 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0x9007bfccL), 11700000L), new ForkId(Bytes.ofUnsignedInt(0xdb63a1caL), 13189133), new ForkId(Bytes.ofUnsignedInt(0x0f6bf187L), 14525000L), - new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L), - new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L)) + new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 19250000L), + new ForkId(Bytes.ofUnsignedInt(0xbe46d57cL), 0L), + new ForkId(Bytes.ofUnsignedInt(0xbe46d57cL), 0L)) }); } diff --git a/config/src/main/resources/classic.json b/config/src/main/resources/classic.json index 6b08923b51c..ea7c49e1fa3 100644 --- a/config/src/main/resources/classic.json +++ b/config/src/main/resources/classic.json @@ -13,6 +13,7 @@ "thanosBlock": 11700000, "magnetoBlock": 13189133, "mystiqueBlock": 14525000, + "spiralBlock": 19250000, "ethash": { },