Skip to content

Commit 15cfa66

Browse files
shemnonshemnon
committed
Update eth_config to match final EIP-7910 specification
- Remove configHash fields from ConfigurationResponse - Move forkId fields into ConfigObject - Invert precompiles map: name->address mapping with alphabetical sorting - Update test cases to match EIP specification format Signed-off-by: Danno Ferrin <[email protected]>
1 parent d614eba commit 15cfa66

File tree

4 files changed

+32
-57
lines changed

4 files changed

+32
-57
lines changed

‎src/eth/client.yaml‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,29 +93,28 @@
9393
max: 9
9494
target: 6
9595
chainId: '0x1'
96+
forkId: '0x3ff0e375'
9697
precompiles:
97-
- '0x0000000000000000000000000000000000000001': 'ECREC'
98-
- '0x0000000000000000000000000000000000000002': 'SHA256'
99-
- '0x0000000000000000000000000000000000000003': 'RIPEMD160'
100-
- '0x0000000000000000000000000000000000000004': 'ID'
101-
- '0x0000000000000000000000000000000000000005': 'MODEXP'
102-
- '0x0000000000000000000000000000000000000006': 'BN254_ADD'
103-
- '0x0000000000000000000000000000000000000007': 'BN254_MUL'
104-
- '0x0000000000000000000000000000000000000008': 'BN254_PAIRING'
105-
- '0x0000000000000000000000000000000000000009': 'BLAKE2F'
106-
- '0x000000000000000000000000000000000000000a': 'KZG_POINT_EVALUATION'
107-
- '0x000000000000000000000000000000000000000b': 'BLS12_G1ADD'
108-
- '0x000000000000000000000000000000000000000c': 'BLS12_G1MSM'
109-
- '0x000000000000000000000000000000000000000d': 'BLS12_G2ADD'
110-
- '0x000000000000000000000000000000000000000e': 'BLS12_G2MSM'
111-
- '0x000000000000000000000000000000000000000f': 'BLS12_PAIRING_CHECK'
112-
- '0x0000000000000000000000000000000000000010': 'BLS12_MAP_FP_TO_G1'
113-
- '0x0000000000000000000000000000000000000011': 'BLS12_MAP_FP2_TO_G2'
98+
BLS12_G1ADD: '0x000000000000000000000000000000000000000b'
99+
BLS12_G1MSM: '0x000000000000000000000000000000000000000c'
100+
BLS12_G2ADD: '0x000000000000000000000000000000000000000d'
101+
BLS12_G2MSM: '0x000000000000000000000000000000000000000e'
102+
BLS12_MAP_FP2_TO_G2: '0x0000000000000000000000000000000000000011'
103+
BLS12_MAP_FP_TO_G1: '0x0000000000000000000000000000000000000010'
104+
BLS12_PAIRING_CHECK: '0x000000000000000000000000000000000000000f'
105+
BLAKE2F: '0x0000000000000000000000000000000000000009'
106+
BN254_ADD: '0x0000000000000000000000000000000000000006'
107+
BN254_MUL: '0x0000000000000000000000000000000000000007'
108+
BN254_PAIRING: '0x0000000000000000000000000000000000000008'
109+
ECREC: '0x0000000000000000000000000000000000000001'
110+
ID: '0x0000000000000000000000000000000000000004'
111+
KZG_POINT_EVALUATION: '0x000000000000000000000000000000000000000a'
112+
MODEXP: '0x0000000000000000000000000000000000000005'
113+
RIPEMD160: '0x0000000000000000000000000000000000000003'
114+
SHA256: '0x0000000000000000000000000000000000000002'
114115
systemContracts:
115-
- 'BEACON_ROOTS_ADDRESS': '0x000f3df6d732807ef1319fb7b8bb8522d0beac02'
116-
- 'CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS': '0x0000bbddc7ce488642fb579f8b00f3a590007251'
117-
- 'DEPOSIT_CONTRACT_ADDRESS': '0x00000000219ab540356cbb839cbe05303d7705fa'
118-
- 'HISTORY_STORAGE_ADDRESS': '0x0000f90827f1c53a10cb7a02335b175320002935'
119-
- 'WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS': '0x00000961ef480eb55e80d19ad83579a64c007002'
120-
currentHash: '0xc376cf8b'
121-
currentForkId: '0x3ff0e375'
116+
BEACON_ROOTS_ADDRESS: '0x000f3df6d732807ef1319fb7b8bb8522d0beac02'
117+
CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: '0x0000bbddc7ce488642fb579f8b00f3a590007251'
118+
DEPOSIT_CONTRACT_ADDRESS: '0x00000000219ab540356cbb839cbe05303d7705fa'
119+
HISTORY_STORAGE_ADDRESS: '0x0000f90827f1c53a10cb7a02335b175320002935'
120+
WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS: '0x00000961ef480eb55e80d19ad83579a64c007002'

