add witness struct

Author: lightsing

Cargo.lock

@@ -23,6 +23,7 @@ alloy = "0.5"
 alloy-eips = "0.5"
 alloy-consensus = "0.5"
 alloy-rpc-types-eth = "0.5"
+alloy-rpc-types-debug = "0.5"
 alloy-serde = "0.5"
 
 alloy-eip2930 = "0.1"
@@ -99,12 +100,8 @@ ff = { git = "https://github.com/scroll-tech/ff", branch = "feat/sp1" }
 # patched add rkyv support & MSRV 1.77
 ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" }
 
-alloy-eip2930 = { git = "https://github.com/scroll-tech/alloy-eips", branch = "v0.4.2" }
-
 alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.14-transparent" }
 
-alloy-trie = { git = "https://github.com/scroll-tech/alloy-trie", branch = "v0.7.4" }
-
 revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v50" }
 revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v50" }
 revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v50" }

Cargo.toml

@@ -12,6 +12,7 @@ pub mod types;
 
 pub use alloy_consensus;
 
+use crate::types::TypedTransaction;
 pub use alloy_primitives;
 pub use alloy_primitives::{Address, BlockHash, B256, U256};
 
@@ -49,6 +50,22 @@ pub trait BlockHeader: fmt::Debug {
     fn withdraw_root(&self) -> B256;
 }
 
+/// BlockWitness trait
+pub trait BlockWitness: fmt::Debug {
+    /// Header
+    fn header(&self) -> &impl BlockHeader;
+    /// Pre-state root
+    fn pre_state_root(&self) -> B256;
+    /// Transactions
+    fn build_typed_transactions(
+        &self,
+    ) -> impl Iterator<Item = Result<TypedTransaction, alloy_primitives::SignatureError>>;
+    /// States
+    fn states_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>>;
+    /// Codes
+    fn codes_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>>;
+}
+
 // #[cfg(feature = "scroll")]
 // pub trait BlockScrollExt: Block {
 //     /// start l1 queue index

crates/primitives/src/lib.rs

@@ -7,8 +7,49 @@ mod access_list;
 mod block_header;
 mod signature;
 mod transaction;
+mod witness;
 
 pub use access_list::{AccessList, AccessListItem, ArchivedAccessList, ArchivedAccessListItem};
 pub use block_header::{ArchivedBlockHeader, BlockHeader};
 pub use signature::{ArchivedSignature, Signature};
 pub use transaction::{ArchivedTransaction, Transaction, TypedTransaction};
+pub use witness::{ArchivedBlockWitness, BlockWitness};
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use alloy_rpc_types_debug::ExecutionWitness;
+    use alloy_rpc_types_eth::Block;
+
+    const BLOCK_2BA60C: &str =
+        include_str!("../../../../testdata/holesky_witness/0x2ba60c/block.json");
+    const BLOCK_2BA60D: &str =
+        include_str!("../../../../testdata/holesky_witness/0x2ba60d/block.json");
+    const WITNESS_2BA60C: &str =
+        include_str!("../../../../testdata/holesky_witness/0x2ba60c/witness.json");
+    const WITNESS_2BA60D: &str =
+        include_str!("../../../../testdata/holesky_witness/0x2ba60d/witness.json");
+
+    #[test]
+    fn test_deserialize_block() {
+        serde_json::from_str::<Block>(BLOCK_2BA60C).unwrap();
+        serde_json::from_str::<Block>(BLOCK_2BA60D).unwrap();
+        serde_json::from_str::<ExecutionWitness>(WITNESS_2BA60C).unwrap();
+        serde_json::from_str::<ExecutionWitness>(WITNESS_2BA60D).unwrap();
+    }
+
+    #[test]
+    fn test_build() {
+        let block = serde_json::from_str::<Block>(BLOCK_2BA60D).unwrap();
+        let prev_state_root = serde_json::from_str::<Block>(BLOCK_2BA60C)
+            .unwrap()
+            .header
+            .state_root;
+        let witness = serde_json::from_str::<ExecutionWitness>(WITNESS_2BA60D).unwrap();
+
+        let block_witness = BlockWitness::new_from_block(block, prev_state_root, witness);
+        test_block_witness(block_witness);
+    }
+
+    fn test_block_witness<B: crate::BlockWitness>(_block_witness: B) {}
+}

crates/primitives/src/types/mod.rs

