From c437e5e869f39cc7a1b4ec41fb0874a3180903f8 Mon Sep 17 00:00:00 2001
From: John Hilliard <praetoriansentry@gmail.com>
Date: Tue, 19 Mar 2024 07:10:43 -0400
Subject: [PATCH 1/5] fix: switching from hard coded one to rpc

---
 leader/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leader/src/lib.rs b/leader/src/lib.rs
index 4d8a87d..9cce5cc 100644
--- a/leader/src/lib.rs
+++ b/leader/src/lib.rs
@@ -156,7 +156,7 @@ pub async fn gather_witness(tx: TxHash, provider: &Provider<Http>) -> Result<Vec
     let mut contract_codes = contract_codes();
     let mut storage_mpts = HashMap::new();
     let mut txn_rlps = vec![];
-    let chain_id = U256::one();
+    let chain_id = provider.get_chainid().await?;
     let mut alladdrs = vec![];
     let mut state = BTreeMap::<Address, AccountState>::new();
     let mut traces: Vec<BTreeMap<Address, AccountState>> = vec![];

From 1203eb12103907ef7b2d1f7602a703bcd4539055 Mon Sep 17 00:00:00 2001
From: John Hilliard <praetoriansentry@gmail.com>
Date: Tue, 19 Mar 2024 12:31:21 -0400
Subject: [PATCH 2/5] fix: adding from will

---
 leader/src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/leader/src/lib.rs b/leader/src/lib.rs
index 9cce5cc..82144fc 100644
--- a/leader/src/lib.rs
+++ b/leader/src/lib.rs
@@ -316,6 +316,10 @@ pub async fn gather_witness(tx: TxHash, provider: &Provider<Http>) -> Result<Vec
     let (block_metadata, _final_hash) =
         get_block_metadata(block_number.into(), chain_id, provider).await?;
 
+    let (proof, _storage_proof, _storage_hash, _account_is_empty) =
+         get_proof(block_metadata.block_beneficiary, vec![], (block_number - 1).into(), provider).await?;
+    insert_mpt(&mut state_mpt, proof);
+
     let mut state_mpt = state_mpt.to_partial_trie();
     let mut txns_mpt = HashedPartialTrie::from(Node::Empty);
     let mut receipts_mpt = HashedPartialTrie::from(Node::Empty);

From 4e441f2288662ffb3fb3ec8d9f909a3a7a740bf2 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Tue, 19 Mar 2024 19:47:04 +0100
Subject: [PATCH 3/5] Use clique signer as coinbase

---
 leader/src/lib.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/leader/src/lib.rs b/leader/src/lib.rs
index 82144fc..946f1f6 100644
--- a/leader/src/lib.rs
+++ b/leader/src/lib.rs
@@ -5,6 +5,7 @@ pub mod mpt;
 pub mod utils;
 
 use std::collections::{BTreeMap, HashMap};
+use std::str::FromStr;
 
 use anyhow::{anyhow, Result};
 use eth_trie_utils::nibbles::Nibbles;
@@ -100,9 +101,12 @@ pub async fn get_block_metadata(
         .get_block(block_number)
         .await?
         .ok_or_else(|| anyhow!("Block not found. Block number: {}", block_number))?;
+    let signers = provider.request::<_, Vec<String>>("clique_getSignersAtHash", ["0x1ff44bfe843dcc37b85de404ebc8c288e14e7d1415700684ad9e01ccd382646d"]).await?;
+    assert_eq!(signers.len(), 1);
+    let signer = H160::from_str(&signers[0])?;
     Ok((
         BlockMetadata {
-            block_beneficiary: block.author.unwrap(),
+            block_beneficiary: signer,
             block_timestamp: block.timestamp,
             block_number: U256([block_number.0[0], 0, 0, 0]),
             block_difficulty: block.difficulty,
@@ -316,10 +320,6 @@ pub async fn gather_witness(tx: TxHash, provider: &Provider<Http>) -> Result<Vec
     let (block_metadata, _final_hash) =
         get_block_metadata(block_number.into(), chain_id, provider).await?;
 
-    let (proof, _storage_proof, _storage_hash, _account_is_empty) =
-         get_proof(block_metadata.block_beneficiary, vec![], (block_number - 1).into(), provider).await?;
-    insert_mpt(&mut state_mpt, proof);
-
     let mut state_mpt = state_mpt.to_partial_trie();
     let mut txns_mpt = HashedPartialTrie::from(Node::Empty);
     let mut receipts_mpt = HashedPartialTrie::from(Node::Empty);

From 1e9de03b9ee73797fd8f674c1b07d4c0af10f4bf Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Tue, 19 Mar 2024 19:48:39 +0100
Subject: [PATCH 4/5] minor

---
 leader/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leader/src/lib.rs b/leader/src/lib.rs
index 946f1f6..6ea78c5 100644
--- a/leader/src/lib.rs
+++ b/leader/src/lib.rs
@@ -101,7 +101,7 @@ pub async fn get_block_metadata(
         .get_block(block_number)
         .await?
         .ok_or_else(|| anyhow!("Block not found. Block number: {}", block_number))?;
-    let signers = provider.request::<_, Vec<String>>("clique_getSignersAtHash", ["0x1ff44bfe843dcc37b85de404ebc8c288e14e7d1415700684ad9e01ccd382646d"]).await?;
+    let signers = provider.request::<_, Vec<String>>("clique_getSignersAtHash", [block.hash]).await?;
     assert_eq!(signers.len(), 1);
     let signer = H160::from_str(&signers[0])?;
     Ok((

From 0e45c404b9e29521efa192fcbe747347367faa7b Mon Sep 17 00:00:00 2001
From: John Hilliard <praetoriansentry@gmail.com>
Date: Tue, 19 Mar 2024 15:23:49 -0400
Subject: [PATCH 5/5] ops: fmt

---
 leader/src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/leader/src/lib.rs b/leader/src/lib.rs
index 6ea78c5..c334f49 100644
--- a/leader/src/lib.rs
+++ b/leader/src/lib.rs
@@ -101,7 +101,9 @@ pub async fn get_block_metadata(
         .get_block(block_number)
         .await?
         .ok_or_else(|| anyhow!("Block not found. Block number: {}", block_number))?;
-    let signers = provider.request::<_, Vec<String>>("clique_getSignersAtHash", [block.hash]).await?;
+    let signers = provider
+        .request::<_, Vec<String>>("clique_getSignersAtHash", [block.hash])
+        .await?;
     assert_eq!(signers.len(), 1);
     let signer = H160::from_str(&signers[0])?;
     Ok((