Implement engine API v1.0.0-alpha.4 (#2810)

* Added ForkchoiceUpdatedV1 & GetPayloadV1

* Added ExecutePayloadV1

* Added new geth test vectors

* Separated Json Object/Serialization Code into file

* Deleted code/tests for Requests Removed from spec

* Finally fixed serialization of null '0x'

* Made Naming of JSON Structs Consistent

* Fix clippy lints

* Remove u64 payload id

* Remove unused serde impls

* Swap to [u8; 8] for payload id

* Tidy

* Adjust some block gen return vals

* Tidy

* Add fallback when payload id is unknown

* Remove comment

Co-authored-by: Mark Mackey <mark@sigmaprime.io>

consensus/serde_utils/src/bytes_4_hex.rs

@@ -1,38 +0,0 @@
-//! Formats `[u8; 4]` as a 0x-prefixed hex string.
-//!
-//! E.g., `[0, 1, 2, 3]` serializes as `"0x00010203"`.
-
-use crate::hex::PrefixedHexVisitor;
-use serde::de::Error;
-use serde::{Deserializer, Serializer};
-
-const BYTES_LEN: usize = 4;
-
-pub fn serialize<S>(bytes: &[u8; BYTES_LEN], serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    let mut hex_string: String = "0x".to_string();
-    hex_string.push_str(&hex::encode(&bytes));
-
-    serializer.serialize_str(&hex_string)
-}
-
-pub fn deserialize<'de, D>(deserializer: D) -> Result<[u8; BYTES_LEN], D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let decoded = deserializer.deserialize_str(PrefixedHexVisitor)?;
-
-    if decoded.len() != BYTES_LEN {
-        return Err(D::Error::custom(format!(
-            "expected {} bytes for array, got {}",
-            BYTES_LEN,
-            decoded.len()
-        )));
-    }
-
-    let mut array = [0; BYTES_LEN];
-    array.copy_from_slice(&decoded);
-    Ok(array)
-}

consensus/serde_utils/src/fixed_bytes_hex.rs

@@ -0,0 +1,52 @@
+//! Formats `[u8; n]` as a 0x-prefixed hex string.
+//!
+//! E.g., `[0, 1, 2, 3]` serializes as `"0x00010203"`.
+
+use crate::hex::PrefixedHexVisitor;
+use serde::de::Error;
+use serde::{Deserializer, Serializer};
+
+macro_rules! bytes_hex {
+    ($num_bytes: tt) => {
+        use super::*;
+
+        const BYTES_LEN: usize = $num_bytes;
+
+        pub fn serialize<S>(bytes: &[u8; BYTES_LEN], serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            let mut hex_string: String = "0x".to_string();
+            hex_string.push_str(&hex::encode(&bytes));
+
+            serializer.serialize_str(&hex_string)
+        }
+
+        pub fn deserialize<'de, D>(deserializer: D) -> Result<[u8; BYTES_LEN], D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            let decoded = deserializer.deserialize_str(PrefixedHexVisitor)?;
+
+            if decoded.len() != BYTES_LEN {
+                return Err(D::Error::custom(format!(
+                    "expected {} bytes for array, got {}",
+                    BYTES_LEN,
+                    decoded.len()
+                )));
+            }
+
+            let mut array = [0; BYTES_LEN];
+            array.copy_from_slice(&decoded);
+            Ok(array)
+        }
+    };
+}
+
+pub mod bytes_4_hex {
+    bytes_hex!(4);
+}
+
+pub mod bytes_8_hex {
+    bytes_hex!(8);
+}

consensus/serde_utils/src/lib.rs

@@ -1,6 +1,6 @@
 mod quoted_int;
 
-pub mod bytes_4_hex;
+pub mod fixed_bytes_hex;
 pub mod hex;
 pub mod hex_vec;
 pub mod list_of_bytes_lists;
@@ -9,4 +9,5 @@ pub mod u32_hex;
 pub mod u64_hex_be;
 pub mod u8_hex;
 
+pub use fixed_bytes_hex::{bytes_4_hex, bytes_8_hex};
 pub use quoted_int::{quoted_u256, quoted_u32, quoted_u64, quoted_u8};