feat!: rm outgoing logs

boxes/boxes/react/src/contracts/src/main.nr

@@ -25,8 +25,7 @@ contract BoxReact {
         let numbers = storage.numbers;
         let mut new_number = ValueNote::new(number, owner);
 
-        let owner_ovpk_m = get_public_keys(owner).ovpk_m;
-        numbers.at(owner).initialize(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner_ovpk_m, owner, context.msg_sender()));
+        numbers.at(owner).initialize(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner, context.msg_sender()));
     }
 
     #[private]
@@ -37,8 +36,7 @@ contract BoxReact {
         let numbers = storage.numbers;
         let mut new_number = ValueNote::new(number, owner);
 
-        let owner_ovpk_m = get_public_keys(owner).ovpk_m;
-        numbers.at(owner).replace(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner_ovpk_m, owner, context.msg_sender()));
+        numbers.at(owner).replace(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner, context.msg_sender()));
     }
 
     unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {

boxes/boxes/vanilla/src/contracts/src/main.nr

@@ -25,8 +25,7 @@ contract Vanilla {
         let numbers = storage.numbers;
         let mut new_number = ValueNote::new(number, owner);
 
-        let owner_ovpk_m = get_public_keys(owner).ovpk_m;
-        numbers.at(owner).initialize(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner_ovpk_m, owner, context.msg_sender()));
+        numbers.at(owner).initialize(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner, context.msg_sender()));
     }
 
     #[private]
