Merge branch 'main' into edgl_snapshots_v2

Author: edg-l

crates/common/types/block.rs

@@ -31,6 +31,7 @@ use once_cell::sync::OnceCell;
 lazy_static! {
     pub static ref DEFAULT_OMMERS_HASH: H256 = H256::from_slice(&hex::decode("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap()); // = Keccak256(RLP([])) as of EIP-3675
     pub static ref DEFAULT_REQUESTS_HASH: H256 = H256::from_slice(&hex::decode("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855").unwrap()); // = Sha256([])) as of EIP-7685
+    pub static ref EMPTY_WITHDRAWALS_HASH: H256 = H256::from_slice(&hex::decode("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap()); // = Root of empty Trie as of EIP-4895
 }
 #[derive(PartialEq, Eq, Debug, Clone, Deserialize, Serialize, Default)]
 pub struct Block {
@@ -600,6 +601,11 @@ pub fn validate_block_body(block: &Block) -> Result<(), InvalidBlockBodyError> {
                 return Err(InvalidBlockBodyError::WithdrawalsRootNotMatch);
             }
         }
+        (Some(withdrawals_root), None) => {
+            if withdrawals_root != *EMPTY_WITHDRAWALS_HASH {
+                return Err(InvalidBlockBodyError::WithdrawalsRootNotMatch);
+            }
+        }
         (None, None) => {}
         _ => return Err(InvalidBlockBodyError::WithdrawalsRootNotMatch),
     }