From 8f792e390fa29149f01fb685a123833dda1644b5 Mon Sep 17 00:00:00 2001 From: Jean M <132435771+jeanmon@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:09:09 +0200 Subject: [PATCH] fix: removal of setting private data root in kernel prover (#2671) Resolves #778 --- .../kernel/private/native_private_kernel_circuit_init.cpp | 4 ---- yarn-project/pxe/src/kernel_prover/kernel_prover.ts | 5 ----- 2 files changed, 9 deletions(-) diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/native_private_kernel_circuit_init.cpp b/circuits/cpp/src/aztec3/circuits/kernel/private/native_private_kernel_circuit_init.cpp index da7d27f74e80..028d9eda8bac 100644 --- a/circuits/cpp/src/aztec3/circuits/kernel/private/native_private_kernel_circuit_init.cpp +++ b/circuits/cpp/src/aztec3/circuits/kernel/private/native_private_kernel_circuit_init.cpp @@ -27,10 +27,6 @@ void initialise_end_values(PrivateKernelInputsInit const& private_inputs, auto const& private_call_public_inputs = private_inputs.private_call.call_stack_item.public_inputs; auto const constants = CombinedConstantData{ .block_data = private_call_public_inputs.historic_block_data, - // TODO(dbanks12): remove historic root from app circuit public inputs and - // add it to PrivateCallData: https://github.com/AztecProtocol/aztec-packages/issues/778 - // Then use this: - // .private_data_tree_root = private_inputs.private_call.historic_private_data_tree_root, .tx_context = private_inputs.tx_request.tx_context, }; diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts index a5573b3b3bf0..2cb54b410718 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -138,11 +138,6 @@ export class KernelProver { ); if (firstIteration) { - // TODO(https://github.com/AztecProtocol/aztec-packages/issues/778): remove historic root - // from app circuit public inputs and add it to PrivateCallData - privateCallData.callStackItem.publicInputs.historicBlockData.privateDataTreeRoot = - await this.oracle.getPrivateDataRoot(); - output = await this.proofCreator.createProofInit(new PrivateKernelInputsInit(txRequest, privateCallData)); } else { const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(previousVerificationKey);