clean some outdated feature flag (#437)

* clean some outdated feature flag

* fmt

* fix circuit degree

Author: lispc

Cargo.toml

@@ -25,8 +25,7 @@ debug-assertions = false
 overflow-checks = false
 rpath = false
 lto = "thin"
-incremental = false
-codegen-units = 1
+incremental = true
 
 [profile.release]
 opt-level = 3

rustfmt.toml

@@ -4,6 +4,6 @@ comment_width = 100
 imports_granularity = "Crate"
 max_width = 100
 newline_style = "Unix"
-normalize_comments = true
+#normalize_comments = true
 reorder_imports = true
-wrap_comments = true
+wrap_comments = true

zkevm-circuits/Cargo.toml

@@ -58,13 +58,12 @@ serde_json = "1.0.78"
 
 [features]
 default = ["test", "test-circuits", "enable-sign-verify"]
+scroll = ["bus-mapping/scroll", "zktrie", "enable-sign-verify", "reject-eip2718", "poseidon-codehash"]
 test = ["ethers-signers", "mock"]
 test-circuits = []
 warn-unimplemented = ["eth-types/warn-unimplemented"]
-onephase = []
+onephase = [] # debug only
 zktrie = []
 enable-sign-verify = []
-codehash = []
 reject-eip2718 = []
 poseidon-codehash = []
-scroll = ["bus-mapping/scroll"]

zkevm-circuits/src/bytecode_circuit/circuit.rs

@@ -378,7 +378,6 @@ impl<F: Field> SubCircuitConfig<F> for BytecodeCircuitConfig<F> {
                 is_byte_to_header(meta),
             ]))
         });
