fix: remove event selector from unencrypted log (#7309)

Addresses #7198 and #6578.
AztecProtocol · Jul 4, 2024 · c6eb734 · c6eb734
1 parent 3ab00c4
commit c6eb734
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 215 deletions.
diff --git a/noir-projects/Dockerfile.test b/noir-projects/Dockerfile.test
@@ -37,4 +37,4 @@ RUN cd /usr/src/yarn-project/txe && yarn start & \
     # Wait for TXE to initialize
     sleep 5 && \ 
     cd ./aztec-nr && \
-    nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080
+    NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080
diff --git a/noir-projects/Earthfile b/noir-projects/Earthfile
@@ -53,7 +53,8 @@ test:
   RUN cd /usr/src/yarn-project/txe && yarn start & \
       # Wait for TXE to initialize
       sleep 5 && \
-      cd /usr/src/noir-projects/aztec-nr && nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080
+      cd /usr/src/noir-projects/aztec-nr && \
+      NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --use-legacy --silence-warnings --oracle-resolver http://localhost:8080
 
   RUN cd /usr/src/yarn-project/txe && yarn start & \
       # Wait for TXE to initialize

diff --git a/noir-projects/aztec-nr/aztec/src/hash.nr b/noir-projects/aztec-nr/aztec/src/hash.nr
@@ -14,7 +14,6 @@ pub fn compute_secret_hash(secret: Field) -> Field {
 
 pub fn compute_unencrypted_log_hash<T, N, M>(
     contract_address: AztecAddress,
-    event_selector: Field,
     log: T
 ) -> Field where T: ToBytesForUnencryptedLog<N, M> {
     let message_bytes: [u8; N] = log.to_be_bytes_arr();
@@ -26,16 +25,12 @@ pub fn compute_unencrypted_log_hash<T, N, M>(
     for i in 0..32 {
         hash_bytes[i] = address_bytes[i];
     }
-    let event_bytes = event_selector.to_be_bytes(4);
-    for i in 0..4 {
-        hash_bytes[32 + i] = event_bytes[i];
-    }
     let len_bytes = (n as Field).to_be_bytes(4);
     for i in 0..4 {
-        hash_bytes[36 + i] = len_bytes[i];
+        hash_bytes[32 + i] = len_bytes[i];
     }
     for i in 0..n {
-        hash_bytes[40 + i] = message_bytes[i];
+        hash_bytes[36 + i] = message_bytes[i];
     }
 
     sha256_to_field(hash_bytes)
@@ -148,41 +143,37 @@ fn compute_var_args_hash() {
 #[test]
 fn compute_unenc_log_hash_array() {
     let contract_address = AztecAddress::from_field(0x233a3e0df23b2b15b324194cb4a151f26c0b7333250781d34cc269d85dc334c6);
-    let event_selector = 5;
     let log = [
         0x20660de09f35f876e3e69d227b2a35166ad05f09d82d06366ec9b6f65a51fec2,
         0x1b52bfe3b8689761916f76dc3d38aa8810860db325cd39ca611eed980091f01c,
         0x2e559c4045c378a56ad13b9edb1e8de4e7ad3b3aa35cc7ba9ec77f7a68fa43a4,
         0x25d0f689c4a4178a29d59306f2675824d19be6d25e44fa03b03f49c263053dd2,
         0x2d513a722d6f352dc0961f156afdc5e31495b9f0e35cb069261a8e55e2df67fd
     ];
-    let hash = compute_unencrypted_log_hash(contract_address, event_selector, log);
-    assert(hash == 0x00846d6969c8c2f61d39cd2762efcb0abb14f88d59c2675910251ef2bcffe9a7);
+    let hash = compute_unencrypted_log_hash(contract_address, log);
+    assert(hash == 0x0095b2d17ab72f4b27a341f7ac63e49ec73935ae8c9181a0ac02023eb12f3284);
 }
 
 #[test]
 fn compute_unenc_log_hash_addr() {
     let contract_address = AztecAddress::from_field(0x233a3e0df23b2b15b324194cb4a151f26c0b7333250781d34cc269d85dc334c6);
-    let event_selector = 5;
     let log = AztecAddress::from_field(0x26aa302d4715fd8a687453cb26d616b0768027bd54bcae56b09d908ecd9f8303);
-    let hash = compute_unencrypted_log_hash(contract_address, event_selector, log);
-    assert(hash == 0x00880a801230ea08c98a802a11b4786cba474513875f0fc69a615e81c5f9f21c);
+    let hash = compute_unencrypted_log_hash(contract_address, log);
+    assert(hash == 0x0083ab647dfb26e7ddee90a0f4209d049d4660cab42000c544b986aaa84c55a3);
 }
 
 #[test]
 fn compute_unenc_log_hash_str() {
     let contract_address = AztecAddress::from_field(0x1b401e1146c5c507962287065c81f0ef7590adae3802c533d7549d6bf0a41bd8);
-    let event_selector = 5;
     let log = "dummy";
-    let hash = compute_unencrypted_log_hash(contract_address, event_selector, log);
-    assert(hash == 0x00a78b5347813624ecfd26e5b8bc6146f418b0cfcc8296b5112d09b8ebba9496);
+    let hash = compute_unencrypted_log_hash(contract_address, log);
+    assert(hash == 0x00629e88ebd6374f44aa6cfe07e251ecf07213ebc7267e8f6b578ae57ffd6c20);
 }
 
 #[test]
 fn compute_unenc_log_hash_longer_str() {
     let contract_address = AztecAddress::from_field(0x1b401e1146c5c507962287065c81f0ef7590adae3802c533d7549d6bf0a41bd8);
-    let event_selector = 5;
     let log = "Hello this is a string";
-    let hash = compute_unencrypted_log_hash(contract_address, event_selector, log);
-    assert(hash == 0x001f3390ea242afee7ce46dafdbdc4bd4f1cf20cd63850d12d60ff9956712c4f);
+    let hash = compute_unencrypted_log_hash(contract_address, log);
+    assert(hash == 0x0098637962f7d34fa202b7ffad8a07a238c5d1fd897b82a108f7f467fa73b841);
 }
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/logs.nr b/noir-projects/aztec-nr/aztec/src/oracle/logs.nr
@@ -89,25 +89,23 @@ unconstrained pub fn compute_encrypted_event_log<N, M>(
 }
 
 #[oracle(emitUnencryptedLog)]
-unconstrained fn emit_unencrypted_log_oracle_private<T>(_contract_address: AztecAddress, _event_selector: Field, _message: T, _counter: u32) -> Field {}
+unconstrained fn emit_unencrypted_log_oracle_private<T>(_contract_address: AztecAddress, _message: T, _counter: u32) -> Field {}
 
 unconstrained pub fn emit_unencrypted_log_private_internal<T>(
     contract_address: AztecAddress,
-    event_selector: Field,
     message: T,
     counter: u32
 ) -> Field {
-    emit_unencrypted_log_oracle_private(contract_address, event_selector, message, counter)
+    emit_unencrypted_log_oracle_private(contract_address, message, counter)
 }
 
 #[oracle(emitContractClassUnencryptedLog)]
-unconstrained fn emit_contract_class_unencrypted_log_private<N>(contract_address: AztecAddress, event_selector: Field, message: [Field; N], counter: u32) -> Field {}
+unconstrained fn emit_contract_class_unencrypted_log_private<N>(contract_address: AztecAddress, message: [Field; N], counter: u32) -> Field {}
 
 unconstrained pub fn emit_contract_class_unencrypted_log_private_internal<N>(
     contract_address: AztecAddress,
-    event_selector: Field,
     message: [Field; N],
     counter: u32
 ) -> Field {
-    emit_contract_class_unencrypted_log_private(contract_address, event_selector, message, counter)
+    emit_contract_class_unencrypted_log_private(contract_address, message, counter)
 }