@@ -37,8 +36,7 @@ contract Vanilla {
         let numbers = storage.numbers;
         let mut new_number = ValueNote::new(number, owner);
 
-        let owner_ovpk_m = get_public_keys(owner).ovpk_m;
-        numbers.at(owner).replace(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner_ovpk_m, owner, context.msg_sender()));
+        numbers.at(owner).replace(&mut new_number).emit(encode_and_encrypt_note(&mut context, owner, context.msg_sender()));
     }
 
     unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {

noir-projects/aztec-nr/aztec/src/context/private_context.nr

@@ -1,3 +1,5 @@
+use dep::protocol_types::debug_log::{debug_log, debug_log_format};
+
 use crate::{
     context::{inputs::PrivateContextInputs, packed_returns::PackedReturns},
     hash::{ArgsHasher, hash_args_array},
@@ -136,7 +138,23 @@ impl PrivateContext {
     }
 
     pub fn push_note_hash(&mut self, note_hash: Field) {
+        // debug_log_format(
+        //     "\n\nMIKE About to push new note hash: (note_hash:{0}, counter: {1})",
+        //     [note_hash, (self.side_effect_counter - 1) as Field],
+        // );
         self.note_hashes.push(NoteHash { value: note_hash, counter: self.next_counter() });
+        // debug_log("And just to make doubly sure, here is the context after pushing:");
+
+        // WARNING: if you delete this debug_log_format line, some tests fail. Be safe out there.
+        debug_log_format(
+            "\n\nMIKE context note hash values after pushing: {0}",
+            self.note_hashes.storage().map(|nh: NoteHash| nh.value),
+        );
+
+        // debug_log_format("\n\nMIKE context note hash counters after pushing: {0}", self.note_hashes.storage().map(|nh: NoteHash| nh.counter as Field));
+        // debug_log_format("\n\nMIKE - if you see a value here, the note hash is definitely in the context. self.note_hashes.storage()[0].value: {0}", [self.note_hashes.storage()[0].value]);
+        // debug_log_format("\n\nMIKE And in case I can't print arrays like I'm trying, here's the [0].value element: {0}", [self.note_hashes.get(0).value]);
+        // debug_log_format("\n\nMIKE And in case I can't print arrays like I'm trying, here's the [0].counter element: {0}", [self.note_hashes.get(0).counter as Field]);
     }
 
     pub fn push_nullifier(&mut self, nullifier: Field) {

noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_event_emission.nr

@@ -1,17 +1,13 @@
 use crate::{
     context::PrivateContext, encrypted_logs::payload::compute_private_log_payload,
-    event::event_interface::EventInterface, keys::getters::get_ovsk_app,
-};
-use dep::protocol_types::{
-    address::AztecAddress, constants::PRIVATE_LOG_SIZE_IN_FIELDS, public_keys::OvpkM,
+    event::event_interface::EventInterface,
 };
+use dep::protocol_types::{address::AztecAddress, constants::PRIVATE_LOG_SIZE_IN_FIELDS};
 
 /// Computes private event log payload and a log hash
 fn compute_payload<Event, let N: u32>(
     context: PrivateContext,
     event: Event,
-    ovsk_app: Field,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
 ) -> [Field; PRIVATE_LOG_SIZE_IN_FIELDS]
@@ -21,60 +17,48 @@ where
     let contract_address: AztecAddress = context.this_address();
     let plaintext = event.to_be_bytes();
 
-    compute_private_log_payload(
-        contract_address,
-        ovsk_app,
-        ovpk,
-        recipient,
-        sender,
-        plaintext,
-    )
+    compute_private_log_payload(contract_address, recipient, sender, plaintext)
 }
 
 unconstrained fn compute_payload_unconstrained<Event, let N: u32>(
     context: PrivateContext,
     event: Event,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
 ) -> [Field; PRIVATE_LOG_SIZE_IN_FIELDS]
 where
     Event: EventInterface<N>,
 {
-    let ovsk_app = get_ovsk_app(ovpk.hash());
-    compute_payload(context, event, ovsk_app, ovpk, recipient, sender)
+    compute_payload(context, event, recipient, sender)
 }
 
 pub fn encode_and_encrypt_event<Event, let N: u32>(
     context: &mut PrivateContext,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
-) -> fn[(&mut PrivateContext, OvpkM, AztecAddress, AztecAddress)](Event) -> ()
+) -> fn[(&mut PrivateContext, AztecAddress, AztecAddress)](Event) -> ()
 where
     Event: EventInterface<N>,
 {
     |e: Event| {
-        let ovsk_app: Field = context.request_ovsk_app(ovpk.hash());
-        let encrypted_log = compute_payload(*context, e, ovsk_app, ovpk, recipient, sender);
+        let encrypted_log = compute_payload(*context, e, recipient, sender);
         context.emit_private_log(encrypted_log);
     }
 }
 
 pub fn encode_and_encrypt_event_unconstrained<Event, let N: u32>(
     context: &mut PrivateContext,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
-) -> fn[(&mut PrivateContext, OvpkM, AztecAddress, AztecAddress)](Event) -> ()
+) -> fn[(&mut PrivateContext, AztecAddress, AztecAddress)](Event) -> ()
 where
     Event: EventInterface<N>,
 {
     |e: Event| {
         // Unconstrained logs have both their content and encryption unconstrained - it could occur that the
         // recipient is unable to decrypt the payload.
         let encrypted_log =
-            unsafe { compute_payload_unconstrained(*context, e, ovpk, recipient, sender) };
+            unsafe { compute_payload_unconstrained(*context, e, recipient, sender) };
         context.emit_private_log(encrypted_log);
     }
 }

noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr

@@ -1,20 +1,18 @@
+use dep::protocol_types::debug_log::{debug_log, debug_log_format};
+
 use crate::{
     context::PrivateContext,
     encrypted_logs::payload::compute_private_log_payload,
-    keys::getters::get_ovsk_app,
     note::{note_emission::NoteEmission, note_interface::NoteInterface},
 };
 use dep::protocol_types::{
     abis::note_hash::NoteHash, address::AztecAddress, constants::PRIVATE_LOG_SIZE_IN_FIELDS,
-    public_keys::OvpkM,
 };
 
 /// Computes private note log payload
 fn compute_payload<Note, let N: u32>(
     context: PrivateContext,
     note: Note,
-    ovsk_app: Field,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
 ) -> ([Field; PRIVATE_LOG_SIZE_IN_FIELDS], u32)
@@ -25,6 +23,17 @@ where
     let note_hash_counter = note_header.note_hash_counter;
     let storage_slot = note_header.storage_slot;
 