‎src/schemas/client.yaml‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,16 @@ ConfigurationResponse:
2626
current:
2727
title: Current configuration
2828
$ref: '#/components/schemas/ConfigObject'
29-
currentHash:
30-
title: Current configuration hash
31-
description: CRC-32 hash of the canonical JSON of the current configuration
32-
$ref: '#/components/schemas/bytes4'
33-
currentForkId:
34-
title: Current fork ID
35-
description: Fork identifier for the current configuration
36-
$ref: '#/components/schemas/bytes4'
3729
next:
3830
title: Next configuration
3931
description: Configuration for the next scheduled fork, absent if no future forks scheduled
4032
$ref: '#/components/schemas/ConfigObject'
41-
nextHash:
42-
title: Next configuration hash
43-
description: CRC-32 hash of the the canonical JSON of the next configuration, absent if no future forks scheduled
44-
$ref: '#/components/schemas/bytes4'
45-
nextForkId:
46-
title: Next fork ID
47-
description: Fork identifier for the next configuration, absent if no future forks scheduled
48-
$ref: '#/components/schemas/bytes4'
4933
last:
5034
title: Last configuration
5135
description: Configuration for the last configured fork, absent if no future forks scheduled
5236
$ref: '#/components/schemas/ConfigObject'
53-
lastHash:
54-
title: Last configuration hash
55-
description: CRC-32 hash of the the canonical JSON of the last configured fork, absent if no future forks scheduled
56-
$ref: '#/components/schemas/bytes4'
57-
lastForkId:
58-
title: Last fork ID
59-
description: Fork identifier for the last configured fork, absent if no future forks scheduled
60-
$ref: '#/components/schemas/bytes4'
6137
required:
6238
- current
63-
- currentHash
64-
- currentForkId
6539
ConfigObject:
6640
title: Configuration object
6741
description: Represents a specific fork configuration
@@ -80,15 +54,16 @@ ConfigObject:
8054
title: Chain ID
8155
description: The chain ID for this configuration
8256
$ref: '#/components/schemas/uint'
57+
forkId:
58+
title: Fork ID
59+
description: The FORK_HASH value as specified in EIP-6122 of the specific fork
60+
$ref: '#/components/schemas/bytes4'
8361
precompiles:
8462
title: Precompiles
85-
description: Mapping of precompile addresses to their names
63+
description: Mapping of precompile names to their addresses
8664
type: object
8765
additionalProperties:
88-
type: string
89-
patternProperties:
90-
'^0x[0-9a-fA-F]{40}$':
91-
type: string
66+
$ref: '#/components/schemas/address'
9267
systemContracts:
9368
title: System contracts
9469
description: Mapping of system contract names to their addresses
@@ -99,6 +74,7 @@ ConfigObject:
9974
- activationTime
10075
- blobSchedule
10176
- chainId
77+
- forkId
10278
- precompiles
10379
- systemContracts
10480
BlobSchedule:

