@@ -20,7 +20,7 @@ class ForkIdSpec extends AnyWordSpec with Matchers {
20
20
}
21
21
" gatherForks for the etc chain correctly" in {
22
22
val res = config.blockchains.map { case (name, conf) => (name, gatherForks(conf)) }
23
- res(" etc" ) shouldBe List (1150000 , 2500000 , 3000000 , 5000000 , 5900000 , 8772000 , 9573000 , 10500839 , 11700000 )
23
+ res(" etc" ) shouldBe List (1150000 , 2500000 , 3000000 , 5000000 , 5900000 , 8772000 , 9573000 , 10500839 , 11700000 , 13189133 )
24
24
}
25
25
26
26
" gatherForks for the eth chain correctly" in {
@@ -78,7 +78,9 @@ class ForkIdSpec extends AnyWordSpec with Matchers {
78
78
create(10500839 - 1 ) shouldBe ForkId (0x7ba22882L, Some (10500839 ))
79
79
create(10500839 ) shouldBe ForkId (0x9007bfccL, Some (11700000 ))
80
80
create(11700000 - 1 ) shouldBe ForkId (0x9007bfccL, Some (11700000 ))
81
- create(11700000 ) shouldBe ForkId (0xdb63a1caL, None )
81
+ create(11700000 ) shouldBe ForkId (0xdb63a1caL, Some (13189133 ))
82
+ create(13189133 - 1 ) shouldBe ForkId (0xdb63a1caL, Some (13189133 ))
83
+ create(13189133 ) shouldBe ForkId (0x0f6bf187L, None ) // First Magneto block
82
84
}
83
85
84
86
" create correct ForkId for mordor blocks" in {
@@ -92,11 +94,9 @@ class ForkIdSpec extends AnyWordSpec with Matchers {
92
94
create(999982 ) shouldBe ForkId (0x604f6ee1L, Some (999983 ))
93
95
create(999983 ) shouldBe ForkId (0xf42f5539L, Some (2520000 ))
94
96
create(2519999 ) shouldBe ForkId (0xf42f5539L, Some (2520000 ))
95
- create(2520000 ) shouldBe ForkId (0x66b5c286L, None )
96
- // TODO: Add Magneto
97
- // create(2520000) shouldBe ForkId(0x66b5c286L, Some(3985893))
98
- // create(3985893) shouldBe ForkId(0x66b5c286L, Some(3985893))
99
- // create(3985894) shouldBe ForkId(0x92b323e0L, None)
97
+ create(2520000 ) shouldBe ForkId (0x66b5c286L, Some (3985893 ))
98
+ create(3985893 - 1 ) shouldBe ForkId (0x66b5c286L, Some (3985893 ))
99
+ create(3985893 ) shouldBe ForkId (0x92b323e0L, None ) // First Magneto block
100
100
}
101
101
102
102
// Here’s a couple of tests to verify the proper RLP encoding (since FORK_HASH is a 4 byte binary but FORK_NEXT is an 8 byte quantity):
0 commit comments