init

Author: sklppy88

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

@@ -1,10 +1,6 @@
 use dep::protocol_types::{
-    address::AztecAddress,
-    constants::{GENERATOR_INDEX__SYMMETRIC_KEY, PRIVATE_LOG_SIZE_IN_BYTES},
-    hash::poseidon2_hash_with_separator,
-    point::Point,
-    public_keys::OvpkM,
-    scalar::Scalar,
+    address::AztecAddress, constants::GENERATOR_INDEX__SYMMETRIC_KEY, public_keys::AddressPoint,
+    hash::poseidon2_hash_with_separator, point::Point, public_keys::OvpkM, scalar::Scalar,
 };
 use std::{
     aes128::aes128_encrypt, embedded_curve_ops::fixed_base_scalar_mul as derive_public_key,
@@ -13,10 +9,10 @@ use std::{
 
 use crate::{
     encrypted_logs::header::EncryptedLogHeader,
-    keys::point_to_symmetric_key::point_to_symmetric_key, oracle::random::random,
+    keys::point_to_symmetric_key::point_to_symmetric_key, oracle::{random::random, notes::{get_app_tagging_secret, increment_app_tagging_secret}},
     utils::point::point_to_bytes,
 };
-use protocol_types::public_keys::AddressPoint;
+use protocol_types::hash::poseidon2_hash;
 
 pub comptime global PRIVATE_LOG_OVERHEAD_IN_BYTES: u32 = 304;
 
@@ -125,8 +121,22 @@ fn compute_encrypted_log<let P: u32, let M: u32>(
     let mut encrypted_bytes = [0; M];
     let mut offset = 0;
 
-    // @todo We ignore the tags for now
-    // incoming_tag
+    let mut encrypted_bytes: [u8; M] = [0; M];
+
+    let tagging_secret = unsafe {
+        get_app_tagging_secret(sender, recipient)
+    };
+
+    unsafe {
+        increment_app_tagging_secret(sender, recipient);
+    };
+
+    let tag = tagging_secret.compute_tag();
+    let tag_bytes: [u8; 32] = tag.to_be_bytes();
+
+    for i in 0..32 {
+        encrypted_bytes[offset + i] = tag_bytes[i];
+    }
     offset += 32;
 
     // eph_pk

noir-projects/noir-protocol-circuits/crates/types/src/indexed_tagging_secret.nr

@@ -1,5 +1,5 @@
 use crate::traits::{Deserialize, Serialize};
-use super::address::aztec_address::AztecAddress;
+use super::{address::aztec_address::AztecAddress, hash::poseidon2_hash};
 use std::meta::derive;
 
 pub global INDEXED_TAGGING_SECRET_LENGTH: u32 = 3;
@@ -10,3 +10,9 @@ pub struct IndexedTaggingSecret {
     recipient: AztecAddress,
     index: u32,
 }
+
+impl IndexedTaggingSecret {
+    pub fn compute_tag(self) -> Field {
+        poseidon2_hash([self.secret, self.recipient.to_field(), self.index as Field])
+    }
+}

yarn-project/circuits.js/src/structs/tagging_secret.ts

@@ -1,4 +1,5 @@
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 
 export class TaggingSecret {
@@ -25,4 +26,8 @@ export class IndexedTaggingSecret extends TaggingSecret {
   static fromTaggingSecret(directionalSecret: TaggingSecret, index: number) {
     return new this(directionalSecret.secret, directionalSecret.recipient, index);
   }
+
+  computeTag() {
+    return poseidon2Hash([this.secret, this.recipient, this.index]);
+  }
 }

yarn-project/pxe/src/simulator_oracle/index.ts

@@ -333,9 +333,7 @@ export class SimulatorOracle implements DBOracle {
     const logs: EncryptedL2NoteLog[] = [];
     while (appTaggingSecrets.length > 0) {
       // 2. Compute tags using the secrets, recipient and index. Obtain logs for each tag (#9380)
-      const currentTags = appTaggingSecrets.map(({ secret, recipient, index }) =>
-        poseidon2Hash([secret, recipient, index]),
-      );
+      const currentTags = appTaggingSecrets.map((taggingSecret) => taggingSecret.computeTag());
       const logsByTags = await this.aztecNode.getLogsByTags(currentTags);
       const newTaggingSecrets: IndexedTaggingSecret[] = [];
       logsByTags.forEach((logsByTag, index) => {