Skip to content

Commit b9bef12

Browse files
shemnonshemnon
authored
fix/use bn254 in eth_config (#1933)
The EIP-7910 spec swapped bn256 with bn254. Signed-off-by: Danno Ferrin <[email protected]>
1 parent 75911e3 commit b9bef12

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎src/ethereum_test_forks/forks/forks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,9 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
680680
"""
681681
return [
682682
Address(5, label="MODEXP"),
683-
Address(6, label="BN256_ADD"),
684-
Address(7, label="BN256_MUL"),
685-
Address(8, label="BN256_PAIRING"),
683+
Address(6, label="BN254_ADD"),
684+
Address(7, label="BN254_MUL"),
685+
Address(8, label="BN254_PAIRING"),
686686
] + super(Byzantium, cls).precompiles(block_number, timestamp)
687687

688688
@classmethod

‎src/ethereum_test_rpc/tests/test_types.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
"0x0000000000000000000000000000000000000003": "RIPEMD160",
2121
"0x0000000000000000000000000000000000000004": "ID",
2222
"0x0000000000000000000000000000000000000005": "MODEXP",
23-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
24-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
25-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
23+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
24+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
25+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
2626
"0x0000000000000000000000000000000000000009": "BLAKE2F",
2727
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION"
2828
},
2929
"systemContracts": {
3030
"BEACON_ROOTS_ADDRESS": "0x000f3df6d732807ef1319fb7b8bb8522d0beac02"
3131
}
3232
},
33-
"currentHash": "243c27d1",
34-
"currentForkId": "bef71d30",
33+
"currentHash": "0x2eedf329",
34+
"currentForkId": "0xbef71d30",
3535
"next": {
3636
"activationTime": 1742999832,
3737
"blobSchedule": {
@@ -46,9 +46,9 @@
4646
"0x0000000000000000000000000000000000000003": "RIPEMD160",
4747
"0x0000000000000000000000000000000000000004": "ID",
4848
"0x0000000000000000000000000000000000000005": "MODEXP",
49-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
50-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
51-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
49+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
50+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
51+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
5252
"0x0000000000000000000000000000000000000009": "BLAKE2F",
5353
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION",
5454
"0x000000000000000000000000000000000000000b": "BLS12_G1ADD",
@@ -67,8 +67,8 @@
6767
"WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS": "0x00000961ef480eb55e80d19ad83579a64c007002"
6868
}
6969
},
70-
"nextHash": "10368496",
71-
"nextForkId": "0929e24e"
70+
"nextHash": "0x0d82a81f",
71+
"nextForkId": "0x0929e24e"
7272
}
7373
"""
7474

‎src/pytest_plugins/execute/eth_config/tests/test_execute_eth_config.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"0x0000000000000000000000000000000000000003": "RIPEMD160",
2828
"0x0000000000000000000000000000000000000004": "ID",
2929
"0x0000000000000000000000000000000000000005": "MODEXP",
30-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
31-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
32-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
30+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
31+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
32+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
3333
"0x0000000000000000000000000000000000000009": "BLAKE2F",
3434
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION"
3535
},
@@ -38,7 +38,7 @@
3838
}
3939
}
4040
""")
41-
EXPECTED_CANCUN_HASH = ForkHash("0x243c27d1")
41+
EXPECTED_CANCUN_HASH = ForkHash("0x2eedf329")
4242
EXPECTED_CANCUN_FORK_ID = ForkHash("0xbef71d30")
4343
EXPECTED_PRAGUE = json.loads("""
4444
{
@@ -55,9 +55,9 @@
5555
"0x0000000000000000000000000000000000000003": "RIPEMD160",
5656
"0x0000000000000000000000000000000000000004": "ID",
5757
"0x0000000000000000000000000000000000000005": "MODEXP",
58-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
59-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
60-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
58+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
59+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
60+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
6161
"0x0000000000000000000000000000000000000009": "BLAKE2F",
6262
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION",
6363
"0x000000000000000000000000000000000000000b": "BLS12_G1ADD",
@@ -77,7 +77,7 @@
7777
}
7878
}
7979
""")
80-
EXPECTED_PRAGUE_HASH = ForkHash("0x10368496")
80+
EXPECTED_PRAGUE_HASH = ForkHash("0x0d82a81f")
8181
EXPECTED_PRAGUE_FORK_ID = ForkHash("0x0929e24e")
8282
EXPECTED_BPO1 = json.loads("""
8383
{
@@ -94,9 +94,9 @@
9494
"0x0000000000000000000000000000000000000003": "RIPEMD160",
9595
"0x0000000000000000000000000000000000000004": "ID",
9696
"0x0000000000000000000000000000000000000005": "MODEXP",
97-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
98-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
99-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
97+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
98+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
99+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
100100
"0x0000000000000000000000000000000000000009": "BLAKE2F",
101101
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION",
102102
"0x000000000000000000000000000000000000000b": "BLS12_G1ADD",
@@ -116,7 +116,7 @@
116116
}
117117
}
118118
""")
119-
EXPECTED_BPO1_HASH = ForkHash("0x4607fc34")
119+
EXPECTED_BPO1_HASH = ForkHash("0x5bb3d0bd")
120120
EXPECTED_BPO1_FORK_ID = ForkHash("0xdf11b211")
121121
EXPECTED_BPO2 = json.loads("""
122122
{
@@ -133,9 +133,9 @@
133133
"0x0000000000000000000000000000000000000003": "RIPEMD160",
134134
"0x0000000000000000000000000000000000000004": "ID",
135135
"0x0000000000000000000000000000000000000005": "MODEXP",
136-
"0x0000000000000000000000000000000000000006": "BN256_ADD",
137-
"0x0000000000000000000000000000000000000007": "BN256_MUL",
138-
"0x0000000000000000000000000000000000000008": "BN256_PAIRING",
136+
"0x0000000000000000000000000000000000000006": "BN254_ADD",
137+
"0x0000000000000000000000000000000000000007": "BN254_MUL",
138+
"0x0000000000000000000000000000000000000008": "BN254_PAIRING",
139139
"0x0000000000000000000000000000000000000009": "BLAKE2F",
140140
"0x000000000000000000000000000000000000000a": "KZG_POINT_EVALUATION",
141141
"0x000000000000000000000000000000000000000b": "BLS12_G1ADD",
@@ -155,7 +155,7 @@
155155
}
156156
}
157157
""")
158-
EXPECTED_BPO2_HASH = ForkHash("0xca583402")
158+
EXPECTED_BPO2_HASH = ForkHash("0xd7ec188b")
159159
EXPECTED_BPO2_FORK_ID = ForkHash("0x0757e44f")
160160

161161
CURRENT_FILE = Path(realpath(__file__))

0 commit comments

Comments
 (0)