Added Tests for Version Hash Verification

Author: ethDreamer

beacon_node/execution_layer/src/engine_api/new_payload_request.rs

@@ -176,3 +176,75 @@ impl<'a, E: EthSpec> TryFrom<ExecutionPayloadRef<'a, E>> for NewPayloadRequest<'
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use crate::NewPayloadRequest;
+    use types::{BeaconBlock, MainnetEthSpec};
+
+    #[test]
+    fn test_optimistic_sync_verifications() {
+        let beacon_block = get_valid_beacon_block();
+        let new_payload_request = NewPayloadRequest::try_from(beacon_block.to_ref())
+            .expect("should create new payload request");
+
+        assert!(new_payload_request
+            .perform_optimistic_sync_verifications()
+            .is_ok());
+    }
+
+    fn get_valid_beacon_block() -> BeaconBlock<MainnetEthSpec> {
+        BeaconBlock::Deneb(serde_json::from_str(r#"{
+          "slot": "88160",
+          "proposer_index": "583",
+          "parent_root": "0x60770cd86a497ca3aa2e91f1687aa3ebafac87af52c30a920b5f40bd9e930eb6",
+          "state_root": "0x4a0e0abbcbcf576f2cb7387c4289ab13b8a128e32127642f056143d6164941a6",
+          "body": {
+            "randao_reveal": "0xb5253d5739496abc4f67c7c92e39e46cca452c2fdfc5275e3e0426a012aa62df82f47f7dece348e28db4bb212f0e793d187120bbd47b8031ed79344116eb4128f0ce0b05ba18cd615bb13966c1bd7d89e23cc769c8e4d8e4a63755f623ac3bed",
+            "eth1_data": {
+              "deposit_root": "0xe4785ac914d8673797f886e3151ce2647f81ae070c7ddb6845e65fd1c47d1222",
+              "deposit_count": "1181",
+              "block_hash": "0x010671bdfbfce6b0071984a06a7ded6deef13b4f8fdbae402c606a7a0c8780d1"
+            },
+            "graffiti": "0x6c6f6465737461722f6765746800000000000000000000000000000000000000",
+            "proposer_slashings": [],
+            "attester_slashings": [],
+            "attestations": [],
+            "deposits": [],
+            "voluntary_exits": [],
+            "sync_aggregate": {
+              "sync_committee_bits": "0xfebffffffebfff7fff7f7fffbbefffff6affffffffbfffffefffebfffdbf77fff7fd77ffffefffdff7ffffeffffffe7e5ffffffdefffff7ffbffff7fffffffff",
+              "sync_committee_signature": "0x91939b5baf2a6f52d405b6dd396f5346ec435eca7d25912c91cc6a2f7030d870d68bebe4f2b21872a06929ff4cf3e5e9191053cb43eb24ebe34b9a75fb88a3acd06baf329c87f68bd664b49891260c698d7bca0f5365870b5b2b3a76f582156c"
+            },
+            "execution_payload": {
+              "parent_hash": "0xa6f3ed782a992f79ad38da2af91b3e8923c71b801c50bc9033bb35a2e1da885f",
+              "fee_recipient": "0xf97e180c050e5ab072211ad2c213eb5aee4df134",
+              "state_root": "0x3bfd1a7f309ed35048c349a8daf01815bdc09a6d5df86ea77d1056f248ba2017",
+              "receipts_root": "0xcb5b8ffea57cd0fa87194d49bc8bb7fad08c93c9934b886489503c328d15fd36",
+              "logs_bloom": "0x002000000000000000000000800000000000000000001040000000000000000000000001000000000000000000000000000000000000100000000020000c0800000000000000008000000008000000200000800000000000000000000000000000000000000000008000000000008000000000000000000002000010000000000000000000000000000000000000000000000000000000080000004000000000800000000000000000000100000000000000000000000000000000000800000000000102000000000000000000000000000000080000001000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+              "prev_randao": "0xb2693020177d99ffbd4c267023be172d759e7306ff51b0e7d677d3148fbd7f1d",
+              "block_number": "74807",
+              "gas_limit": "30000000",
+              "gas_used": "128393",
+              "timestamp": "1697039520",
+              "extra_data": "0xd883010d03846765746888676f312e32312e31856c696e7578",
+              "base_fee_per_gas": "7",
+              "block_hash": "0xc64f3a43c64aeb98518a237f6279fa03095b9f95ca673c860ad7f16fb9340062",
+              "transactions": [
+                "0x02f9017a8501a1f0ff4382317585012a05f2008512a05f2000830249f094c1b0bc605e2c808aa0867bfc98e51a1fe3e9867f80b901040cc7326300000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000036e534e16b8920d000000000000000000000000fb3e9c7cb92443931ee6b5b9728598d4eb9618c1000000000000000000000000fc7360b3b28cf4204268a8354dbec60720d155d2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000009a054a063f0fe7b9c68de8df91aaa5e96c15ab540000000000000000000000000c8d41b8fcc066cdabaf074d78e5153e8ce018a9c080a07dd9be0d014ffcd5b6883d0917c66b74ba51f0d976c8fc5674af192af6fa9450a02dad2c660974c125f5f22b1e6e8862a292e08cc2b4cafda35af650ee62868a43",
+                "0x03f8db8501a1f0ff430d84773594008504a817c8008252089454e594b6de0aa4b0188cd1549dd7ba715a455d078080c08504a817c800f863a001253ce00f525e3495cffa0b865eadb90a4c5ee812185cc796af74b6ec0a5dd7a0010720372a4d7dcab84413ed0cfc164fb91fb6ef1562ec2f7a82e912a1d9e129a0015a73e97950397896ed2c47dcab7c0360220bcfb413a8f210a7b6e6264e698880a04402cb0f13c17ef41dca106b1e1520c7aadcbe62984d81171e29914f587d67c1a02db62a8edb581917958e4a3884e7eececbaec114c5ee496e238033e896f997ac"
+              ],
+              "withdrawals": [],
+              "blob_gas_used": "393216",
+              "excess_blob_gas": "58720256"
+            },
+            "bls_to_execution_changes": [],
+            "blob_kzg_commitments": [
+              "0xa7accb7a25224a8c2e0cee9cd569fc1798665bfbfe780e08945fa9098ec61da4061f5b04e750a88d3340a801850a54fa",
+              "0xac7b47f99836510ae9076dc5f5da1f370679dea1d47073307a14cbb125cdc7822ae619637135777cb40e13d897fd00a7",
+              "0x997794110b9655833a88ad5a4ec40a3dc7964877bfbeb04ca1abe1d51bdc43e20e4c5757028896d298d7da954a6f14a1"
+            ]
+          }
+        }"#).expect("should decode"))
+    }
+}

