add 4844 tx wip

CeciliaZ030 · CeciliaZ030 · commit 4e98d96d6dd9 · 2024-02-20T13:19:46.000+08:00
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -24,25 +24,34 @@ hex = { version = "0.4.3", optional = true}
 rlp = { version = "0.5.2", optional = true}
 tracing = { version = "0.1", optional = true}
 
-[target.'cfg(not(target_os = "zkvm"))'.dependencies]
-thiserror = "1.0"
-anyhow = "1.0"
-chrono = { version = "0.4", default-features = false }
-ethers-providers = { version = "2.0", features = ["optimism"] }
-flate2 = "1.0.26"
-log = "0.4"
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-serde_with = "3.0"
-tokio = { version = "1.23", features = ["full"] }
-zeth-primitives = { path = "../primitives", features = ["revm", "ethers"] }
+# [target.'cfg(not(target_os = "zkvm"))'.dependencies]
+# thiserror = "1.0"
+# anyhow = "1.0"
+chrono = { version = "0.4", default-features = false, optional = true}
+ethers-providers = { version = "2.0", features = ["optimism"], optional = true}
+flate2 = { version = "1.0.26", optional = true}
+log = { version = "0.4", optional = true}
+serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true}
+serde_with = {version = "3.0", optional =  true}
+tokio = { version = "1.23", features = ["full"], optional = true}
+# zeth-primitives = { path = "../primitives", features = ["revm", "ethers"] }
 
 [dev-dependencies]
 bincode = "1.3"
 serde_with = "3.1"
 
 [features]
 # default = ["taiko", "std"]
