lint

Author: clabby

bin/opt8n/src/cli/mod.rs

@@ -3,8 +3,8 @@
 use alloy_primitives::Address;
 use clap::{ArgAction, Parser};
 use color_eyre::eyre::{eyre, Result};
-use t8n::T8n;
 use std::path::PathBuf;
+use t8n::T8n;
 use tokio::sync::broadcast::{self};
 use tracing::Level;
 

bin/opt8n/src/cli/state.rs

@@ -93,7 +93,7 @@ impl<'a> StateCapture<'a> {
         };
 
         let l1_info_tx = transactions
-            .get(0)
+            .first()
             .ok_or(eyre!("L1 info transaction not present"))?;
         let raw_tx = l2_provider
             .raw_request::<[B256; 1], Bytes>("debug_getRawTransaction".into(), [*l1_info_tx])

bin/opt8n/src/cli/t8n.rs

@@ -1,7 +1,7 @@
 //! The `opt8n` application.
 
 use super::{deposits::DepositCapture, state::StateCapture, Cli};
-use crate::generator::STF;
+use crate::generator::StateTransition;
 use alloy_genesis::Genesis;
 use alloy_primitives::Bytes;
 use color_eyre::{eyre::ensure, owo_colors::OwoColorize, Result};
@@ -32,8 +32,8 @@ impl<'a> T8n<'a> {
         Self {
             cli,
             interrupt: interrupt.clone(),
-            state_cfg: StateCapture::new(&cli),
-            deposits: DepositCapture::new(&cli, interrupt),
+            state_cfg: StateCapture::new(cli),
+            deposits: DepositCapture::new(cli, interrupt),
             transactions: Default::default(),
         }
     }