‎tests/eth_config/get-config-with-next-fork.io‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// retrieves configuration when a fork is scheduled (EIP-7910 example with expanded next config)
22
>> {"jsonrpc":"2.0","id":1,"method":"eth_config"}
3-
<< {"jsonrpc":"2.0","id":1,"result":{"current":{"activationTime":0,"blobSchedule":{"baseFeeUpdateFraction":3338477,"max":6,"target":3},"chainId":"0x88bb0","precompiles":{"0x0000000000000000000000000000000000000001":"ECREC","0x0000000000000000000000000000000000000002":"SHA256","0x0000000000000000000000000000000000000003":"RIPEMD160","0x0000000000000000000000000000000000000004":"ID","0x0000000000000000000000000000000000000005":"MODEXP","0x0000000000000000000000000000000000000006":"BN254_ADD","0x0000000000000000000000000000000000000007":"BN254_MUL","0x0000000000000000000000000000000000000008":"BN254_PAIRING","0x0000000000000000000000000000000000000009":"BLAKE2F","0x000000000000000000000000000000000000000a":"KZG_POINT_EVALUATION"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02"}},"currentHash":"0x2eedf329","currentForkId":"0xbef71d30","next":{"activationTime":1742999832,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x88bb0","precompiles":{"0x0000000000000000000000000000000000000001":"ECREC","0x0000000000000000000000000000000000000002":"SHA256","0x0000000000000000000000000000000000000003":"RIPEMD160","0x0000000000000000000000000000000000000004":"ID","0x0000000000000000000000000000000000000005":"MODEXP","0x0000000000000000000000000000000000000006":"BN254_ADD","0x0000000000000000000000000000000000000007":"BN254_MUL","0x0000000000000000000000000000000000000008":"BN254_PAIRING","0x0000000000000000000000000000000000000009":"BLAKE2F","0x000000000000000000000000000000000000000a":"KZG_POINT_EVALUATION","0x000000000000000000000000000000000000000b":"BLS12_G1ADD","0x000000000000000000000000000000000000000c":"BLS12_G1MSM","0x000000000000000000000000000000000000000d":"BLS12_G2ADD","0x000000000000000000000000000000000000000e":"BLS12_G2MSM","0x000000000000000000000000000000000000000f":"BLS12_PAIRING_CHECK","0x0000000000000000000000000000000000000010":"BLS12_MAP_FP_TO_G1","0x0000000000000000000000000000000000000011":"BLS12_MAP_FP2_TO_G2"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}},"nextHash":"0x0d82a81f","nextForkId":"0x0929e24e","last":{"activationTime":1742999832,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x88bb0","precompiles":{"0x0000000000000000000000000000000000000001":"ECREC","0x0000000000000000000000000000000000000002":"SHA256","0x0000000000000000000000000000000000000003":"RIPEMD160","0x0000000000000000000000000000000000000004":"ID","0x0000000000000000000000000000000000000005":"MODEXP","0x0000000000000000000000000000000000000006":"BN254_ADD","0x0000000000000000000000000000000000000007":"BN254_MUL","0x0000000000000000000000000000000000000008":"BN254_PAIRING","0x0000000000000000000000000000000000000009":"BLAKE2F","0x000000000000000000000000000000000000000a":"KZG_POINT_EVALUATION","0x000000000000000000000000000000000000000b":"BLS12_G1ADD","0x000000000000000000000000000000000000000c":"BLS12_G1MSM","0x000000000000000000000000000000000000000d":"BLS12_G2ADD","0x000000000000000000000000000000000000000e":"BLS12_G2MSM","0x000000000000000000000000000000000000000f":"BLS12_PAIRING_CHECK","0x0000000000000000000000000000000000000010":"BLS12_MAP_FP_TO_G1","0x0000000000000000000000000000000000000011":"BLS12_MAP_FP2_TO_G2"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}},"lastHash":"0x0d82a81f","lastForkId":"0x0929e24e"}}
3+
<< {"jsonrpc":"2.0","id":1,"result":{"current":{"activationTime":0,"blobSchedule":{"baseFeeUpdateFraction":3338477,"max":6,"target":3},"chainId":"0x88bb0","forkId":"0xbef71d30","precompiles":{"BLAKE2F":"0x0000000000000000000000000000000000000009","BN254_ADD":"0x0000000000000000000000000000000000000006","BN254_MUL":"0x0000000000000000000000000000000000000007","BN254_PAIRING":"0x0000000000000000000000000000000000000008","ECREC":"0x0000000000000000000000000000000000000001","ID":"0x0000000000000000000000000000000000000004","KZG_POINT_EVALUATION":"0x000000000000000000000000000000000000000a","MODEXP":"0x0000000000000000000000000000000000000005","RIPEMD160":"0x0000000000000000000000000000000000000003","SHA256":"0x0000000000000000000000000000000000000002"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02"}},"next":{"activationTime":1742999832,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x88bb0","forkId":"0x0929e24e","precompiles":{"BLS12_G1ADD":"0x000000000000000000000000000000000000000b","BLS12_G1MSM":"0x000000000000000000000000000000000000000c","BLS12_G2ADD":"0x000000000000000000000000000000000000000d","BLS12_G2MSM":"0x000000000000000000000000000000000000000e","BLS12_MAP_FP2_TO_G2":"0x0000000000000000000000000000000000000011","BLS12_MAP_FP_TO_G1":"0x0000000000000000000000000000000000000010","BLS12_PAIRING_CHECK":"0x000000000000000000000000000000000000000f","BLAKE2F":"0x0000000000000000000000000000000000000009","BN254_ADD":"0x0000000000000000000000000000000000000006","BN254_MUL":"0x0000000000000000000000000000000000000007","BN254_PAIRING":"0x0000000000000000000000000000000000000008","ECREC":"0x0000000000000000000000000000000000000001","ID":"0x0000000000000000000000000000000000000004","KZG_POINT_EVALUATION":"0x000000000000000000000000000000000000000a","MODEXP":"0x0000000000000000000000000000000000000005","RIPEMD160":"0x0000000000000000000000000000000000000003","SHA256":"0x0000000000000000000000000000000000000002"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}},"last":{"activationTime":1742999832,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x88bb0","forkId":"0x0929e24e","precompiles":{"BLS12_G1ADD":"0x000000000000000000000000000000000000000b","BLS12_G1MSM":"0x000000000000000000000000000000000000000c","BLS12_G2ADD":"0x000000000000000000000000000000000000000d","BLS12_G2MSM":"0x000000000000000000000000000000000000000e","BLS12_MAP_FP2_TO_G2":"0x0000000000000000000000000000000000000011","BLS12_MAP_FP_TO_G1":"0x0000000000000000000000000000000000000010","BLS12_PAIRING_CHECK":"0x000000000000000000000000000000000000000f","BLAKE2F":"0x0000000000000000000000000000000000000009","BN254_ADD":"0x0000000000000000000000000000000000000006","BN254_MUL":"0x0000000000000000000000000000000000000007","BN254_PAIRING":"0x0000000000000000000000000000000000000008","ECREC":"0x0000000000000000000000000000000000000001","ID":"0x0000000000000000000000000000000000000004","KZG_POINT_EVALUATION":"0x000000000000000000000000000000000000000a","MODEXP":"0x0000000000000000000000000000000000000005","RIPEMD160":"0x0000000000000000000000000000000000000003","SHA256":"0x0000000000000000000000000000000000000002"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}}}}

‎tests/eth_config/get-current-config.io‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// retrieves the client's current fork configuration
22
>> {"jsonrpc":"2.0","id":1,"method":"eth_config"}
3-
<< {"jsonrpc":"2.0","id":1,"result":{"current":{"activationTime":1746612311,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x1","precompiles":{"0x0000000000000000000000000000000000000001":"ECREC","0x0000000000000000000000000000000000000002":"SHA256","0x0000000000000000000000000000000000000003":"RIPEMD160","0x0000000000000000000000000000000000000004":"ID","0x0000000000000000000000000000000000000005":"MODEXP","0x0000000000000000000000000000000000000006":"BN254_ADD","0x0000000000000000000000000000000000000007":"BN254_MUL","0x0000000000000000000000000000000000000008":"BN254_PAIRING","0x0000000000000000000000000000000000000009":"BLAKE2F","0x000000000000000000000000000000000000000a":"KZG_POINT_EVALUATION","0x000000000000000000000000000000000000000b":"BLS12_G1ADD","0x000000000000000000000000000000000000000c":"BLS12_G1MSM","0x000000000000000000000000000000000000000d":"BLS12_G2ADD","0x000000000000000000000000000000000000000e":"BLS12_G2MSM","0x000000000000000000000000000000000000000f":"BLS12_PAIRING_CHECK","0x0000000000000000000000000000000000000010":"BLS12_MAP_FP_TO_G1","0x0000000000000000000000000000000000000011":"BLS12_MAP_FP2_TO_G2"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}},"currentForkId":"0xc376cf8b","currentHash":"0x3ff0e375"}}
3+
<< {"jsonrpc":"2.0","id":1,"result":{"current":{"activationTime":1746612311,"blobSchedule":{"baseFeeUpdateFraction":5007716,"max":9,"target":6},"chainId":"0x1","forkId":"0x3ff0e375","precompiles":{"BLS12_G1ADD":"0x000000000000000000000000000000000000000b","BLS12_G1MSM":"0x000000000000000000000000000000000000000c","BLS12_G2ADD":"0x000000000000000000000000000000000000000d","BLS12_G2MSM":"0x000000000000000000000000000000000000000e","BLS12_MAP_FP2_TO_G2":"0x0000000000000000000000000000000000000011","BLS12_MAP_FP_TO_G1":"0x0000000000000000000000000000000000000010","BLS12_PAIRING_CHECK":"0x000000000000000000000000000000000000000f","BLAKE2F":"0x0000000000000000000000000000000000000009","BN254_ADD":"0x0000000000000000000000000000000000000006","BN254_MUL":"0x0000000000000000000000000000000000000007","BN254_PAIRING":"0x0000000000000000000000000000000000000008","ECREC":"0x0000000000000000000000000000000000000001","ID":"0x0000000000000000000000000000000000000004","KZG_POINT_EVALUATION":"0x000000000000000000000000000000000000000a","MODEXP":"0x0000000000000000000000000000000000000005","RIPEMD160":"0x0000000000000000000000000000000000000003","SHA256":"0x0000000000000000000000000000000000000002"},"systemContracts":{"BEACON_ROOTS_ADDRESS":"0x000f3df6d732807ef1319fb7b8bb8522d0beac02","CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS":"0x0000bbddc7ce488642fb579f8b00f3a590007251","DEPOSIT_CONTRACT_ADDRESS":"0x00000000219ab540356cbb839cbe05303d7705fa","HISTORY_STORAGE_ADDRESS":"0x0000f90827f1c53a10cb7a02335b175320002935","WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS":"0x00000961ef480eb55e80d19ad83579a64c007002"}}}}

0 commit comments

Comments
 (0)