@@ -0,0 +1,86 @@
+use crate::types::{BlockHeader, Transaction, TypedTransaction};
+use alloy_primitives::{Bytes, B256};
+use alloy_rpc_types_debug::ExecutionWitness;
+use alloy_rpc_types_eth::Block;
+
+/// Witness for a block.
+#[derive(Clone, Debug, PartialEq, Eq, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
+#[rkyv(derive(Debug, PartialEq, Eq))]
+pub struct BlockWitness {
+    /// Block header representation.
+    #[rkyv(attr(doc = "Block header representation"))]
+    pub header: BlockHeader,
+    /// State trie root before the block.
+    #[rkyv(attr(doc = "State trie root before the block"))]
+    pub pre_state_root: B256,
+    /// Transactions in the block.
+    #[rkyv(attr(doc = "Transactions in the block"))]
+    pub transaction: Vec<Transaction>,
+    /// Rlp encoded state trie nodes.
+    #[rkyv(attr(doc = "Rlp encoded state trie nodes"))]
+    pub states: Vec<Bytes>,
+    /// Code bytecodes
+    #[rkyv(attr(doc = "Code bytecodes"))]
+    pub codes: Vec<Bytes>,
+}
+
+impl BlockWitness {
+    /// Creates a new block witness from a block, pre-state root, execution witness.
+    pub fn new_from_block(block: Block, pre_state_root: B256, witness: ExecutionWitness) -> Self {
+        let header = BlockHeader::from(block.header);
+        let transaction = block
+            .transactions
+            .into_transactions()
+            .map(|tx| Transaction::from_alloy(tx))
+            .collect();
+        let states = witness.state.into_values().collect();
+        let codes = witness.codes.into_values().collect();
+        Self {
+            header,
+            transaction,
+            pre_state_root,
+            states,
+            codes,
+        }
+    }
+}
+
+impl crate::BlockWitness for BlockWitness {
+    fn header(&self) -> &impl crate::BlockHeader {
+        &self.header
+    }
+    fn pre_state_root(&self) -> B256 {
+        self.pre_state_root
+    }
+    fn build_typed_transactions(
+        &self,
+    ) -> impl Iterator<Item = Result<TypedTransaction, alloy_primitives::SignatureError>> {
+        self.transaction.iter().map(|tx| tx.try_into())
+    }
+    fn states_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>> {
+        self.states.iter().map(|s| s.as_ref())
+    }
+    fn codes_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>> {
+        self.codes.iter().map(|c| c.as_ref())
+    }
+}
+
+impl crate::BlockWitness for ArchivedBlockWitness {
+    fn header(&self) -> &impl crate::BlockHeader {
+        &self.header
+    }
+    fn pre_state_root(&self) -> B256 {
+        self.pre_state_root.into()
+    }
+    fn build_typed_transactions(
+        &self,
+    ) -> impl Iterator<Item = Result<TypedTransaction, alloy_primitives::SignatureError>> {
+        self.transaction.iter().map(|tx| tx.try_into())
+    }
+    fn states_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>> {
+        self.states.iter().map(|s| s.as_ref())
+    }
+    fn codes_iter(&self) -> impl Iterator<Item = impl AsRef<[u8]>> {
+        self.codes.iter().map(|c| c.as_ref())
+    }
+}

crates/primitives/src/types/witness.rs

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -ex
+
+if [ $# -eq 0 ]; then
+    echo "Usage: $0 <block_number> [url] [output_dir]"
+    exit 0
+fi
+
+BLOCK=$1
+URL=${2:-http://localhost:8545}
+OUT_DIR=${3:-testdata/holesky_witness}
+
+HEX_BLOCK=$(printf '0x%x' $BLOCK)
+
+mkdir -p ${OUT_DIR}/${HEX_BLOCK}
+
+cast rpc -r $URL eth_getBlockByNumber "$HEX_BLOCK" true | jq > ${OUT_DIR}/${HEX_BLOCK}/block.json
+#PAYLOAD='{"jsonrpc":"2.0","method":"debug_executionWitness", "params": ["'$HEX_BLOCK'"], "id": 1}'
+#curl -H "Content-Type: application/json" -X POST --data "$PAYLOAD" $URL | jq .result > ${OUT_DIR}/${HEX_BLOCK}/witness.json
+#
+#PAYLOAD='{"jsonrpc":"2.0","method":"eth_getBlockByNumber", "params": ["'$HEX_BLOCK'", true], "id": 1}'
+#curl -H "Content-Type: application/json" -X POST --data "$PAYLOAD" $URL | jq .result > ${OUT_DIR}/${HEX_BLOCK}/block.json
+##cast rpc -r $URL debug_executionWitness "$HEX_BLOCK" > ${OUT_DIR}/${HEX_BLOCK}/witness.json
+##