Skip to content

Commit eb64eaa

Browse files
author
AztecBot
committed
Merge branch 'next' into merge-train/avm
2 parents 274c4a9 + 395632f commit eb64eaa

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

avm-transpiler/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,28 @@ impl PrivateKernelInnerCircuitPrivateInputs {
6060
start_private_call_stack_length
6161
- 1];
6262

63-
private_call_data_validator.verify_proof(false /* is_first_app */);
64-
private_call_data_validator.validate_common(
65-
self.previous_kernel.public_inputs.constants.protocol_contract_tree_root,
66-
);
67-
private_call_data_validator.validate_against_call_request(call_request);
68-
private_call_data_validator.validate_against_previous_kernel(self.previous_kernel.public_inputs);
69-
70-
// Generate output.
71-
// Safety: The output is validated below by PrivateKernelCircuitOutputValidator.
72-
let output = unsafe { self.generate_output() };
73-
74-
// Validate output.
75-
if dep::types::validate::should_validate_output() {
76-
PrivateKernelCircuitOutputValidator::new(output).validate_as_inner_call(
63+
private_call_data_validator.verify_proof(false /* is_first_app */);
64+
private_call_data_validator.validate_common(
65+
self.previous_kernel.public_inputs.constants.protocol_contract_tree_root,
66+
);
67+
private_call_data_validator.validate_against_call_request(call_request);
68+
private_call_data_validator.validate_against_previous_kernel(
7769
self.previous_kernel.public_inputs,
78-
self.private_call,
7970
);
71+
72+
// Generate output.
73+
// Safety: The output is validated below by PrivateKernelCircuitOutputValidator.
74+
let output = unsafe { self.generate_output() };
75+
76+
// Validate output.
77+
if dep::types::validate::should_validate_output() {
78+
PrivateKernelCircuitOutputValidator::new(output).validate_as_inner_call(
79+
self.previous_kernel.public_inputs,
80+
self.private_call,
81+
);
82+
}
83+
output
8084
}
81-
output
82-
}
8385
}
8486

8587
mod tests {

noir/noir-repo-ref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2025-08-28
1+
19f252519a431e961c594ac8b46d5319520871a8

0 commit comments

Comments
 (0)