Skip to content

Commit

Permalink
misc update
Browse files Browse the repository at this point in the history
  • Loading branch information
@DreamWuGit
DreamWuGit committed Oct 12, 2024
1 parent 0204f98 commit 24916f3
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 71 deletions.
10 changes: 4 additions & 6 deletions zkevm-circuits/src/sig_circuit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ impl<F: Field> SigCircuit<F> {
QuantumCell::Existing(assigned_y_tmp),
QuantumCell::Existing(pk_is_zero),
);
// this line failed
ecc_chip
.field_chip
.range
Expand Down Expand Up @@ -984,6 +985,8 @@ impl<F: Field> SigCircuit<F> {
.map(|sign_data| self.assign_ecdsa_generic(&mut ctx, ecdsa_r1_chip, sign_data))
.collect::<Result<Vec<AssignedECDSA<F, FpChipR1<F>>>, Error>>()?;

println!("assigned_ecdsas_r1 {:?} ", assigned_ecdsas_r1);

// ================================================
// step 2: decompose the keys and messages
// ================================================
Expand Down Expand Up @@ -1032,7 +1035,7 @@ impl<F: Field> SigCircuit<F> {
// ================================================
// step 3: compute RLC of keys and messages
// ================================================
// TODO: make assigned_sig_values include r1 signature.

let (mut assigned_keccak_values, mut assigned_sig_values): (
Vec<[AssignedValue<F>; 3]>,
Vec<AssignedSignatureVerify<F>>,
Expand Down Expand Up @@ -1084,11 +1087,6 @@ impl<F: Field> SigCircuit<F> {
.unzip();

// append keccak & sig values of r1
println!(
"before assigned_keccak_values size {} {:?}",
assigned_keccak_values.len(),
assigned_keccak_values
);
assigned_keccak_values.extend(assigned_keccak_values_r1);
assigned_sig_values.extend(assigned_sig_values_r1);

Expand Down
135 changes: 70 additions & 65 deletions zkevm-circuits/src/sig_circuit/test.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::{sig_circuit::SigCircuit, util::Field};
use eth_types::sign_types::{sign, SignData};
use ethers_core::utils::keccak256;
use halo2_proofs::{
arithmetic::Field as HaloField,
dev::MockProver,
Expand All @@ -9,6 +10,7 @@ use halo2_proofs::{
secp256r1::{self, Secp256r1Affine},
},
};

use rand::{Rng, RngCore};
use std::marker::PhantomData;

Expand Down Expand Up @@ -202,33 +204,33 @@ fn sign_k1_verify() {
log::debug!("end of testing for msg_hash = 1");
}
// random msg_hash
let max_sigs = [1, 16, MAX_NUM_SIG];
for max_sig in max_sigs.iter() {
log::debug!("testing for {} signatures", max_sig);
let mut signatures = Vec::new();
for _ in 0..*max_sig {
let (sk, pk) = gen_key_pair_k1(&mut rng);
let msg = gen_msg(&mut rng);
let msg_hash: [u8; 32] = Keccak256::digest(&msg)
.as_slice()
.to_vec()
.try_into()
.expect("hash length isn't 32 bytes");
let msg_hash = secp256k1::Fq::from_bytes(&msg_hash).unwrap();
let (r, s, v) = sign_with_rng(&mut rng, sk, msg_hash);
signatures.push(SignData {
signature: (r, s, v),
pk,
msg: msg.into(),
msg_hash,
});
}

let k = LOG_TOTAL_NUM_ROWS as u32;
run::<Fr>(k, *max_sig, signatures, vec![]);

log::debug!("end of testing for {} signatures", max_sig);
}
// let max_sigs = [1, 16, MAX_NUM_SIG];
// for max_sig in max_sigs.iter() {
// log::debug!("testing for {} signatures", max_sig);
// let mut signatures = Vec::new();
// for _ in 0..*max_sig {
// let (sk, pk) = gen_key_pair_k1(&mut rng);
// let msg = gen_msg(&mut rng);
// let msg_hash: [u8; 32] = Keccak256::digest(&msg)
// .as_slice()
// .to_vec()
// .try_into()
// .expect("hash length isn't 32 bytes");
// let msg_hash = secp256k1::Fq::from_bytes(&msg_hash).unwrap();
// let (r, s, v) = sign_with_rng(&mut rng, sk, msg_hash);
// signatures.push(SignData {
// signature: (r, s, v),
// pk,
// msg: msg.into(),
// msg_hash,
// });
// }

// let k = LOG_TOTAL_NUM_ROWS as u32;
// run::<Fr>(k, *max_sig, signatures, vec![]);

// log::debug!("end of testing for {} signatures", max_sig);
// }
}

// test for secp256r1 signatures
Expand All @@ -243,51 +245,54 @@ fn p256_sign_verify() {
let mut rng = XorShiftRng::seed_from_u64(1);

// msg_hash == 0
{
log::debug!("testing for msg_hash = 0");
let mut signatures = Vec::new();
// {
// log::debug!("testing for msg_hash = 0");
// let mut signatures = Vec::new();

let (sk, pk) = gen_key_pair_r1(&mut rng);
let msg = gen_msg(&mut rng);
let msg_hash = secp256r1::Fq::zero();
let (r, s, v) = sign_r1_with_rng(&mut rng, sk, msg_hash);
signatures.push(SignData {
signature: (r, s, v),
pk,
msg: msg.into(),
msg_hash,
});
// let (sk, pk) = gen_key_pair_r1(&mut rng);
// let msg = gen_msg(&mut rng);
// let msg_hash = secp256r1::Fq::zero();
// // 257 ok, 250 not ok

let k = LOG_TOTAL_NUM_ROWS as u32;
run::<Fr>(k, 1, vec![], signatures);

log::debug!("end of testing for msg_hash = 0");
}
// msg_hash == 1
{
log::debug!("testing for msg_hash = 1");
let mut signatures = Vec::new();
// let (r, s, v) = sign_r1_with_rng(&mut rng, sk, msg_hash);
// signatures.push(SignData {
// signature: (r, s, v),
// pk,
// msg: msg.into(),
// msg_hash,
// });

let (sk, pk) = gen_key_pair_r1(&mut rng);
let msg = gen_msg(&mut rng);
let msg_hash = secp256r1::Fq::one();
let (r, s, v) = sign_r1_with_rng(&mut rng, sk, msg_hash);
signatures.push(SignData {
signature: (r, s, v),
pk,
msg: msg.into(),
msg_hash,
});
// let k = LOG_TOTAL_NUM_ROWS as u32;
// run::<Fr>(k, 1, vec![], signatures);

let k = LOG_TOTAL_NUM_ROWS as u32;
run::<Fr>(k, 1, vec![], signatures);
// log::debug!("end of testing for msg_hash = 0");
// }

log::debug!("end of testing for msg_hash = 1");
}
// msg_hash == 1
// {
// log::debug!("testing for msg_hash = 1");
// let mut signatures = Vec::new();

// let (sk, pk) = gen_key_pair_r1(&mut rng);
// let msg = gen_msg(&mut rng);
// let msg_hash = secp256r1::Fq::one();
// let (r, s, v) = sign_r1_with_rng(&mut rng, sk, msg_hash);
// signatures.push(SignData {
// signature: (r, s, v),
// pk,
// msg: msg.into(),
// msg_hash,
// });

// let k = LOG_TOTAL_NUM_ROWS as u32;
// run::<Fr>(k, 1, vec![], signatures);

// log::debug!("end of testing for msg_hash = 1");
// }

// random msg_hash
//let max_sigs = [1, 16, MAX_NUM_SIG]; enable this line after testing
let max_sigs = [1];
let max_sigs = [1, 16, MAX_NUM_SIG]; // enable this line after testing
//let max_sigs = [1];

for max_sig in max_sigs.iter() {
log::debug!("testing for {} signatures", max_sig);
Expand Down
2 changes: 2 additions & 0 deletions zkevm-circuits/src/sig_circuit/utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub(super) type FpChipK1<F> = FpConfig<F, Fp_K1>;
/// Chip to handle ECDSA(secp256r1)::Fp, the base field
pub(super) type FpChipR1<F> = FpConfig<F, Fp_R1>;

#[derive(Debug)]
pub(crate) struct AssignedECDSA<F: Field, FC: FieldChip<F>> {
pub(super) pk: EcPoint<F, FC::FieldPoint>,
pub(super) pk_is_zero: AssignedValue<F>,
Expand All @@ -90,6 +91,7 @@ pub(crate) struct AssignedSignatureVerify<F: Field> {
pub(crate) sig_is_valid: AssignedValue<F>,
}

#[derive(Debug)]
pub(super) struct SignDataDecomposed<F: Field> {
pub(super) pk_hash_cells: Vec<QuantumCell<F>>,
pub(super) msg_hash_cells: Vec<QuantumCell<F>>,
Expand Down

0 comments on commit 24916f3

Please sign in to comment.