checkpoint

Author: clabby

.gitignore

@@ -9,3 +9,6 @@
 
 # MdBook Artifacts
 book/book/
+
+# Kurtosis Devnet
+devnet/

Justfile

@@ -53,3 +53,84 @@ build *args='':
 # Generates all test fixtures for scripts in examples/exec-scripts
 gen fork_url:
   @just ./examples/exec-scripts/gen {{fork_url}}
+
+# Install the devnet
+install-devnet:
+  #!/bin/bash
+
+  if [ -d "./devnet" ]; then
+    exit 0
+  fi
+
+  git clone https://github.com/ethpandaops/optimism-package && mv optimism-package devnet
+
+  T8N_NETWORK_PARAMS=$(cat <<- "EOM"
+  optimism_package:
+    participants:
+      - el_type: op-geth
+        cl_type: op-node
+    network_params:
+      seconds_per_slot: 2
+      network_id: 1337
+  ethereum_package:
+    participants:
+      - el_type: reth
+        cl_type: lighthouse
+    network_params:
+      preset: minimal
+  EOM
+  )
+  printf "%s" "$T8N_NETWORK_PARAMS" > ./devnet/network_params.yaml
+
+# Start the devnet
+start-devnet:
+  #!/bin/bash
+
+  SCRIPT_DIR=$( pwd )
+  KURTOSIS_DIR="$SCRIPT_DIR/devnet"
+
+  # Exit if Kurtosis is already running
+  kurtosis enclave inspect devnet && exit 0
+
+  echo "Starting Kurtosis network..."
+  cd "$KURTOSIS_DIR" || exit 1
+  kurtosis clean -a
+  kurtosis run --enclave devnet . --args-file ./network_params.yaml
+
+  echo "Returning to opt8n..."
+  cd "$SCRIPT_DIR" || exit 1
+
+# Stop the devnet
+stop-devnet:
+  #!/bin/bash
+  kurtosis clean -a
+
+# Run t8n
+t8n *args='': install-devnet start-devnet
+  #!/bin/bash
+
+  SCRIPT_DIR=$( pwd )
+  T8N_PATH="$SCRIPT_DIR/target/release/opt8n"
+
+  echo "Building opt8n..."
+  cargo build --bin opt8n --release
+
+  # Download L2 genesis configs and contract addresses
+  echo "Downloading L2 genesis configs and contract addresses from devnet..."
+  kurtosis files download devnet op-genesis-configs
+
+  OPTIMISM_PORTAL_PROXY=$(jq -r .OptimismPortalProxy ./op-genesis-configs/kurtosis.json)
+  GENESIS="./op-genesis-configs/genesis.json"
+
+  L1_PORT=$(kurtosis enclave inspect devnet | grep 'el-1-reth-lighthouse' -A5 | grep " rpc:" | awk -F ' -> ' '{print $2}' | awk -F ':' '{print $2}' | tr -d ' \n\r')
+  L2_PORT=$(kurtosis enclave inspect devnet | grep 'op-el-1-op-geth-op-node' -A5 | grep " rpc:" | awk -F ' -> ' '{print $2}' | awk -F ':' '{print $3}' | tr -d ' \n\r')
+
+  $T8N_PATH \
+    --l1-port "$L1_PORT" \
+    --l2-port "$L2_PORT" \
+    -o "$OPTIMISM_PORTAL_PROXY" \
+    --l2-genesis "$GENESIS" \
+    $@
+
+  echo "Cleaning up genesis + configs..."
+  rm -rf ./op-genesis-configs

bin/opt8n/src/cli/state.rs

@@ -10,7 +10,6 @@ use alloy_provider::{
 };
 use color_eyre::eyre::{bail, eyre, Result};
 use hashbrown::HashMap;
