diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr index 0e4e12dc3be0..ca966b12f7dd 100644 --- a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr +++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr @@ -102,11 +102,6 @@ impl PublicBaseRollupInputs { tube_data_validator.verify_proof(); tube_data_validator.validate_with_rollup_data(self.constants); - // Warning: Fake verification! TODO(#8470) - // if !dep::std::runtime::is_unconstrained() { - // self.avm_proof_data.fake_verify(); - // } - // TODO(#8470) // if !dep::std::runtime::is_unconstrained() { // self.avm_proof_data.verify(); diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr index e63a3fe56671..48fb379f77cf 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr @@ -188,40 +188,6 @@ pub struct AvmProofData { pub vk_data: VkData, } -// The number of columns for the AVM recursive verifier we want to fake, i.e., the resulting -// verify() routine below will create a similar number of gates as a real AVM recursive verifier -// with the number of columns set by this constant. -// NOTE: It was decided to reduce the number of gates of the fake recursive verifier to 5 millions -// as this would be the target for main net. Therefore, the number of columns was artificially adjusted -// to 550. Zac has some ideas on how to improve the gate counts for the AVM recursive verifier until then. -pub global DUMMY_AVM_VERIFIER_NUM_COLUMNS: u32 = 550; - -// Current AVM recursive verifier has 9500 gates per column. -// Note that the addition of a single column in AVM recursive verifier incurs 8500 gates. -// (some additional costs are due to lookups, relations, ...). -// 78 gates per Poseidon permutation -// 9500/78 = 121.8 -pub global DUMMY_AVM_VERIFIER_NUM_ITERATIONS: u32 = DUMMY_AVM_VERIFIER_NUM_COLUMNS * 122; - -// Warning: This is a fake avm recursive verification whose sole goal is to reproduce a similar -// computational effort (number of gates) as the real recursive verifier. -// TODO(#8470): Replace with the real AVM recursive verifier -impl AvmProofData { - pub fn fake_verify(self) { - let mut input_hash = poseidon2::Poseidon2::hash( - [self.public_inputs.transaction_fee, self.proof.fields[0], self.vk_data.vk.key[0]], - 3, - ); - - let mut result: [Field; 4] = [input_hash, 0, 0, 0]; - for _i in 0..DUMMY_AVM_VERIFIER_NUM_ITERATIONS { - result = poseidon2_permutation(result, 4); - } - - assert(!result[0].lt(1)); - } -} - impl Verifiable for AvmProofData { fn verify(self) { // TODO(#8470)