From b056511f24e7aec96c83ed81df5cba37619ce8c1 Mon Sep 17 00:00:00 2001
From: Wodann <Wodann@users.noreply.github.com>
Date: Wed, 3 Jul 2024 09:24:17 -0500
Subject: [PATCH] fix: allow missing nonce in remote blocks (#539)

* fix: allow missing nonce in remote blocks

* misc: add changeset
---
 .changeset/big-boxes-drop.md       | 5 +++++
 crates/edr_evm/src/block/remote.rs | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/big-boxes-drop.md

diff --git a/.changeset/big-boxes-drop.md b/.changeset/big-boxes-drop.md
new file mode 100644
index 000000000..0b3cd7cda
--- /dev/null
+++ b/.changeset/big-boxes-drop.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/edr": patch
+---
+
+Fixes restriction to disallow remote blocks without a nonce
diff --git a/crates/edr_evm/src/block/remote.rs b/crates/edr_evm/src/block/remote.rs
index 31922eaf5..d22bec6e3 100644
--- a/crates/edr_evm/src/block/remote.rs
+++ b/crates/edr_evm/src/block/remote.rs
@@ -181,7 +181,9 @@ impl IntoRemoteBlock<L1ChainSpec> for edr_rpc_eth::Block<edr_rpc_eth::Transactio
             // TODO don't accept remote blocks with missing mix hash,
             // see https://github.com/NomicFoundation/edr/issues/518
             mix_hash: self.mix_hash.unwrap_or_default(),
-            nonce: self.nonce.ok_or(CreationError::MissingNonce)?,
+            // TODO don't accept remote blocks with missing nonce,
+            // see https://github.com/NomicFoundation/edr/issues/518
+            nonce: self.nonce.unwrap_or_default(),
             base_fee_per_gas: self.base_fee_per_gas,
             withdrawals_root: self.withdrawals_root,
             blob_gas: self.blob_gas_used.and_then(|gas_used| {