Feat/support 4844

Cargo.toml

@@ -27,7 +27,8 @@ opt-level = 3
 # use optimized risc0 circuit
 revm = { git = "https://github.com/johntaiko/revm", branch = "feat/taiko" }
 revm-primitives = { git = "https://github.com/johntaiko/revm", branch = "feat/taiko" }
-
+ethers-core = {git = "https://github.com/smtmfft/ethers-rs", branch = "ethers-core-2.0.10"}
+ethers-providers = {git = "https://github.com/smtmfft/ethers-rs", branch = "ethers-core-2.0.10"}
 
 [workspace.dependencies]
 bonsai-sdk = "0.4"

lib/Cargo.toml

@@ -6,6 +6,8 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0"
 alloy-sol-types = { version = "0.4", optional = true }
+reth-primitives = {git = "https://github.com/paradigmxyz/reth.git", branch = "main", features = ["c-kzg"]}
+# reth = {git = "https://github.com/paradigmxyz/reth.git", branch = "main"}
 ethers-core = { version = "2.0", features = ["optimism"] }
 hashbrown = { workspace = true }
 once_cell = "1.18"
@@ -17,6 +19,10 @@ zeth-primitives = { path = "../primitives", features = ["revm"] }
 hex = "0.4.3"
 rlp = "0.5.2"
 tracing = "0.1"
+reqwest = "0.11.22"
+sha2 = "0.10.8"
+proptest = "1.4.0"
+c-kzg = "0.4.0"
 
 [target.'cfg(not(target_os = "zkvm"))'.dependencies]
 chrono = { version = "0.4", default-features = false }

lib/src/consts.rs

@@ -63,9 +63,7 @@ pub static ETH_MAINNET_CHAIN_SPEC: Lazy<ChainSpec> = Lazy::new(|| {
             elasticity_multiplier: uint!(2_U256),
         },
         l1_contract: None,
-        l1_signal_service: None,
         l2_contract: None,
-        l2_signal_service: None,
     }
 });
 
@@ -86,9 +84,7 @@ macro_rules! taiko_chain_spec {
                     elasticity_multiplier: uint!(2_U256),
                 },
                 l1_contract: Some(*L1_CONTRACT),
-                l1_signal_service: Some(*L1_SIGNAL_SERVICE),
                 l2_contract: Some(*L2_CONTRACT),
-                l2_signal_service: Some(*L2_SIGNAL_SERVICE),
             }
         });
     };
@@ -118,9 +114,7 @@ pub static OP_MAINNET_CHAIN_SPEC: Lazy<ChainSpec> = Lazy::new(|| ChainSpec {
         elasticity_multiplier: uint!(6_U256),
     },
     l1_contract: None,
-    l1_signal_service: None,
     l2_contract: None,
-    l2_signal_service: None,
 });
 
 /// The condition at which a fork is activated.
@@ -170,9 +164,7 @@ pub struct ChainSpec {
     hard_forks: BTreeMap<SpecId, ForkCondition>,
     eip_1559_constants: Eip1559Constants,
     pub l1_contract: Option<Address>,
-    pub l1_signal_service: Option<Address>,
     pub l2_contract: Option<Address>,
-    pub l2_signal_service: Option<Address>,
 }
 
 impl ChainSpec {
@@ -187,9 +179,7 @@ impl ChainSpec {
             hard_forks: BTreeMap::from([(spec_id, ForkCondition::Block(0))]),
             eip_1559_constants,
             l1_contract: None,
-            l1_signal_service: None,
             l2_contract: None,
-            l2_signal_service: None,
         }
     }
     /// Returns the network chain ID.

lib/src/execution/ethereum.rs

@@ -293,6 +293,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();
+        }
     };
 }
 

lib/src/taiko/execute.rs

@@ -364,6 +364,22 @@ pub fn fill_eth_tx_env(
             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();
+        }
     };
 }