-        #[cfg(feature = "codehash")]
         meta.lookup_any(
             "keccak256_table_lookup(cur.value_rlc, cur.length, cur.hash)",
             |meta| {
@@ -476,6 +475,9 @@ impl<F: Field> BytecodeCircuitConfig<F> {
                     )?;
                     return Ok(());
                 }
+                // annotate columns
+                self.annotate_circuit(&mut region);
+
                 let mut offset = 0;
                 for bytecode in witness.iter() {
                     self.assign_bytecode(
@@ -577,21 +579,22 @@ impl<F: Field> BytecodeCircuitConfig<F> {
                     length,
                     F::from(push_data_size as u64),
                 )?;
-
-                // trace!(
-                // "bytecode.set_row({}): last:{} h:{:?} t:{:?} i:{:?} c:{:?} v:{:?} pdl:{} rlc:{:?}
-                // l:{:?} pds:{:?}", offset,
-                // offset == last_row_offset,
-                // code_hash,
-                // row.tag.get_lower_32(),
-                // row.index.get_lower_32(),
-                // row.is_code.get_lower_32(),
-                // row.value.get_lower_32(),
-                // push_data_left,
-                // value_rlc,
-                // length.get_lower_32(),
-                // push_data_size
-                // );
+                /*
+                trace!(
+                    "bytecode.set_row({}): last:{} h:{:?} t:{:?} i:{:?} c:{:?} v:{:?} pdl:{} rlc:{:?} l:{:?} pds:{:?}",
+                    offset,
+                    offset == last_row_offset,
+                    code_hash,
+                    row.tag.get_lower_32(),
+                    row.index.get_lower_32(),
+                    row.is_code.get_lower_32(),
+                    row.value.get_lower_32(),
+                    push_data_left,
+                    value_rlc,
+                    length.get_lower_32(),
+                    push_data_size
+                );
+                */
 
                 *offset += 1;
                 push_data_left = next_push_data_left
@@ -1040,7 +1043,6 @@ mod tests {
     }
 
     /// Test invalid code_hash data
-    #[cfg(feature = "codehash")]
     #[test]
     fn bytecode_invalid_hash_data() {
         let k = 9;
@@ -1085,7 +1087,6 @@ mod tests {
 
     /// Test invalid byte data
 
-    #[cfg(feature = "codehash")]
     #[test]
     fn bytecode_invalid_byte_data() {
         let k = 9;

zkevm-circuits/src/bytecode_circuit/circuit/to_poseidon_hash.rs

@@ -287,17 +287,14 @@ impl<F: Field, const BYTES_IN_FIELD: usize> ToHashBlockCircuitConfig<F, BYTES_IN
         // ]))
         // });
 
-        #[cfg(feature = "codehash")]
         let lookup_columns = [/* code_hash, */ field_input, control_length];
-        #[cfg(feature = "codehash")]
         let pick_hash_tbl_cols = |inp_i: usize| {
             let cols =
                 <PoseidonTable as crate::table::LookupTable<F>>::advice_columns(&poseidon_table);
             [/* cols[0], */ cols[inp_i + 1], cols[cols.len() - 2]]
         };
 
         // we use a special selection exp for only 2 indexs
-        #[cfg(feature = "codehash")]
         let field_selector = |meta: &mut VirtualCells<F>| {
             let field_index = meta.query_advice(field_index, Rotation::cur()) - 1.expr();
             [1.expr() - field_index.clone(), field_index]
@@ -308,7 +305,6 @@ impl<F: Field, const BYTES_IN_FIELD: usize> ToHashBlockCircuitConfig<F, BYTES_IN
         //  * PoseidonTable::INPUT_WIDTH -1 lookups for the padded zero input
         //  so we have 2*PoseidonTable::INPUT_WIDTH -1 lookups
 
-        #[cfg(feature = "codehash")]
         for i in 0..PoseidonTable::INPUT_WIDTH {
             meta.lookup_any("poseidon input", |meta| {
                 // Conditions:
@@ -333,7 +329,6 @@ impl<F: Field, const BYTES_IN_FIELD: usize> ToHashBlockCircuitConfig<F, BYTES_IN
         }
 
         // the canonical form should be `for i in 1..PoseidonTable::INPUT_WIDTH{...}`
-        #[cfg(feature = "codehash")]
         meta.lookup_any("poseidon input padding zero for final", |meta| {
             // Conditions:
             // - On the row with the last byte (`is_byte_to_header == 1`)

zkevm-circuits/src/copy_circuit.rs

@@ -385,7 +385,6 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
         });
 
         // create case unimplemented for poseidon hash
-        #[cfg(feature = "codehash")]
         meta.lookup_any("Bytecode lookup", |meta| {
             use crate::table::BytecodeFieldTag;
             let cond = meta.query_fixed(q_enable, Rotation::cur())

zkevm-circuits/src/state_circuit.rs

@@ -686,7 +686,6 @@ fn queries<F: Field>(meta: &mut VirtualCells<'_, F>, c: &StateCircuitConfig<F>)
             + final_bits_sum.clone() * (1.expr() - final_bits_sum),
         address: MpiQueries::new(meta, c.sort_keys.address),
         storage_key: RlcQueries::new(meta, c.sort_keys.storage_key),
-        value_prev_col: meta.query_advice(c.rw_table.value_prev, Rotation::cur()),
         initial_value: meta.query_advice(c.initial_value, Rotation::cur()),
         initial_value_prev: meta.query_advice(c.initial_value, Rotation::prev()),
         is_non_exist: meta.query_advice(c.is_non_exist.is_zero, Rotation::cur()),

zkevm-circuits/src/state_circuit/constraint_builder.rs

@@ -58,7 +58,6 @@ pub struct Queries<F: Field> {
     pub address: MpiQueries<F, N_LIMBS_ACCOUNT_ADDRESS>,
     pub storage_key: RlcQueries<F, N_BYTES_WORD>,
     pub initial_value: Expression<F>,
-    pub value_prev_col: Expression<F>,
     pub initial_value_prev: Expression<F>,
     pub is_non_exist: Expression<F>,
     pub mpt_proof_type: Expression<F>,
@@ -159,12 +158,23 @@ impl<F: Field> ConstraintBuilder<F> {
                 q.is_read() * (q.rw_table.value.clone() - q.initial_value()),
             );
             // FIXME
+            // precompile should be warm
             // https://github.com/scroll-tech/zkevm-circuits/issues/343
-            // cb.require_equal(
-            // "value_prev column is initial_value for first access",
-            // q.value_prev_column(),
-            // q.initial_value.clone(),
-            // );
+            // If we decide to implement optional access list of tx later,
+            // we need to revist this constraint.
+            cb.condition(
+                not::expr(
+                    q.tag_matches(RwTableTag::TxAccessListAccount)
+                        + q.tag_matches(RwTableTag::TxAccessListAccountStorage),
+                ),
+                |cb| {
+                    cb.require_equal(
+                        "value_prev column is initial_value for first access",
+                        q.value_prev_column(),
+                        q.initial_value.clone(),
+                    );
+                },
+            );
         });
 
         // When all the keys in the current row and previous row are equal.
@@ -178,74 +188,6 @@ impl<F: Field> ConstraintBuilder<F> {
                 q.initial_value.clone() - q.initial_value_prev(),
             );
         });
-
-        // Only reversible rws have `value_prev`.
-        // There is no need to constain MemoryRw and StackRw since the 'read
-        // consistency' part of the constaints are enough for them to behave
-        // correctly.
-        // For these 6 Rws whose `value_prev` need to be
-        // constrained:
-        // (1) `AccountStorage` and `Account`: they are related to storage
-        // and they should be connected to MPT cricuit later to check the
-        // `value_prev`.
-        // (2)`TxAccessListAccount` and
-        // `TxAccessListAccountStorage`:  Default values of them should be
-        // `false` indicating "not accessed yet".
-        // (3) `AccountDestructed`: Since we probably
-        // will not support this feature, it is skipped now.
-        // (4) `TxRefund`: Default values should be '0'. BTW it may be moved out of rw table in the future. See https://github.com/privacy-scaling-explorations/zkevm-circuits/issues/395
-        // for more details.
-
-        // FIXME: For RwTableTag::Account, this is a dummy placeholder to pass
-        // constraints It should be aux2/committed_value.
-        // We should fix this after the committed_value field of Rw::Account in
-        // both bus-mapping and evm-circuits are implemented.
-        // self.condition(q.first_access(), |cb| {
-        // cb.require_equal(
-        // "prev value when first access",
-        // q.value_prev_col.clone(),
-        // (q.tag_matches(RwTableTag::TxAccessListAccount)
-        // + q.tag_matches(RwTableTag::TxAccessListAccountStorage)
-        // + q.tag_matches(RwTableTag::AccountDestructed)
-        // + q.tag_matches(RwTableTag::TxRefund))
-        // 0u64.expr()
-        // + q.tag_matches(RwTableTag::Account)
-        //  q.value_prev_col.clone()
-        // + q.tag_matches(RwTableTag::AccountStorage)
-        //     q.aux2.clone(), // committed value
-        // );
-        // });
-        // self.condition(q.not_first_access(), |cb| {
-        // cb.require_equal(
-        // "prev value when not first acccess",
-        // q.value_prev_col.clone(),
-        // (q.tag_matches(RwTableTag::TxAccessListAccount)
-        // + q.tag_matches(RwTableTag::TxAccessListAccountStorage)
-        // + q.tag_matches(RwTableTag::AccountDestructed)
-        // + q.tag_matches(RwTableTag::TxRefund))
-        // q.value_prev.clone()
-        // + q.tag_matches(RwTableTag::Account) * q.value_prev_col.clone()
-        // + q.tag_matches(RwTableTag::AccountStorage) * q.value_prev.clone(),
-        // );
-        // });
-        // self.require_equal("rw table rlc", q.rw_rlc.clone(), {
-        // rlc::expr(
-        // &[
-        // q.rw_counter.value.clone(),
-        // q.is_write.clone(),
-        // q.tag.clone(),
-        // q.id.value.clone(),
-        // q.address.value.clone(),
-        // q.field_tag.clone(),
-        // q.storage_key.encoded.clone(),
-        // q.value.clone(),
-        // q.value_prev_col.clone(),
-        // 0u64.expr(), //q.aux1,
-        // q.aux2.clone(),
-        // ],
-        // &q.power_of_randomness,
-        // )
-        // })
     }
 
     fn build_start_constraints(&mut self, q: &Queries<F>) {