Skip to content

Commit 751efb5

Browse files
diegajflo
authored andcommitted
ETC mainnet 'Spiral' activation block (besu-eth#6267)
* Set ENR tree for DNS discovery for ETC mainnet network Signed-off-by: Diego López León <dieguitoll@gmail.com> * Set activation block number for ECIP-1109 on ETC mainnet Signed-off-by: Diego López León <dieguitoll@gmail.com> --------- Signed-off-by: Diego López León <dieguitoll@gmail.com> Signed-off-by: jflo <justin+github@florentine.us>
1 parent 233f035 commit 751efb5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
### Additions and Improvements
1111
- Add error messages on authentication failures with username and password [#6212](https://github.com/hyperledger/besu/pull/6212)
1212
- New `Sequenced` transaction pool. The pool is an evolution of the `legacy` pool and is likely to be more suitable to enterprise or permissioned chains than the `layered` transaction pool. Select to use this pool with `--tx-pool=sequenced`. Supports the same options as the `legacy` pool [#6211](https://github.com/hyperledger/besu/issues/6211)
13+
- Set Ethereum Classic mainnet activation block for Spiral network upgrade [#6267](https://github.com/hyperledger/besu/pull/6267)
1314

1415
### Bug fixes
1516

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,9 @@ public static Collection<Object[]> parameters() {
147147
new ForkId(Bytes.ofUnsignedInt(0x9007bfccL), 11700000L),
148148
new ForkId(Bytes.ofUnsignedInt(0xdb63a1caL), 13189133),
149149
new ForkId(Bytes.ofUnsignedInt(0x0f6bf187L), 14525000L),
150-
new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L),
151-
new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L))
150+
new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 19250000L),
151+
new ForkId(Bytes.ofUnsignedInt(0xbe46d57cL), 0L),
152+
new ForkId(Bytes.ofUnsignedInt(0xbe46d57cL), 0L))
152153
});
153154
}
154155

config/src/main/resources/classic.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
"thanosBlock": 11700000,
1414
"magnetoBlock": 13189133,
1515
"mystiqueBlock": 14525000,
16+
"spiralBlock": 19250000,
1617
"ethash": {
1718

1819
},
1920
"discovery" : {
21+
"dns": "enrtree://AJE62Q4DUX4QMMXEHCSSCSC65TDHZYSMONSD64P3WULVLSF6MRQ3K@all.classic.blockd.info",
2022
"bootnodes" : [
2123
"enode://8e73168affd8d445edda09c561d607081ca5d7963317caae2702f701eb6546b06948b7f8687a795de576f6a5f33c44828e25a90aa63de18db380a11e660dd06f@159.203.37.80:30303",
2224
"enode://2b1ef75e8b7119b6e0294f2e51ead2cf1a5400472452c199e9587727ada99e7e2b1199e36adcad6cbae65dce2410559546e4d83d8c93d45a559e723e56444c03@67.207.93.100:30303",

0 commit comments

Comments
 (0)