-std = []
+std = [
+  "dep:chrono",
+  "dep:ethers-providers",
+  "dep:flate2",
+  "dep:log",
+  "dep:serde_json",
+  "dep:serde_with",
+  "dep:tokio",
+  "zeth-primitives/ethers",  "zeth-primitives/std"
+]
 taiko = [
     "zeth-primitives/taiko", 
     "revm/taiko",
@@ -51,4 +60,9 @@ taiko = [
     "dep:rlp",
     "dep:tracing"
     ]
-optimism = ["std", "revm/optimism",  "dep:alloy-sol-types"]
+optimism = [
+  "std", 
+  "zeth-primitives/optimism", 
+  "revm/optimism",  
+  "dep:alloy-sol-types"
+  ]
diff --git a/lib/src/builder/execute/ethereum.rs b/lib/src/builder/execute/ethereum.rs
@@ -15,7 +15,7 @@ use alloc::format;
 use core::{fmt::Debug, mem::take};
 
 use anyhow::{anyhow, bail, Context};
-#[cfg(not(target_os = "zkvm"))]
+#[cfg(feature = "std")]
 use log::debug;
 use revm::{
     interpreter::Host,
@@ -59,7 +59,7 @@ impl TxExecStrategy<EthereumTxEssence> for EthTxExecStrategy {
             bail!("Invalid protocol version: expected >= {MIN_SPEC_ID:?}, got {spec_id:?}");
         }
 
-        #[cfg(not(target_os = "zkvm"))]
+        #[cfg(feature = "std")]
         {
             use chrono::{TimeZone, Utc};
             use log::info;
@@ -123,7 +123,7 @@ impl TxExecStrategy<EthereumTxEssence> for EthTxExecStrategy {
                 .recover_from()
                 .with_context(|| format!("Error recovering address for transaction {tx_no}"))?;
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             {
                 let tx_hash = tx.hash();
                 debug!("Tx no. {tx_no} (hash: {tx_hash})");
@@ -147,7 +147,7 @@ impl TxExecStrategy<EthereumTxEssence> for EthTxExecStrategy {
             let gas_used = result.gas_used().try_into().unwrap();
             cumulative_gas_used = cumulative_gas_used.checked_add(gas_used).unwrap();
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             debug!("  Ok: {result:?}");
 
             // create the receipt from the EVM result
@@ -173,7 +173,7 @@ impl TxExecStrategy<EthereumTxEssence> for EthTxExecStrategy {
                 .context("failed to insert receipt")?;
 
             // update account states
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             for (address, account) in &state {
                 if account.is_touched() {
                     // log account
@@ -215,7 +215,7 @@ impl TxExecStrategy<EthereumTxEssence> for EthTxExecStrategy {
                 .checked_mul(withdrawal.amount.try_into().unwrap())
                 .unwrap();
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             {
                 debug!("Withdrawal no. {}", withdrawal.index);
                 debug!("  Recipient: {:?}", withdrawal.address);
@@ -294,6 +294,22 @@ pub fn fill_eth_tx_env(tx_env: &mut TxEnv, essence: &EthereumTxEssence, caller:
             tx_env.nonce = Some(tx.nonce);
             tx_env.access_list = tx.access_list.clone().into();
         }
+        EthereumTxEssence::Eip4844(tx) => {
+            tx_env.caller = caller;
+            tx_env.gas_limit = tx.gas_limit.try_into().unwrap();
+            tx_env.gas_price = tx.max_fee_per_gas;
+            tx_env.gas_priority_fee = Some(tx.max_priority_fee_per_gas);
+            tx_env.transact_to = if let TransactionKind::Call(to_addr) = tx.to {
+                TransactTo::Call(to_addr)
+            } else {
+                TransactTo::create()
+            };
+            tx_env.value = tx.value;
+            tx_env.data = tx.data.clone();
+            tx_env.chain_id = Some(tx.chain_id);
+            tx_env.nonce = Some(tx.nonce);
+            tx_env.access_list = tx.access_list.clone().into();
+        }
     };
 }
 
diff --git a/lib/src/builder/execute/optimism.rs b/lib/src/builder/execute/optimism.rs
@@ -15,7 +15,7 @@ use alloc::{format, vec, vec::Vec};
 use core::{fmt::Debug, mem::take, str::FromStr};
 
 use anyhow::{anyhow, bail, Context, Result};
-#[cfg(not(target_os = "zkvm"))]
+#[cfg(feature = "std")]
 use log::debug;
 use revm::{
     interpreter::Host,
@@ -62,7 +62,7 @@ impl TxExecStrategy<OptimismTxEssence> for OpTxExecStrategy {
         }
         let chain_id = block_builder.chain_spec.chain_id();
 
-        #[cfg(not(target_os = "zkvm"))]
+        #[cfg(feature = "std")]
         {
             use chrono::{TimeZone, Utc};
             use log::info;
@@ -125,7 +125,7 @@ impl TxExecStrategy<OptimismTxEssence> for OpTxExecStrategy {
                 .recover_from()
                 .with_context(|| format!("Error recovering address for transaction {tx_no}"))?;
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             {
                 let tx_hash = tx.hash();
                 debug!("Tx no. {tx_no} (hash: {tx_hash})");
@@ -142,7 +142,7 @@ impl TxExecStrategy<OptimismTxEssence> for OpTxExecStrategy {
 
             match &tx.essence {
                 OptimismTxEssence::OptimismDeposited(deposit) => {
-                    #[cfg(not(target_os = "zkvm"))]
+                    #[cfg(feature = "std")]
                     {
                         debug!("  Source: {:?}", &deposit.source_hash);
                         debug!("  Mint: {:?}", &deposit.mint);
@@ -165,7 +165,7 @@ impl TxExecStrategy<OptimismTxEssence> for OpTxExecStrategy {
             let gas_used = result.gas_used().try_into().unwrap();
             cumulative_gas_used = cumulative_gas_used.checked_add(gas_used).unwrap();
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             debug!("  Ok: {result:?}");
 
             // create the receipt from the EVM result
@@ -177,7 +177,7 @@ impl TxExecStrategy<OptimismTxEssence> for OpTxExecStrategy {
             );
 
             // update account states
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             for (address, account) in &state {
                 if account.is_touched() {
                     // log account
diff --git a/lib/src/builder/execute/taiko.rs b/lib/src/builder/execute/taiko.rs
@@ -15,7 +15,7 @@
 use core::{fmt::Debug, mem::take, str::from_utf8};
 
 use anyhow::{anyhow, bail, Context, Result};
-#[cfg(not(target_os = "zkvm"))]
+#[cfg(feature = "std")]
 use log::debug;
 use revm::{
     interpreter::Host,
@@ -61,7 +61,7 @@ impl TxExecStrategy<EthereumTxEssence> for TkoTxExecStrategy {
         }
         let chain_id = block_builder.chain_spec.chain_id();
 
-        #[cfg(not(target_os = "zkvm"))]
+        #[cfg(feature = "std")]
         {
             use chrono::{TimeZone, Utc};
             use log::info;
@@ -129,7 +129,7 @@ impl TxExecStrategy<EthereumTxEssence> for TkoTxExecStrategy {
                 .recover_from()
                 .with_context(|| anyhow!("Error recovering address for transaction {tx_no}"))?;
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             {
                 let tx_hash = tx.hash();
                 debug!("Tx no. {tx_no} (hash: {tx_hash})");
@@ -167,7 +167,7 @@ impl TxExecStrategy<EthereumTxEssence> for TkoTxExecStrategy {
             let gas_used = result.gas_used().try_into().unwrap();
             cumulative_gas_used = cumulative_gas_used.checked_add(gas_used).unwrap();
 
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             debug!("  Ok: {result:?}");
 
             // create the receipt from the EVM result
@@ -179,7 +179,7 @@ impl TxExecStrategy<EthereumTxEssence> for TkoTxExecStrategy {
             );
 
             // update account states
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             for (address, account) in &state {
                 if account.is_touched() {
                     // log account
diff --git a/lib/src/host/preflight.rs b/lib/src/host/preflight.rs
@@ -61,7 +61,7 @@ pub trait Preflight<E: TxEssence> {
     ) -> Result<Data<E>>;
 }
 
-#[cfg(not(feature = "taiko"))]
+// #[cfg(not(feature = "taiko"))]
 /// Implements the [Preflight] trait for all compatible [BlockBuilderStrategy]s.
 impl<N: BlockBuilderStrategy> Preflight<N::TxEssence> for N
 where
diff --git a/lib/src/optimism/batcher.rs b/lib/src/optimism/batcher.rs
@@ -202,7 +202,7 @@ impl Batcher {
         // Read batches
         while let Some(batches) = self.batcher_channel.read_batches() {
             batches.into_iter().for_each(|batch| {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!(
                     "received batch: timestamp={}, parent_hash={}, epoch={}",
                     batch.essence.timestamp,
@@ -316,7 +316,7 @@ impl Batcher {
         // "batch.timestamp < next_timestamp -> drop"
         match batch.essence.timestamp.cmp(&next_timestamp) {
             Ordering::Greater => {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!(
                     "Future batch: {} = batch.timestamp > next_timestamp = {}",
                     &batch.essence.timestamp,
@@ -325,7 +325,7 @@ impl Batcher {
                 return BatchStatus::Future;
             }
             Ordering::Less => {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!(
                     "Batch too old: {} = batch.timestamp < next_timestamp = {}",
                     &batch.essence.timestamp,
@@ -339,7 +339,7 @@ impl Batcher {
         // From the spec:
         // "batch.parent_hash != safe_l2_head.hash -> drop"
         if batch.essence.parent_hash != safe_l2_head.hash {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Incorrect parent hash: {} != {}",
                 batch.essence.parent_hash,
@@ -351,7 +351,7 @@ impl Batcher {
         // From the spec:
         // "batch.epoch_num + sequence_window_size < inclusion_block_number -> drop"
         if batch.essence.epoch_num + self.config.seq_window_size < batch.inclusion_block_number {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Batch is not timely: {} + {} < {}",
                 batch.essence.epoch_num,
@@ -364,7 +364,7 @@ impl Batcher {
         // From the spec:
         // "batch.epoch_num < epoch.number -> drop"
         if batch.essence.epoch_num < epoch.number {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Batch epoch number is too low: {} < {}",
                 batch.essence.epoch_num,
@@ -388,7 +388,7 @@ impl Batcher {
             // From the spec:
             // "batch.epoch_num > epoch.number+1 -> drop"
             _ => {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!(
                     "Batch epoch number is too large: {} > {}",
                     batch.essence.epoch_num,
@@ -401,7 +401,7 @@ impl Batcher {
         // From the spec:
         // "batch.epoch_hash != batch_origin.hash -> drop"
         if batch.essence.epoch_hash != batch_origin.hash {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Epoch hash mismatch: {} != {}",
                 batch.essence.epoch_hash,
@@ -413,7 +413,7 @@ impl Batcher {
         // From the spec:
         // "batch.timestamp < batch_origin.time -> drop"
         if batch.essence.timestamp < batch_origin.timestamp {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Batch violates timestamp rule: {} < {}",
                 batch.essence.timestamp,
@@ -426,7 +426,7 @@ impl Batcher {
         // "batch.timestamp > batch_origin.time + max_sequencer_drift: enforce the L2 timestamp
         //  drift rule, but with exceptions to preserve above min L2 timestamp invariant:"
         if batch.essence.timestamp > batch_origin.timestamp + self.config.max_seq_drift {
-            #[cfg(not(target_os = "zkvm"))]
+            #[cfg(feature = "std")]
             log::debug!(
                 "Sequencer drift detected: {} > {} + {}",
                 batch.essence.timestamp,
@@ -437,7 +437,7 @@ impl Batcher {
             // From the spec:
             // "len(batch.transactions) > 0: -> drop"
             if !batch.essence.transactions.is_empty() {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!("Sequencer drift detected for non-empty batch; drop.");
                 return BatchStatus::Drop;
             }
@@ -450,15 +450,15 @@ impl Batcher {
                 let Some(next_epoch) = next_epoch else {
                     // From the spec:
                     // "If next_epoch is not known -> undecided"
-                    #[cfg(not(target_os = "zkvm"))]
+                    #[cfg(feature = "std")]
                     log::debug!("Sequencer drift detected, but next epoch is not known; undecided");
                     return BatchStatus::Undecided;
                 };
 
                 // From the spec:
                 // "If batch.timestamp >= next_epoch.time -> drop"
                 if batch.essence.timestamp >= next_epoch.timestamp {
-                    #[cfg(not(target_os = "zkvm"))]
+                    #[cfg(feature = "std")]
                     log::debug!("Sequencer drift detected; drop; batch timestamp is too far into the future. {} >= {}", batch.essence.timestamp, next_epoch.timestamp);
                     return BatchStatus::Drop;
                 }
@@ -472,7 +472,7 @@ impl Batcher {
         //    any deposited transactions (identified by the transaction type prefix byte)"
         for tx in &batch.essence.transactions {
             if matches!(tx.first(), None | Some(&OPTIMISM_DEPOSITED_TX_TYPE)) {
-                #[cfg(not(target_os = "zkvm"))]
+                #[cfg(feature = "std")]
                 log::debug!("Batch contains empty or invalid transaction");
                 return BatchStatus::Drop;
             }
diff --git a/lib/src/optimism/batcher_channel.rs b/lib/src/optimism/batcher_channel.rs
diff --git a/lib/src/optimism/mod.rs b/lib/src/optimism/mod.rs
diff --git a/lib/src/optimism/system_config.rs b/lib/src/optimism/system_config.rs

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ pub trait Preflight<E: TxEssence> {`
`61`	`61`	`) -> Result<Data<E>>;`
`62`	`62`	`}`
`63`	`63`
`64`		`-#[cfg(not(feature = "taiko"))]`
	`64`	`+// #[cfg(not(feature = "taiko"))]`
`65`	`65`	`/// Implements the [Preflight] trait for all compatible [BlockBuilderStrategy]s.`
`66`	`66`	`impl<N: BlockBuilderStrategy> Preflight<N::TxEssence> for N`
`67`	`67`	`where`