+    // debug_log_format(
+    //     "\n\nMIKE Looking for note: (note_hash_counter: {0}, storage_slot: {1})",
+    //     [note_hash_counter as Field, storage_slot],
+    // );
+
+    debug_log_format(
+        "\n\nMIKE context note hash values: {0}",
+        context.note_hashes.storage().map(|nh: NoteHash| nh.value),
+    );
+    // debug_log_format("\n\nMIKE context note hash counters: {0}", context.note_hashes.storage().map(|nh: NoteHash| nh.counter as Field));
+
     // TODO(#8589): use typesystem to skip this check when not needed
     let note_exists =
         context.note_hashes.storage().any(|n: NoteHash| n.counter == note_hash_counter);
@@ -34,61 +43,48 @@ where
 
     let plaintext = note.to_be_bytes(storage_slot);
 
-    let payload = compute_private_log_payload(
-        contract_address,
-        ovsk_app,
-        ovpk,
-        recipient,
-        sender,
-        plaintext,
-    );
+    let payload = compute_private_log_payload(contract_address, recipient, sender, plaintext);
 
     (payload, note_hash_counter)
 }
 
 unconstrained fn compute_payload_unconstrained<Note, let N: u32>(
     context: PrivateContext,
     note: Note,
-    ovpk: OvpkM,
     recipient: AztecAddress,
     sender: AztecAddress,
 ) -> ([Field; PRIVATE_LOG_SIZE_IN_FIELDS], u32)
 where
     Note: NoteInterface<N>,
 {
-    let ovsk_app = get_ovsk_app(ovpk.hash());
-    compute_payload(context, note, ovsk_app, ovpk, recipient, sender)
+    compute_payload(context, note, recipient, sender)
 }
 
 // This function seems to be affected by the following Noir bug:
 // https://github.com/noir-lang/noir/issues/5771
 // If you get weird behavior it might be because of it.
 pub fn encode_and_encrypt_note<Note, let N: u32>(
     context: &mut PrivateContext,
-    ovpk: OvpkM,
     recipient: AztecAddress,
-    // TODO: We need this because to compute a tagging secret, we require a sender. Should we have the tagging secret oracle take a ovpk_m as input instead of the address?
+    // We need this because to compute a tagging secret, we require a sender:
     sender: AztecAddress,
-) -> fn[(&mut PrivateContext, OvpkM, AztecAddress, AztecAddress)](NoteEmission<Note>) -> ()
+) -> fn[(&mut PrivateContext, AztecAddress, AztecAddress)](NoteEmission<Note>) -> ()
 where
     Note: NoteInterface<N>,
 {
     |e: NoteEmission<Note>| {
-        let ovsk_app: Field = context.request_ovsk_app(ovpk.hash());
-
         let (encrypted_log, note_hash_counter) =
-            compute_payload(*context, e.note, ovsk_app, ovpk, recipient, sender);
+            compute_payload(*context, e.note, recipient, sender);
         context.emit_raw_note_log(encrypted_log, note_hash_counter);
     }
 }
 
 pub fn encode_and_encrypt_note_unconstrained<Note, let N: u32>(
     context: &mut PrivateContext,
-    ovpk: OvpkM,
     recipient: AztecAddress,
-    // TODO: We need this because to compute a tagging secret, we require a sender. Should we have the tagging secret oracle take a ovpk_m as input instead of the address?
+    // We need this because to compute a tagging secret, we require a sender:
     sender: AztecAddress,
-) -> fn[(&mut PrivateContext, OvpkM, AztecAddress, AztecAddress)](NoteEmission<Note>) -> ()
+) -> fn[(&mut PrivateContext, AztecAddress, AztecAddress)](NoteEmission<Note>) -> ()
 where
     Note: NoteInterface<N>,
 {
@@ -104,7 +100,7 @@ where
         // return the log from this function to the app, otherwise it could try to do stuff with it and then that might
         // be wrong.
         let (encrypted_log, note_hash_counter) =
-            unsafe { compute_payload_unconstrained(*context, e.note, ovpk, recipient, sender) };
+            unsafe { compute_payload_unconstrained(*context, e.note, recipient, sender) };
         context.emit_raw_note_log(encrypted_log, note_hash_counter);
     }
 }