fix Deneb RestPublishedSignedBlockContents REST JSON decoding

AllTests-mainnet.md

@@ -428,6 +428,12 @@ OK: 12/12 Fail: 0/12 Skip: 0/12
 + prune states                                                                               OK
 ```
 OK: 1/1 Fail: 0/1 Skip: 0/1
+## REST JSON decoding
+```diff
++ DenebSignedBlockContents                                                                   OK
++ RestPublishedSignedBlockContents                                                           OK
+```
+OK: 2/2 Fail: 0/2 Skip: 0/2
 ## Remove keystore testing suite
 ```diff
 + Many remotes                                                                               OK
@@ -705,4 +711,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
 OK: 9/9 Fail: 0/9 Skip: 0/9
 
 ---TOTAL---
-OK: 398/403 Fail: 0/403 Skip: 5/403
+OK: 400/405 Fail: 0/405 Skip: 5/405

beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim

@@ -1379,7 +1379,7 @@ proc readValue*(reader: var JsonReader[RestJson],
                                     "RestPublishedBeaconBlockBody")
       bls_to_execution_changes = Opt.some(
         reader.readValue(SignedBLSToExecutionChangeList))
-    of "blob_kzg_commitments_changes":
+    of "blob_kzg_commitments":
       if blob_kzg_commitments.isSome():
         reader.raiseUnexpectedField("Multiple `blob_kzg_commitments` fields found",
                                     "RestPublishedBeaconBlockBody")
@@ -1750,6 +1750,8 @@ proc readValue*(reader: var JsonReader[RestJson],
           Opt.none(RestPublishedSignedBeaconBlock)
       if signed_message.isNone():
         reader.raiseUnexpectedValue("Incorrect signed_block format")
+
+      # Only needed to signal fork to the blck.kind case selection
       let blck = ForkedSignedBeaconBlock(signed_message.get())
       message = Opt.some(RestPublishedBeaconBlock(
         case blck.kind
@@ -1759,28 +1761,27 @@ proc readValue*(reader: var JsonReader[RestJson],
         of ConsensusFork.Deneb:
           ForkedBeaconBlock.init(blck.denebData.message)
       ))
-
-      signature = Opt.some(forks.signature(
-        ForkedSignedBeaconBlock(signed_message.get())))
     of "signed_blob_sidecars":
       if signed_blob_sidecars.isSome():
         reader.raiseUnexpectedField(
           "Multiple `signed_blob_sidecars` fields found",
           "RestPublishedSignedBlockContents")
       if signature.isSome():
         reader.raiseUnexpectedField(
-          "Found `signed_block` field alongside message or signature fields",
+          "Found `signed_blob_sidecars` field alongside signature field",
           "RestPublishedSignedBlockContents")
       signed_blob_sidecars = Opt.some(reader.readValue(
         List[SignedBlobSidecar, Limit MAX_BLOBS_PER_BLOCK]))
 
     else:
       unrecognizedFieldWarning()
 
-  if signature.isNone():
-    reader.raiseUnexpectedValue("Field `signature` is missing")
-  if message.isNone():
-    reader.raiseUnexpectedValue("Field `message` is missing")
+  if signed_message.isNone():
+    # Pre-Deneb; conditions for when signed_message.isSome checked in case body
+    if signature.isNone():
+      reader.raiseUnexpectedValue("Field `signature` is missing")
+    if message.isNone():
+      reader.raiseUnexpectedValue("Field `message` is missing")
 
   let blck = ForkedBeaconBlock(message.get())
   case blck.kind
@@ -1820,10 +1821,8 @@ proc readValue*(reader: var JsonReader[RestJson],
       value = RestPublishedSignedBlockContents(
         kind: ConsensusFork.Deneb,
         denebData: DenebSignedBlockContents(
-          signed_block: deneb.SignedBeaconBlock(
-            message: blck.denebData,
-            signature: signature.get()
-          ),
+          # Constructed to be interally consistent
+          signed_block: signed_message.get().distinctBase.denebData,
           signed_blob_sidecars: signed_blob_sidecars.get()
         )
       )

beacon_chain/spec/eth2_apis/rest_types.nim

@@ -21,7 +21,6 @@ import
   ".."/mev/[capella_mev, deneb_mev]
 
 from ".."/datatypes/capella import BeaconBlockBody
-from ".."/mev/deneb_mev import ExecutionPayloadAndBlobsBundle
 
 export forks, phase0, altair, bellatrix, capella, capella_mev, deneb_mev,
        tables, httputils

tests/all_tests.nim

@@ -39,6 +39,7 @@ import # Unit test
   ./test_network_metadata,
   ./test_peer_pool,
   ./test_remote_keystore,
+  ./test_rest_json_serialization,
   ./test_serialization,
   ./test_spec,
   ./test_statediff,