-use kona_primitives::L1BlockInfoTx;
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use tracing::info;
@@ -44,7 +43,7 @@ impl<'a> StateCapture<'a> {
     /// ## Returns
     /// - `Ok(L1BlockInfoTx)` - Successfully captured the prestate / test block environment.
     /// - `Err(_)` - Error capturing prestate / test block environment.
-    pub(crate) async fn capture_state(&mut self) -> Result<(L1BlockInfoTx, Bytes)> {
+    pub(crate) async fn capture_state(&mut self) -> Result<Bytes> {
         // Set up the providers.
         let l2_rpc_url = format!("http://localhost:{}", self.cli.l2_port);
         let l2_provider: RootProvider<_, Ethereum> =
@@ -78,7 +77,7 @@ impl<'a> StateCapture<'a> {
 
         // Fetch the latest and parent block.
         let latest_block = l2_provider
-            .get_block_by_number(latest_block_number.into(), true)
+            .get_block_by_number(latest_block_number.into(), false)
             .await?
             .ok_or(eyre!("Latest block not found."))?;
         let parent_block = l2_provider
@@ -89,23 +88,20 @@ impl<'a> StateCapture<'a> {
         self.header = latest_block.header.try_into()?;
         self.pre_header = parent_block.header.try_into()?;
 
-        let BlockTransactions::Full(transactions) = latest_block.transactions else {
+        let BlockTransactions::Hashes(transactions) = latest_block.transactions else {
             bail!("Could not fetch L1 info transaction.")
         };
 
         let l1_info_tx = transactions
             .get(0)
             .ok_or(eyre!("L1 info transaction not present"))?;
-        let l1_info = L1BlockInfoTx::decode_calldata(l1_info_tx.input.as_ref())
-            .map_err(|e| eyre!("Error decoding L1 info tx: {e}"))?;
-
         let raw_tx = l2_provider
-            .raw_request::<[B256; 1], Bytes>("debug_getRawTransaction".into(), [l1_info_tx.hash])
+            .raw_request::<[B256; 1], Bytes>("debug_getRawTransaction".into(), [*l1_info_tx])
             .await?;
 
         info!(target: "state-capture", "Captured prestate / test block environment successfully.");
 
-        Ok((l1_info, raw_tx))
+        Ok(raw_tx)
     }
 }
 

bin/opt8n/src/cli/t8n.rs

@@ -4,7 +4,7 @@ use super::{deposits::DepositCapture, state::StateCapture, Cli};
 use crate::generator::STF;
 use alloy_genesis::Genesis;
 use alloy_primitives::Bytes;
-use color_eyre::{eyre::ensure, Result, owo_colors::OwoColorize};
+use color_eyre::{eyre::ensure, owo_colors::OwoColorize, Result};
 use futures::{future::BoxFuture, FutureExt};
 use inquire::Select;
 use std::{fmt::Display, path::PathBuf};
@@ -44,7 +44,7 @@ impl<'a> T8n<'a> {
             let options = [
                 MainMenuOption::SetupEnvironment,
                 MainMenuOption::CaptureDeposits,
-                MainMenuOption::ModifyBlock,
+                MainMenuOption::CaptureTransactions,
                 MainMenuOption::GenerateFixture,
                 MainMenuOption::Exit,
             ];
@@ -53,7 +53,7 @@ impl<'a> T8n<'a> {
             match choice {
                 MainMenuOption::SetupEnvironment => {
                     // Capture prestate and test block environment.
-                    let (_, l1_info_encoded) = self.state_cfg.capture_state().await?;
+                    let l1_info_encoded = self.state_cfg.capture_state().await?;
                     self.deposits.transactions.push(l1_info_encoded);
 
                     // Return to the main menu.
@@ -66,7 +66,7 @@ impl<'a> T8n<'a> {
                     // Return to the main menu.
                     self.run().await?;
                 }
-                MainMenuOption::ModifyBlock => {
+                MainMenuOption::CaptureTransactions => {
                     // Capture the transactions sent to the L2 node.
                     let transactions = crate::proxy::capture_transactions(
                         3000,
@@ -129,7 +129,7 @@ impl<'a> T8n<'a> {
 enum MainMenuOption {
     SetupEnvironment,
     CaptureDeposits,
-    ModifyBlock,
+    CaptureTransactions,
     GenerateFixture,
     Exit,
 }
@@ -142,7 +142,7 @@ impl Display for MainMenuOption {
                 "Setup environment (capture prestate and test block environment)"
             ),
             Self::CaptureDeposits => write!(f, "Set deposit transactions"),
-            Self::ModifyBlock => write!(f, "Set user-space transactions"),
+            Self::CaptureTransactions => write!(f, "Set user-space transactions"),
             Self::GenerateFixture => write!(f, "Generate execution fixture"),
             Self::Exit => write!(f, "Exit"),
         }

bin/opt8n/src/generator/evm_config.rs

@@ -0,0 +1 @@
+//! TODO: Custom EVM config.

bin/opt8n/src/generator/mod.rs

@@ -1,11 +1,12 @@
 //! The reference state transition function.
 
+use crate::cli::state::{DumpBlockResponse, GenesisAccountExt};
 use alloy_consensus::{constants::KECCAK_EMPTY, Header};
 use alloy_genesis::{Genesis, GenesisAccount};
 use alloy_primitives::B256;
 use alloy_rlp::{Decodable, Encodable};
 use alloy_trie::{HashBuilder, HashMap, Nibbles};
-use color_eyre::{eyre::eyre, Result};
+use color_eyre::{eyre::eyre, owo_colors::OwoColorize, Result};
 use itertools::Itertools;
 use kona_mpt::TrieAccount;
 use op_test_vectors::execution::{ExecutionEnvironment, ExecutionFixture, ExecutionResult};
@@ -22,8 +23,7 @@ use revm::{
     primitives::{AccountInfo, Bytecode},
 };
 use std::{collections::BTreeMap, sync::Arc};
-
-use crate::cli::state::{DumpBlockResponse, GenesisAccountExt};
+use tracing::info;
 
 /// The database for [STF].
 type STFDB = CacheDB<EmptyDBTyped<ProviderError>>;
@@ -159,12 +159,14 @@ impl STF {
             .collect::<Result<Vec<_>>>()?;
 
         // Execute the block.
+        info!(target: "stf", "Executing block with {} transactions...", txs.len().cyan());
         let block_with_senders = BlockWithSenders::new(block, senders)
             .ok_or(eyre!("Error creating block with senders"))?;
         let execution_input = BlockExecutionInput::new(&block_with_senders, header.difficulty);
         let BlockExecutionOutput {
             state, receipts, ..
         } = executor.execute(execution_input)?;
+        info!(target: "stf", "✅ Block successfully executed.");
 
         // Flush the bundle state updates to the in-memory database.
         let alloc_db = self.db.clone();
@@ -207,6 +209,13 @@ impl STF {
             .expect("Number is in range");
         let transactions_root = reth_primitives::proofs::calculate_transaction_root(&txs);
 
+        // Log the execution fixture results.
+        let ind = "~>".magenta().italic().to_string();
+        info!(target: "stf", "{} State root: {}", ind, root.cyan());
+        info!(target: "stf", "{} Transactions root: {}", ind, transactions_root.cyan());
+        info!(target: "stf", "{} Receipts root: {}", ind, receipts_root.cyan());
+        info!(target: "stf", "{} Logs bloom: {}", ind, logs_bloom.cyan());
+
         Ok(ExecutionFixture {
             env: ExecutionEnvironment {
                 current_coinbase: header.beneficiary,