Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

[proof chunk] WIP: rw_table witness commitment to derive challenge #1709

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions zkevm-circuits/src/root_circuit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ where
config.aggregate::<M, As>(ctx, &key.clone(), &self.snark_witnesses)?;

// aggregate user challenge for rwtable permutation challenge
let (alpha, gamma) = {
let (_alpha, _gamma) = {
let mut challenges = config.aggregate_user_challenges::<M, As>(
loader.clone(),
self.user_challenges,
Expand Down Expand Up @@ -320,9 +320,24 @@ where
.scalar_chip()
.assign_constant(&mut loader.ctx_mut(), M::Scalar::from(1))
.unwrap();

(zero_const, one_const, total_chunk_const)
};

// TODO remove me
let (_hardcode_alpha, _hardcode_gamma) = {
(
loader
.scalar_chip()
.assign_constant(&mut loader.ctx_mut(), M::Scalar::from(101))
.unwrap(),
loader
.scalar_chip()
.assign_constant(&mut loader.ctx_mut(), M::Scalar::from(103))
.unwrap(),
)
};

// `first.sc_rwtable_row_prev_fingerprint ==
// first.ec_rwtable_row_prev_fingerprint` will be checked inside circuit
vec![
Expand All @@ -333,11 +348,17 @@ where
(first_chunk.initial_rwc.assigned(), &one_const),
// constraint permutation fingerprint
// challenge: alpha
(first_chunk.sc_permu_alpha.assigned(), &alpha.assigned()),
(first_chunk.ec_permu_alpha.assigned(), &alpha.assigned()),
// TODO remove hardcode
(first_chunk.sc_permu_alpha.assigned(), &_hardcode_alpha),
(first_chunk.ec_permu_alpha.assigned(), &_hardcode_alpha),
// (first_chunk.sc_permu_alpha.assigned(), &alpha.assigned()),
// (first_chunk.ec_permu_alpha.assigned(), &alpha.assigned()),
// challenge: gamma
(first_chunk.sc_permu_gamma.assigned(), &gamma.assigned()),
(first_chunk.ec_permu_gamma.assigned(), &gamma.assigned()),
// TODO remove hardcode
(first_chunk.sc_permu_gamma.assigned(), &_hardcode_gamma),
(first_chunk.ec_permu_gamma.assigned(), &_hardcode_gamma),
// (first_chunk.sc_permu_gamma.assigned(), &gamma.assigned()),
// (first_chunk.ec_permu_gamma.assigned(), &gamma.assigned()),
// fingerprint
(
first_chunk.ec_rwtable_prev_fingerprint.assigned(),
Expand Down
71 changes: 67 additions & 4 deletions zkevm-circuits/src/super_circuit/test.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
use crate::{table::rw_table::get_rwtable_cols_commitment, witness::RwMap};

pub use super::*;
use bus_mapping::operation::OperationContainer;
use eth_types::{address, bytecode, geth_types::GethData, Word};
use ethers_signers::{LocalWallet, Signer};
use halo2_proofs::{dev::MockProver, halo2curves::bn256::Fr};
use halo2_proofs::{
dev::MockProver,
halo2curves::{
bn256::{Bn256, Fr},
ff::WithSmallOrderMulGroup,
},
poly::{
commitment::CommitmentScheme,
kzg::commitment::{KZGCommitmentScheme, ParamsKZG},
},
};
use log::error;
use mock::{TestContext, MOCK_CHAIN_ID};
use rand::SeedableRng;
use rand_chacha::ChaCha20Rng;
use rand_chacha::{rand_core::OsRng, ChaCha20Rng};
use std::collections::HashMap;

use eth_types::{address, bytecode, geth_types::GethData, Word};

#[test]
fn super_circuit_degree() {
let mut cs = ConstraintSystem::<Fr>::default();
Expand Down Expand Up @@ -172,3 +184,54 @@ fn serial_test_super_circuit_2tx_2max_tx() {
};
test_super_circuit(block, circuits_params, Fr::from(TEST_MOCK_RANDOMNESS));
}

#[ignore]
#[test]
fn test_rw_table_commitment() {
let k = 18;
let params = ParamsKZG::<Bn256>::setup(k, OsRng);
rw_table_commitment::<KZGCommitmentScheme<_>>(&params);
}

fn rw_table_commitment<'params, Scheme: CommitmentScheme>(params: &'params Scheme::ParamsProver)
where
<Scheme as CommitmentScheme>::Scalar: WithSmallOrderMulGroup<3> + eth_types::Field,
{
let circuits_params = FixedCParams {
max_txs: 1,
max_calldata: 32,
max_rws: 256,
max_copy_rows: 256,
max_exp_steps: 256,
max_bytecode: 512,
max_evm_rows: 0,
max_keccak_rows: 0,
};
let rw_map = RwMap::from(&OperationContainer {
..Default::default()
});
let rows = rw_map.table_assignments(false);

const TEST_MOCK_RANDOMNESS: u64 = 0x100;

// synthesize to get degree
let mut cs = ConstraintSystem::<<Scheme as CommitmentScheme>::Scalar>::default();
let config = SuperCircuit::configure_with_params(
&mut cs,
SuperCircuitParams {
max_txs: circuits_params.max_txs,
max_calldata: circuits_params.max_calldata,
mock_randomness: TEST_MOCK_RANDOMNESS.into(),
},
);
let degree = cs.degree();

let advice_commitments = get_rwtable_cols_commitment::<Scheme>(
degree,
&rows,
circuits_params.max_rws,
params,
false,
);
println!("advice_commitments {:?}", advice_commitments[0]);
}
Loading
Loading