From e932d113c699d87576f41ac7f61ae074c65c2ecc Mon Sep 17 00:00:00 2001 From: "sm.wu" Date: Fri, 1 Mar 2024 10:03:27 +0800 Subject: [PATCH] chores: cleaup log --- .github/workflows/main-tests.yml | 5 -- zkevm-circuits/src/evm_circuit/execution.rs | 14 ------ zkevm-circuits/src/evm_circuit/step.rs | 5 -- .../state_circuit/lexicographic_ordering.rs | 11 ----- zkevm-circuits/src/table/rw_table.rs | 46 +++++++++---------- 5 files changed, 22 insertions(+), 59 deletions(-) diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml index 4af43069fbe..45c7e03ed60 100644 --- a/.github/workflows/main-tests.yml +++ b/.github/workflows/main-tests.yml @@ -133,11 +133,6 @@ jobs: sudo chmod +x /usr/bin/solc - name: Update ERC20 git submodule run: git submodule update --init --recursive --checkout integration-tests/contracts/vendor/openzeppelin-contracts - - name: Run root test - uses: actions-rs/cargo@v1 - with: - command: test - args: --package zkevm-circuits --lib -- root_circuit::test::test_root_circuit_multiple_chunk --exact --ignored - name: Run heavy tests # heavy tests are run serially to avoid OOM uses: actions-rs/cargo@v1 with: diff --git a/zkevm-circuits/src/evm_circuit/execution.rs b/zkevm-circuits/src/evm_circuit/execution.rs index 7fa128bbd82..35d348a3595 100644 --- a/zkevm-circuits/src/evm_circuit/execution.rs +++ b/zkevm-circuits/src/evm_circuit/execution.rs @@ -1443,13 +1443,6 @@ impl ExecutionConfig { step, call ); - // println!( - // "assign_exec_step offset: {} state {:?} step: {:?} call: {:?}", - // offset, - // step.execution_state(), - // step, - // call - // ); } // Make the region large enough for the current step and the next step. // The next step's next step may also be accessed, so make the region large @@ -1467,13 +1460,6 @@ impl ExecutionConfig { // so their witness values need to be known to be able // to correctly calculate the intermediate value. if let Some(next_step) = next_step { - // println!( - // "assign_exec_step nextstep offset: {} state {:?} step: {:?} call: {:?}", - // offset, - // next_step.2.execution_state(), - // next_step.2, - // next_step.1 - // ); self.assign_exec_step_int( region, offset + height, diff --git a/zkevm-circuits/src/evm_circuit/step.rs b/zkevm-circuits/src/evm_circuit/step.rs index 181f6d1b4f0..9d90677b420 100644 --- a/zkevm-circuits/src/evm_circuit/step.rs +++ b/zkevm-circuits/src/evm_circuit/step.rs @@ -850,11 +850,6 @@ impl Step { offset, Value::known(F::from(step.rwc_inner_chunk.into())), )?; - // println!( - // "execstate {:?} self.state.call_id {:?}", - // step.execution_state(), - // F::from(call.call_id as u64) - // ); self.state .call_id .assign(region, offset, Value::known(F::from(call.call_id as u64)))?; diff --git a/zkevm-circuits/src/state_circuit/lexicographic_ordering.rs b/zkevm-circuits/src/state_circuit/lexicographic_ordering.rs index cd81f6752ee..67953ea37cc 100644 --- a/zkevm-circuits/src/state_circuit/lexicographic_ordering.rs +++ b/zkevm-circuits/src/state_circuit/lexicographic_ordering.rs @@ -99,7 +99,6 @@ pub struct Config { pub(crate) selector: Column, pub first_different_limb: BinaryNumberConfig, limb_difference: Column, - // limb_difference_inverse: Column, } impl Config { @@ -112,27 +111,17 @@ impl Config { let selector = meta.fixed_column(); let first_different_limb = BinaryNumberChip::configure(meta, selector, None); let limb_difference = meta.advice_column(); - // let limb_difference_inverse = meta.advice_column(); let config = Config { selector, first_different_limb, limb_difference, - // limb_difference_inverse, }; lookup.range_check_u16(meta, "limb_difference fits into u16", |meta| { meta.query_advice(limb_difference, Rotation::cur()) }); - // meta.create_gate("limb_difference is not zero", |meta| { - // let selector = meta.query_fixed(selector, Rotation::cur()); - // let limb_difference = meta.query_advice(limb_difference, Rotation::cur()); - // let limb_difference_inverse = - // meta.query_advice(limb_difference_inverse, Rotation::cur()); - // vec![selector * (1.expr() - limb_difference * limb_difference_inverse)] - // }); - meta.create_gate( "limb differences before first_different_limb are all 0", |meta| { diff --git a/zkevm-circuits/src/table/rw_table.rs b/zkevm-circuits/src/table/rw_table.rs index c20da18c607..94a10852e50 100644 --- a/zkevm-circuits/src/table/rw_table.rs +++ b/zkevm-circuits/src/table/rw_table.rs @@ -89,30 +89,28 @@ impl RwTable { /// Construct a new RwTable pub fn construct(meta: &mut ConstraintSystem) -> Self { Self { - // TODO upgrade halo2 to use `unblinded_advice_column` - // https://github.com/privacy-scaling-explorations/halo2/blob/main/halo2_proofs/examples/vector-ops-unblinded.rs - // rw_counter: meta.unblinded_advice_column(), - // is_write: meta.unblinded_advice_column(), - // tag: meta.unblinded_advice_column(), - // id: meta.unblinded_advice_column(), - // address: meta.unblinded_advice_column(), - // field_tag: meta.unblinded_advice_column(), - // storage_key: word::Word::new([meta.unblinded_advice_column(), - // meta.unblinded_advice_column()]), value: word::Word::new([meta. - // unblinded_advice_column(), meta.unblinded_advice_column()]), value_prev: - // word::Word::new([meta.unblinded_advice_column(), meta.unblinded_advice_column()]), - // init_val: word::Word::new([meta.unblinded_advice_column(), - // meta.unblinded_advice_column()]), - rw_counter: meta.advice_column(), - is_write: meta.advice_column(), - tag: meta.advice_column(), - id: meta.advice_column(), - address: meta.advice_column(), - field_tag: meta.advice_column(), - storage_key: word::Word::new([meta.advice_column(), meta.advice_column()]), - value: word::Word::new([meta.advice_column(), meta.advice_column()]), - value_prev: word::Word::new([meta.advice_column(), meta.advice_column()]), - init_val: word::Word::new([meta.advice_column(), meta.advice_column()]), + rw_counter: meta.unblinded_advice_column(), + is_write: meta.unblinded_advice_column(), + tag: meta.unblinded_advice_column(), + id: meta.unblinded_advice_column(), + address: meta.unblinded_advice_column(), + field_tag: meta.unblinded_advice_column(), + storage_key: word::Word::new([ + meta.unblinded_advice_column(), + meta.unblinded_advice_column(), + ]), + value: word::Word::new([ + meta.unblinded_advice_column(), + meta.unblinded_advice_column(), + ]), + value_prev: word::Word::new([ + meta.unblinded_advice_column(), + meta.unblinded_advice_column(), + ]), + init_val: word::Word::new([ + meta.unblinded_advice_column(), + meta.unblinded_advice_column(), + ]), } } fn assign(