@@ -85,7 +85,7 @@ impl<'a> T8n<'a> {
                     let genesis: Genesis =
                         serde_json::from_slice(&std::fs::read(&self.cli.l2_genesis)?)?;
 
-                    let mut stf = STF::new(genesis, self.state_cfg.allocs.clone())?;
+                    let mut stf = StateTransition::new(genesis, self.state_cfg.allocs.clone())?;
 
                     // Sanity check that the pre-state root is correct before proceeding.
                     ensure!(

bin/opt8n/src/generator/mod.rs

@@ -25,18 +25,18 @@ use revm::{
 use std::{collections::BTreeMap, sync::Arc};
 use tracing::info;
 
-/// The database for [STF].
-type STFDB = CacheDB<EmptyDBTyped<ProviderError>>;
+/// The database for [StateTransition].
+type StfDb = CacheDB<EmptyDBTyped<ProviderError>>;
 
 /// The execution fixture generator for `opt8n`.
-pub(crate) struct STF {
+pub(crate) struct StateTransition {
     /// Inner cache database.
-    pub(crate) db: STFDB,
+    pub(crate) db: StfDb,
     /// The [ChainSpec] for the devnet chain.
     pub(crate) chain_spec: Arc<ChainSpec>,
 }
 
-impl STF {
+impl StateTransition {
     /// Create a new execution fixture generator.
     pub(crate) fn new(genesis: Genesis, state_dump: DumpBlockResponse) -> Result<Self> {
         let mut db = CacheDB::default();
@@ -59,7 +59,7 @@ impl STF {
                         .storage
                         .as_ref()
                         .unwrap_or(&BTreeMap::new())
-                        .into_iter()
+                        .iter()
                         .map(|(k, v)| ((*k).into(), (*v).into()))
                         .collect(),
                     account_state: AccountState::None,
@@ -79,11 +79,7 @@ impl STF {
             };
             db.insert_contract(&mut info);
 
-            let entry = db
-                .accounts
-                .entry(*k)
-                .or_insert_with(|| DbAccount::default());
-
+            let entry = db.accounts.entry(*k).or_default();
             entry.info = info;
             if let Some(storage) = &account.storage {
                 storage.iter().for_each(|(k, v)| {
@@ -99,7 +95,7 @@ impl STF {
     }
 
     /// Grab the block executor with the current state.
-    pub(crate) fn executor(&mut self) -> OpBlockExecutor<OptimismEvmConfig, STFDB> {
+    pub(crate) fn executor(&mut self) -> OpBlockExecutor<OptimismEvmConfig, StfDb> {
         // Construct an ephemeral state with the current database.
         let state = State::builder()
             .with_database(self.db.clone())
@@ -178,11 +174,7 @@ impl STF {
             let mut info = account.info.clone().unwrap_or_default();
             self.db.insert_contract(&mut info);
 
-            let db_account = self
-                .db
-                .accounts
-                .entry(*address)
-                .or_insert_with(|| DbAccount::default());
+            let db_account = self.db.accounts.entry(*address).or_default();
             if account.is_info_changed() {
                 db_account.info = info;
             }
@@ -225,7 +217,12 @@ impl STF {
                 current_number: U256::from(header.number),
                 current_timestamp: U256::from(header.timestamp),
                 parent_beacon_block_root: header.parent_beacon_block_root,
-                block_hashes: Default::default(),
+                block_hashes: Some(
+                    [(U256::from(header.number - 1), header.parent_hash)]
+                        .iter()
+                        .cloned()
+                        .collect::<HashMap<_, _>>(),
+                ),
             },
             transactions: encoded_txs,
             result: ExecutionResult {
@@ -281,11 +278,10 @@ impl STF {
                     .code
                     .as_ref()
                     .map(|code| match code {
-                        Bytecode::LegacyRaw(code) => Some(keccak256(code)),
-                        Bytecode::LegacyAnalyzed(code) => Some(keccak256(code.bytecode())),
+                        Bytecode::LegacyRaw(code) => keccak256(code),
+                        Bytecode::LegacyAnalyzed(code) => keccak256(code.bytecode()),
                         _ => panic!("Unsupported bytecode type"),
                     })
-                    .flatten()
                     .unwrap_or(KECCAK_EMPTY),
             };
 
@@ -313,8 +309,8 @@ impl STF {
         Ok(hb.root())
     }
 
-    /// Transforms a [STFDB] into a map of [Address]es to [GenesisAccount]s.
-    fn gen_allocs(db: STFDB) -> HashMap<Address, GenesisAccount> {
+    /// Transforms a [StfDb] into a map of [Address]es to [GenesisAccount]s.
+    fn gen_allocs(db: StfDb) -> HashMap<Address, GenesisAccount> {
         db.accounts
             .iter()
             .map(|(address, account)| {

crates/op-test-vectors/src/testdata/result.json

@@ -1,25 +1,9 @@
 {
-  "stateRoot": "0x1c99b01120e7a2fa1301b3505f20100e72362e5ac3f96854420e56ba8984d716",
-  "txRoot": "0xb5eee60b45801179cbde3781b9a5dee9b3111554618c9cda3d6f7e351fd41e0b",
-  "receiptRoot": "0x86ceb80cb6bef8fe4ac0f1c99409f67cb2554c4432f374e399b94884eb3e6562",
+  "stateRoot": "0xadff407345f10f9ca555978665f414508b0ae6f75bb3e021db66a43329d35bdd",
+  "txRoot": "0x23e4973bf3a2315801178524b870d66a00a0e9e312f24c150d56f42faa8521de",
+  "receiptRoot": "0xf171a9e908a0720088e1b71d26079b7bf3702f02b38e0dec0c57e7aa41087aa3",
   "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
   "receipts": [
-    {
-      "root": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-      "status": "0x1",
-      "type": "0x0",
-      "from": "0x25ace71c97b33cc4729cf772ae268934f7ab5fa1",
-      "to": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-      "cumulativeGasUsed": "0xa878",
-      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-      "logs": [],
-      "transactionHash": "0x4e6549e2276d1bc256b2a56ead2d9705a51a8bf54e3775fbd2e98c91fb0e4494",
-      "contractAddress": "0x0000000000000000000000000000000000000000",
-      "blockNumber": "0x76976ad",
-      "gasUsed": "0xa878",
-      "effectiveGasPrice": "0x1",
-      "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "transactionIndex": "0x0"
-    }
+    "0xca7e0182b5eac08203a901"
   ]
-}
+}