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

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
CeciliaZ030 committed Dec 7, 2023
1 parent f60c5f0 commit 88417f6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
10 changes: 0 additions & 10 deletions bus-mapping/src/circuit_input_builder/protocol_instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ impl ProtocolInstance {
EvidenceType::Sgx { new_pubkey } => todo!(),
EvidenceType::PseZk => {
// keccak256(abi.encode(tran, prover, metaHash, txListHash, pointValue));
let meta_hash = keccak(self.block_metadata.abi_encode());
self.block_metadata.blobHash;
keccak(self.abi_encode()).into()
},
}
Expand Down Expand Up @@ -142,14 +140,6 @@ impl ProtocolInstance {
self.transition.graffiti.abi_encode().into()
}

pub fn transition(&self) -> Vec<u8> {
self.transition.abi_encode().into()
}

pub fn block_metadata(&self) -> Vec<u8> {
self.block_metadata.abi_encode().into()
}

pub fn prover(&self) -> Vec<u8> {
self.prover.as_fixed_bytes().abi_encode().into()
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/integration_public_data_circuits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ mod public_data_test {
.unwrap()
.as_fixed_bytes()
.into(),
txListHash: parse_hash(
blobHash: parse_hash(
"569e75fc77c1a856f6daaf9e69d8a9566ca34aa47f9133711ce065a571af0cfd",
)
.unwrap()
Expand Down
1 change: 0 additions & 1 deletion zkevm-circuits/src/table/keccak_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ impl KeccakTable {
let keccak_table_columns = <KeccakTable as LookupTable<F>>::advice_columns(self);
for input in inputs.clone() {
for row in Self::assignments(input, challenges) {
println!("keccak row: {:?}", row);
// let mut column_index = 0;
for (&column, value) in keccak_table_columns.iter().zip_eq(row) {
region.assign_advice(
Expand Down
11 changes: 5 additions & 6 deletions zkevm-circuits/src/taiko_pi_circuit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ impl<F: Field> PublicData<F> {
1 => self.protocol_instance.blockHash(),
2 => self.protocol_instance.signalRoot(),
3 => self.protocol_instance.graffiti(),
4 => self.protocol_instance.prover(),
5 => self.protocol_instance.meta_hash(),
4 => self.protocol_instance.meta_hash(),
5 => self.protocol_instance.prover(),
6 => self.protocol_instance.tx_list_hash(),
7 => self.protocol_instance.point_value(),
_ => unreachable!(),
Expand Down Expand Up @@ -412,16 +412,15 @@ impl<F: Field> TaikoPiCircuitConfig<F> {
&self.tx_list_hash,
&self.point_value,
].iter().for_each(|gadget| {
println!("gadget {:?} len = {}", idx, gadget.len);
gadget.assign(&mut region, 0, &public_data.assignment(idx))
.expect(&format!("FieldGadget assignment failed at {:?}", idx));
idx += 1;
});

self.keccak_bytes.assign(&mut region, 0, &public_data.keccak_assignment())
.expect("Keccak bytes assignment failed");

println!("total_acc = {:?}", public_data.total_acc(keccak_r));
.expect("Keccak bytes assignment failed");
assign!(region, self.total_acc, 0 => public_data.total_acc(keccak_r))?;

let hi_low_assignment = public_data.keccak_hi_low();
let hi = assign!(region, self.keccak_hi_lo[0], 0 => hi_low_assignment[0])?;
let lo = assign!(region, self.keccak_hi_lo[1], 0 => hi_low_assignment[1])?;
Expand Down

0 comments on commit 88417f6

Please sign in to comment.