beacon_node/execution_layer/src/versioned_hashes.rs

@@ -3,53 +3,54 @@ extern crate reth_rlp;
 
 use reth_primitives::{Transaction, TransactionSigned};
 use reth_rlp::Decodable;
-use std::collections::HashSet;
 use types::{EthSpec, ExecutionPayloadRef, Hash256, Unsigned, VersionedHash};
 
 #[derive(Debug)]
 pub enum Error {
     DecodingTransaction(String),
     LengthMismatch { expected: usize, found: usize },
-    MissingHash(VersionedHash),
+    VersionHashMismatch { expected: Hash256, found: Hash256 },
 }
 
 pub fn verify_versioned_hashes<E: EthSpec>(
     execution_payload: ExecutionPayloadRef<E>,
-    expected_versioned_hashes: &Vec<VersionedHash>,
+    expected_versioned_hashes: &[VersionedHash],
 ) -> Result<(), Error> {
-    match execution_payload {
-        ExecutionPayloadRef::Merge(_) | ExecutionPayloadRef::Capella(_) => Ok(()),
-        ExecutionPayloadRef::Deneb(payload) => {
-            let versioned_hashes = get_versioned_hashes::<E>(&payload.transactions)?;
-            // ensure that all expected hashes are present
-            for expected_hash in expected_versioned_hashes {
-                if !versioned_hashes.contains(expected_hash) {
-                    return Err(Error::MissingHash(*expected_hash));
-                }
-            }
-            // ensure that there are no extra hashes
-            if versioned_hashes.len() != expected_versioned_hashes.len() {
-                return Err(Error::LengthMismatch {
-                    expected: expected_versioned_hashes.len(),
-                    found: versioned_hashes.len(),
-                });
-            }
-            Ok(())
+    let versioned_hashes =
+        extract_versioned_hashes_from_transactions::<E>(execution_payload.transactions())?;
+    if versioned_hashes.len() != expected_versioned_hashes.len() {
+        return Err(Error::LengthMismatch {
+            expected: expected_versioned_hashes.len(),
+            found: versioned_hashes.len(),
+        });
+    }
+    for (found, expected) in versioned_hashes
+        .iter()
+        .zip(expected_versioned_hashes.iter())
+    {
+        if found != expected {
+            return Err(Error::VersionHashMismatch {
+                expected: *expected,
+                found: *found,
+            });
         }
     }
+
+    Ok(())
 }
 
-pub fn get_versioned_hashes<E: EthSpec>(
+pub fn extract_versioned_hashes_from_transactions<E: EthSpec>(
     transactions: &types::Transactions<E>,
-) -> Result<HashSet<VersionedHash>, Error> {
+) -> Result<Vec<VersionedHash>, Error> {
     Ok(transactions
         .into_iter()
         .map(beacon_tx_to_reth_signed_tx)
         .collect::<Result<Vec<_>, _>>()?
         .into_iter()
         .filter_map(|tx| match tx.transaction {
             Transaction::Eip4844(blob_tx) => Some(blob_tx.blob_versioned_hashes),
-            _ => None,
+            // enumerating all variants explicitly to make pattern irrefutable in case new types are added
+            Transaction::Eip1559(_) | Transaction::Eip2930(_) | Transaction::Legacy(_) => None,
         })
         .flatten()
         .map(Hash256::from)
@@ -70,9 +71,10 @@ mod test {
     use crate::static_valid_tx;
     use reth_primitives::Transaction;
 
+    type E = types::MainnetEthSpec;
+
     #[test]
     fn test_decode_reth_transaction() {
-        type E = types::MainnetEthSpec;
         let valid_tx = static_valid_tx::<E>().expect("should give me known valid transaction");
         let tx = beacon_tx_to_reth_signed_tx(&valid_tx).expect("should decode tx");
         assert!(matches!(
@@ -86,4 +88,35 @@ mod test {
             })
         ));
     }
+
+    #[test]
+    fn test_extract_versioned_hashes() {
+        use serde::Deserialize;
+
+        #[derive(Deserialize)]
+        #[serde(transparent)]
+        struct TestTransactions<E: EthSpec>(
+            #[serde(with = "ssz_types::serde_utils::list_of_hex_var_list")] types::Transactions<E>,
+        );
+
+        let TestTransactions(raw_transactions): TestTransactions<E> = serde_json::from_str(r#"[
+            "0x03f901388501a1f0ff430f843b9aca00843b9aca0082520894e7249813d8ccf6fa95a2203f46a64166073d58878080c002f8c6a0012e98362c814f1724262c0d211a1463418a5f6382a8d457b37a2698afbe7b5ea00100ef985761395dfa8ed5ce91f3f2180b612401909e4cb8f33b90c8a454d9baa0013d45411623b90d90f916e4025ada74b453dd4ca093c017c838367c9de0f801a001753e2af0b1e70e7ef80541355b2a035cc9b2c177418bb2a4402a9b346cf84da0011789b520a8068094a92aa0b04db8d8ef1c6c9818947c5210821732b8744049a0011c4c4f95597305daa5f62bf5f690e37fa11f5de05a95d05cac4e2119e394db80a0ccd86a742af0e042d08cbb35d910ddc24bbc6538f9e53be6620d4b6e1bb77662a01a8bacbc614940ac2f5c23ffc00a122c9f085046883de65c88ab0edb859acb99",
+            "0x02f9017a8501a1f0ff4382363485012a05f2008512a05f2000830249f094c1b0bc605e2c808aa0867bfc98e51a1fe3e9867f80b901040cc7326300000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000009445a285baa43e00000000000000000000000000c500931f24edb821cef6e28f7adb33b38578c82000000000000000000000000fc7360b3b28cf4204268a8354dbec60720d155d2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000009a054a063f0fe7b9c68de8df91aaa5e96c15ab540000000000000000000000000c8d41b8fcc066cdabaf074d78e5153e8ce018a9c080a008e14475c1173cd9f5740c24c08b793f9e16c36c08fa73769db95050e31e3396a019767dcdda26c4a774ca28c9df15d0c20e43bd07bd33ee0f84d6096cb5a1ebed"
+        ]"#).expect("should get raw transactions");
+        let expected_versioned_hashes = vec![
+            "0x012e98362c814f1724262c0d211a1463418a5f6382a8d457b37a2698afbe7b5e",
+            "0x0100ef985761395dfa8ed5ce91f3f2180b612401909e4cb8f33b90c8a454d9ba",
+            "0x013d45411623b90d90f916e4025ada74b453dd4ca093c017c838367c9de0f801",
+            "0x01753e2af0b1e70e7ef80541355b2a035cc9b2c177418bb2a4402a9b346cf84d",
+            "0x011789b520a8068094a92aa0b04db8d8ef1c6c9818947c5210821732b8744049",
+            "0x011c4c4f95597305daa5f62bf5f690e37fa11f5de05a95d05cac4e2119e394db",
+        ]
+        .into_iter()
+        .map(|tx| Hash256::from_slice(&hex::decode(&tx[2..]).expect("should decode hex")))
+        .collect::<Vec<_>>();
+
+        let versioned_hashes = extract_versioned_hashes_from_transactions::<E>(&raw_transactions)
+            .expect("should get versioned hashes");
+        assert_eq!(versioned_hashes, expected_versioned_hashes);
+    }
 }