next and last must be present, and will be null if no future fork is scheduled.

Signed-off-by: Danno Ferrin <[email protected]>

Author: shemnon

src/eth/client.yaml

@@ -81,7 +81,7 @@
     schema:
       $ref: '#/components/schemas/ConfigurationResponse'
   examples:
-    - name: eth_config example
+    - name: eth_config example with no future fork scheduled
       params: []
       result:
         name: Configuration
@@ -117,4 +117,6 @@
               CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: '0x0000bbddc7ce488642fb579f8b00f3a590007251'
               DEPOSIT_CONTRACT_ADDRESS: '0x00000000219ab540356cbb839cbe05303d7705fa'
               HISTORY_STORAGE_ADDRESS: '0x0000f90827f1c53a10cb7a02335b175320002935'
-              WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS: '0x00000961ef480eb55e80d19ad83579a64c007002'
+              WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS: '0x00000961ef480eb55e80d19ad83579a64c007002'
+          next: null
+          last: null

src/schemas/client.yaml

@@ -28,14 +28,20 @@ ConfigurationResponse:
       $ref: '#/components/schemas/ConfigObject'
     next:
       title: Next configuration
-      description: Configuration for the next scheduled fork, absent if no future forks scheduled
-      $ref: '#/components/schemas/ConfigObject'
+      description: Configuration for the next scheduled fork, null if no future forks scheduled
+      oneOf:
+        - $ref: '#/components/schemas/ConfigObject'
+        - type: 'null'
     last:
       title: Last configuration
-      description: Configuration for the last configured fork, absent if no future forks scheduled
-      $ref: '#/components/schemas/ConfigObject'
+      description: Configuration for the last configured fork, null if no future forks scheduled
+      oneOf:
+        - $ref: '#/components/schemas/ConfigObject'
+        - type: 'null'
   required:
     - current
+    - next
+    - last
 ConfigObject:
   title: Configuration object
   description: Represents a specific fork configuration

tests/eth_config/get-current-config.io

@@ -1,3 +1,3 @@
-// retrieves the client's current fork configuration
+// retrieves the client's current fork configuration when no future forks are scheduled
 >> {"jsonrpc":"2.0","id":1,"method":"eth_config"}
-<< {"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"}}}}
+<< {"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"}},"next":null,"last":null}}