feat: BeginTx and EndTx support taiko's 1559

.gitignore

@@ -4,3 +4,8 @@
 .vscode
 .idea
 /generated
+*.srs
+*.log
+*.json
+*.yul
+*.sol

Cargo.toml

@@ -10,7 +10,8 @@ members = [
     "eth-types",
     "external-tracer",
     "mock",
-    "testool"
+    "taiko-mock",
+    "testool",
 ]
 
 [patch.crates-io]

bus-mapping/Cargo.toml

@@ -10,6 +10,7 @@ eth-types = { path = "../eth-types" }
 gadgets = { path = "../gadgets" }
 keccak256 = { path = "../keccak256" }
 mock = { path = "../mock", optional = true }
+taiko-mock = { path = "../taiko-mock", optional = true }
 
 ethers-core = "=2.0.0"
 ethers-providers = "=2.0.0"

bus-mapping/src/circuit_input_builder.rs

@@ -6,6 +6,7 @@ mod block;
 mod call;
 mod execution;
 mod input_state_ref;
+mod protocol_instance;
 #[cfg(test)]
 mod tracer_tests;
 mod transaction;
@@ -34,6 +35,7 @@ pub use execution::{
 pub use input_state_ref::CircuitInputStateRef;
 use itertools::Itertools;
 use log::warn;
+pub use protocol_instance::{left_shift, MetaHash, ProtocolInstance, ANCHOR_TX_METHOD_SIGNATURE};
 use std::collections::HashMap;
 pub use transaction::{Transaction, TransactionContext};
 
@@ -409,6 +411,7 @@ pub struct BuilderClient<P: JsonRpcClient> {
     cli: GethClient<P>,
     chain_id: Word,
     circuits_params: CircuitsParams,
+    protocol_instance: ProtocolInstance,
 }
 
 /// Get State Accesses from TxExecTraces
@@ -468,13 +471,15 @@ impl<P: JsonRpcClient> BuilderClient<P> {
     pub async fn new(
         client: GethClient<P>,
         circuits_params: CircuitsParams,
+        protocol_instance: ProtocolInstance,
     ) -> Result<Self, Error> {
         let chain_id = client.get_chain_id().await?;
 
         Ok(Self {
             cli: client,
             chain_id: chain_id.into(),
             circuits_params,
+            protocol_instance,
         })
     }
 
@@ -615,6 +620,7 @@ impl<P: JsonRpcClient> BuilderClient<P> {
             prev_state_root,
             eth_block,
             self.circuits_params,
+            self.protocol_instance.clone(),
         )?;
         let mut builder = CircuitInputBuilder::new(sdb, code_db, block);
         builder.handle_block_with_anchor(eth_block, geth_traces, has_anchor_tx)?;

bus-mapping/src/circuit_input_builder/block.rs

@@ -2,6 +2,7 @@
 
 use super::{
     execution::ExecState, transaction::Transaction, CircuitsParams, CopyEvent, ExecStep, ExpEvent,
+    ProtocolInstance,
 };
 use crate::{
     operation::{OperationContainer, RWCounter},
@@ -90,6 +91,8 @@ pub struct Block {
     pub circuits_params: CircuitsParams,
     /// Original block from geth
     pub eth_block: eth_types::Block<eth_types::Transaction>,
+    /// Protocol instance from protocol
+    pub protocol_instance: ProtocolInstance,
 }
 
 impl Block {
@@ -100,6 +103,7 @@ impl Block {
         prev_state_root: Word,
         eth_block: &eth_types::Block<eth_types::Transaction>,
         circuits_params: CircuitsParams,
+        protocol_instance: ProtocolInstance,
     ) -> Result<Self, Error> {
         if eth_block.base_fee_per_gas.is_none() {
             // FIXME: resolve this once we have proper EIP-1559 support
@@ -141,6 +145,7 @@ impl Block {
             sha3_inputs: Vec::new(),
             circuits_params,
             eth_block: eth_block.clone(),
+            protocol_instance,
         })
     }
 

bus-mapping/src/circuit_input_builder/input_state_ref.rs

@@ -309,10 +309,11 @@ impl<'a> CircuitInputStateRef<'a> {
             && (matches!(rw, RW::READ) || (op.value_prev.is_zero() && op.value.is_zero())))
             && account.is_empty()
         {
-            panic!(
-                "RWTable Account field {:?} lookup to non-existing account rwc: {}, op: {:?}",
-                rw, self.block_ctx.rwc.0, op
-            );
+
+            // panic!(
+            //     "RWTable Account field {:?} lookup to non-existing account rwc: {}, op: {:?}",
+            //     rw, self.block_ctx.rwc.0, op
+            // );
         }
         // -- sanity check end --
         // Perform the write to the account in the StateDB
@@ -474,29 +475,21 @@ impl<'a> CircuitInputStateRef<'a> {
         must_create: bool,
         value: Word,
         fee: Option<Word>,
-        is_anchor_tx: bool,
     ) -> Result<(), Error> {
         let (found, sender_account) = self.sdb.get_account(&sender);
         if !found {
             return Err(Error::AccountNotFound(sender));
         }
         let mut sender_balance_prev = sender_account.balance;
-        if !is_anchor_tx {
-            debug_assert!(
-                sender_account.balance >= value + fee.unwrap_or_default(),
-                "invalid amount balance {:?} value {:?} fee {:?}",
-                sender_balance_prev,
-                value,
-                fee
-            );
-        }
+        debug_assert!(
+            sender_account.balance >= value + fee.unwrap_or_default(),
+            "invalid amount balance {:?} value {:?} fee {:?}",
+            sender_balance_prev,
+            value,
+            fee
+        );
         if let Some(fee) = fee {
-            let sender_balance = if is_anchor_tx {
-                // anchor tx doesn't need fee
-                sender_balance_prev
-            } else {
-                sender_balance_prev - fee
-            };
+            let sender_balance = sender_balance_prev - fee;
             log::trace!(
                 "sender balance update with fee (not reversible): {:?} {:?}->{:?}",
                 sender,
@@ -583,7 +576,6 @@ impl<'a> CircuitInputStateRef<'a> {
             must_create,
             value,
             None,
-            false,
         )
     }
 

zkevm-circuits/src/witness/protocol_instance.rs → bus-mapping/src/circuit_input_builder/protocol_instance.rs

@@ -2,13 +2,11 @@
 
 use std::iter;
 
-use crate::{table::PiFieldTag, util::rlc_be_bytes};
-use eth_types::{Address, Bytes, Field, Hash, ToBigEndian, ToWord, Word, H256};
-use halo2_proofs::circuit::Value;
+use eth_types::{Address, Bytes, Hash, ToBigEndian, ToWord, Word, H256};
 use keccak256::plain::Keccak;
 
-// hash(anchor)
-const ANCHOR_TX_METHOD_SIGNATURE: u32 = 0xda69d3db;
+/// hash(anchor)
+pub const ANCHOR_TX_METHOD_SIGNATURE: u32 = 0xda69d3db;
 
 /// Taiko witness
 #[derive(Debug, Default, Clone)]
@@ -129,42 +127,6 @@ impl ProtocolInstance {
         result.extend_from_slice(&(self.parent_gas_used as u64).to_word().to_be_bytes());
         result.into()
     }
-
-    /// Assignments for pi table
-    pub fn table_assignments<F: Field>(&self, randomness: Value<F>) -> [[Value<F>; 2]; 6] {
-        [
-            [
-                Value::known(F::from(PiFieldTag::Null as u64)),
-                Value::known(F::ZERO),
-            ],
-            [
-                Value::known(F::from(PiFieldTag::MethodSign as u64)),
-                Value::known(F::from(ANCHOR_TX_METHOD_SIGNATURE as u64)),
-            ],
-            [
-                Value::known(F::from(PiFieldTag::L1Hash as u64)),
-                rlc_be_bytes(&self.meta_hash.l1_hash.to_fixed_bytes(), randomness),
-            ],
-            [
-                Value::known(F::from(PiFieldTag::L1SignalRoot as u64)),
-                rlc_be_bytes(&self.signal_root.to_fixed_bytes(), randomness),
-            ],
-            [
-                Value::known(F::from(PiFieldTag::L1Height as u64)),
-                rlc_be_bytes(
-                    &self.meta_hash.l1_height.to_word().to_be_bytes(),
-                    randomness,
-                ),
-            ],
-            [
-                Value::known(F::from(PiFieldTag::ParentGasUsed as u64)),
-                rlc_be_bytes(
-                    &(self.parent_gas_used as u64).to_word().to_be_bytes(),
-                    randomness,
-                ),
-            ],
-        ]
-    }
 }
 
 #[cfg(test)]

bus-mapping/src/evm/opcodes/begin_end_tx.rs

@@ -107,7 +107,6 @@ fn gen_begin_tx_steps(state: &mut CircuitInputStateRef) -> Result<ExecStep, Erro
         call.is_create(),
         call.value,
         Some(state.tx.tx.gas_price * state.tx.gas()),
-        state.tx_ctx.is_anchor_tx(),
     )?;
 
     // In case of contract creation we wish to verify the correctness of the
@@ -265,7 +264,13 @@ fn gen_end_tx_steps(state: &mut CircuitInputStateRef) -> Result<ExecStep, Error>
         caller_balance_prev,
     )?;
 
-    let effective_tip = state.tx.tx.gas_price - state.block.base_fee;
+    let base_fee = if state.tx_ctx.is_anchor_tx() {
+        0.into()
+    } else {
+        state.block.base_fee
+    };
+
+    let effective_tip = state.tx.tx.gas_price - base_fee;
     let (found, coinbase_account) = state.sdb.get_account(&state.block.coinbase);
     if !found {
         return Err(Error::AccountNotFound(state.block.coinbase));
@@ -281,6 +286,26 @@ fn gen_end_tx_steps(state: &mut CircuitInputStateRef) -> Result<ExecStep, Error>
         coinbase_balance_prev,
     )?;
 
+    // add treasury account
+    let (found, treasury_account) = state
+        .sdb
+        .get_account(&state.block.protocol_instance.meta_hash.treasury);
+    if !found {
+        return Err(Error::AccountNotFound(
+            state.block.protocol_instance.meta_hash.treasury,
+        ));
+    }
+    let treasury_balance_prev = treasury_account.balance;
+    let treasury_balance =
+        treasury_balance_prev + base_fee * (state.tx.gas() - exec_step.gas_left.0);
+    state.account_write(
+        &mut exec_step,
+        state.block.protocol_instance.meta_hash.treasury,
+        AccountField::Balance,
+        treasury_balance,
+        treasury_balance_prev,
+    )?;
+
     // handle tx receipt tag
     state.tx_receipt_write(
         &mut exec_step,

bus-mapping/src/mock.rs

@@ -40,6 +40,7 @@ impl BlockData {
                 Word::default(),
                 &self.eth_block,
                 self.circuits_params,
+                Default::default(),
             )
             .unwrap(),
         )

eth-types/src/geth_types.rs

@@ -158,8 +158,8 @@ impl From<&Transaction> for crate::Transaction {
             gas: tx.gas_limit.to_word(),
             value: tx.value,
             gas_price: Some(tx.gas_price),
-            max_priority_fee_per_gas: Some(tx.gas_fee_cap),
-            max_fee_per_gas: Some(tx.gas_tip_cap),
+            max_priority_fee_per_gas: Some(tx.gas_tip_cap),
+            max_fee_per_gas: Some(tx.gas_fee_cap),
             input: tx.call_data.clone(),
             access_list: tx.access_list.clone(),
             v: tx.v.into(),
@@ -179,8 +179,8 @@ impl From<&crate::Transaction> for Transaction {
             gas_limit: tx.gas.as_u64().into(),
             value: tx.value,
             gas_price: tx.gas_price.unwrap_or_default(),
-            gas_fee_cap: tx.max_priority_fee_per_gas.unwrap_or_default(),
-            gas_tip_cap: tx.max_fee_per_gas.unwrap_or_default(),
+            gas_tip_cap: tx.max_priority_fee_per_gas.unwrap_or_default(),
+            gas_fee_cap: tx.max_fee_per_gas.unwrap_or_default(),
             call_data: tx.input.clone(),
             access_list: tx.access_list.clone(),
             v: tx.v.as_u64(),

external-tracer/src/lib.rs

@@ -23,6 +23,10 @@ pub struct TraceConfig {
     pub transactions: Vec<Transaction>,
     /// logger
     pub logger_config: LoggerConfig,
+    /// taiko
+    pub taiko: bool,
+    /// treasury
+    pub treasury: Address,
 }
 
 /// Configuration structure for `logger.Config`