feat: squash transient note logs

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

@@ -213,7 +213,7 @@ mod tests {
 
         builder.failed();
     }
-    
+
     #[test]
     unconstrained fn propagate_fee_payer() {
         let mut builder = PrivateKernelInitInputsBuilder::new();

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

@@ -250,26 +250,33 @@ mod tests {
     }
 
     #[test(should_fail_with = "Could not find note hash linked to note log.")]
-    fn input_validation_note_log_not_linked() {
+    unconstrained fn input_validation_note_log_not_linked() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.public_inputs.note_encrypted_logs_hashes.extend_from_array([NoteLogHash { value: 9123, counter: 1, length: 2, note_hash: 1 }]);
+        builder.private_call.public_inputs.note_encrypted_logs_hashes.push(NoteLogHash { value: 9123, counter: 1, length: 2, note_hash: 1 });
+        builder.failed();
     }
-    
+
     #[test]
     unconstrained fn propagate_fee_payer() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
         let fee_payer = builder.private_call.public_inputs.call_context.storage_contract_address;
         builder.private_call.public_inputs.is_fee_payer = true;
         let public_inputs = builder.execute();
         assert_eq(public_inputs.fee_payer, fee_payer);
+    }
 
+    #[test]
+    unconstrained fn propagate_fee_payer_not_set() {
         // Check that the fee payer is not set if is_fee_payer is false
         let mut builder = PrivateKernelInnerInputsBuilder::new();
         assert_eq(builder.private_call.public_inputs.is_fee_payer, false);
         let public_inputs = builder.execute();
         assert_eq(public_inputs.fee_payer, AztecAddress::empty());
+    }
 
+    #[test]
+    unconstrained fn propagate_fee_payer_carry_forward() {
         // Check that we carry forward if the fee payer is already set
         let mut builder = PrivateKernelInnerInputsBuilder::new();
         let fee_payer = AztecAddress::from_field(123);

noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr

@@ -85,6 +85,6 @@ fn empty_hash() {
     let hash = item.hash();
 
     // Value from private_call_stack_item.test.ts "computes empty item hash" test
-    let test_data_empty_hash = 0x0e3b0eeedc919ca4b40e9cf513eaa76b3b26ff7d99be7ad1f45ea73835e9bccd;
+    let test_data_empty_hash = 0x09d4e540f9a3aa434960efdecb388dfc8f14d157b4ed205f7ed049e108ca41cc;
     assert_eq(hash, test_data_empty_hash);
 }

noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr

@@ -228,6 +228,6 @@ fn empty_hash() {
     let inputs = PrivateCircuitPublicInputs::empty();
     let hash = inputs.hash();
     // Value from private_circuit_public_inputs.test.ts "computes empty item hash" test
-    let test_data_empty_hash = 0x04702de5e5815af9c35e4de0a2458edb284509cc975d303ccb346de8f927196b;
+    let test_data_empty_hash = 0x151a2195c12896a8c8f58f3738f6920e93363d398c5f4a8fe1222b4f3b00dafe;
     assert_eq(hash, test_data_empty_hash);
 }

yarn-project/circuits.js/src/contract/contract_address.test.ts

@@ -70,7 +70,9 @@ describe('ContractAddress', () => {
     expect(address).toMatchSnapshot();
   });
 
-  it('Public key hash matches Noir', () => {
+  // This test no longer exists in nr, the new test in 'noir-projects/aztec-nr/aztec/src/keys/public_keys.nr does not match the code here.
+  // That test is run in keys/index.test.ts -> 'computing public keys hash matches Noir'
+  it.skip('Public key hash matches Noir', () => {
     const secretKey = new Fr(2n);
     const hash = deriveKeys(secretKey).publicKeys.hash().toString();
     expect(hash).toMatchSnapshot();

yarn-project/circuits.js/src/keys/index.test.ts

@@ -23,7 +23,7 @@ describe('🔑', () => {
 
     // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
     updateInlineTestData(
-      'noir-projects/noir-protocol-circuits/crates/types/src/address/public_keys_hash.nr',
+      'noir-projects/aztec-nr/aztec/src/keys/public_keys.nr',
       'expected_public_keys_hash',
       expected.toString(),
     );

yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap

@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCallStackItem computes empty item hash 1`] = `Fr<0x0e3b0eeedc919ca4b40e9cf513eaa76b3b26ff7d99be7ad1f45ea73835e9bccd>`;
+exports[`PrivateCallStackItem computes empty item hash 1`] = `Fr<0x09d4e540f9a3aa434960efdecb388dfc8f14d157b4ed205f7ed049e108ca41cc>`;
 
-exports[`PrivateCallStackItem computes hash 1`] = `Fr<0x2984cb74f2fbc6b915c5fb2673296156917c2bde4d72821841f10b8288e9e957>`;
+exports[`PrivateCallStackItem computes hash 1`] = `Fr<0x029a9d1f821097cb2036661cdc3f7c5e7de75ac126036f1ce931ec0c675daa0d>`;

yarn-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap

@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x04702de5e5815af9c35e4de0a2458edb284509cc975d303ccb346de8f927196b>`;
+exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x151a2195c12896a8c8f58f3738f6920e93363d398c5f4a8fe1222b4f3b00dafe>`;
 
-exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x2bd261dcbd3035bcc884242c96fb40cacd498403abbb2306b9116c11735d8619>`;
+exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x0e7a8afddd8967913ff699f70ed48dcaffeeadaf892b94e70666db8be73b884b>`;

yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts

@@ -67,28 +67,28 @@ describe('benchmarks/tx_size_fees', () => {
       'native fee',
       () => NativeFeePaymentMethod.create(aliceWallet),
       // DA:
-      // non-rev: 1 nullifiers, overhead; rev: 2 note hashes, 1 nullifier, 624 B enc logs, 8 B unenc logs, teardown
+      // non-rev: 1 nullifiers, overhead; rev: 2 note hashes, 1 nullifier, 616 B enc logs, 0 B unenc logs, teardown
       // L2:
       // non-rev: 0; rev: 0
-      200012672n,
+      200012416n,
     ],
     [
       'public fee',
       () => Promise.resolve(new PublicFeePaymentMethod(token.address, fpc.address, aliceWallet)),
       // DA:
-      // non-rev: 1 nullifiers, overhead; rev: 2 note hashes, 1 nullifier, 628 B enc logs, 12 B unenc logs, teardown
+      // non-rev: 1 nullifiers, overhead; rev: 2 note hashes, 1 nullifier, 616 B enc logs, 0 B unenc logs, teardown
       // L2:
       // non-rev: 0; rev: 0
-      200012800n,
+      200012416n,
     ],
     [
       'private fee',
       () => Promise.resolve(new PrivateFeePaymentMethod(token.address, fpc.address, aliceWallet)),
       // DA:
-      // non-rev: 3 nullifiers, overhead; rev: 2 note hashes, 944 B enc logs, 20 B unenc logs, teardown
+      // non-rev: 3 nullifiers, overhead; rev: 2 note hashes, 616 B enc logs, 0 B unenc logs, teardown
       // L2:
       // non-rev: 0; rev: 0
-      200018496n,
+      200012928n,
     ],
   ] as const)(
     'sends a tx with a fee with %s payment method',

yarn-project/simulator/src/client/client_execution_context.ts

@@ -154,16 +154,19 @@ export class ClientExecutionContext extends ViewDataOracle {
   public chopNoteEncryptedLogsFromNested() {
     // Do not return logs that have been chopped in the cache
     const allNoteLogs = this.noteCache.getLogs();
-    this.nestedExecutions.forEach(result => {
-      if (!result.noteEncryptedLogs[0]?.isEmpty()) {
-        // The execution has note logs
-        result.noteEncryptedLogs = result.noteEncryptedLogs.filter(l => allNoteLogs.includes(l));
-      }
-    });
+    const chop = (thing: any) =>
+      thing.nestedExecutions.forEach((result: ExecutionResult) => {
+        if (!result.noteEncryptedLogs[0]?.isEmpty()) {
+          // The execution has note logs
+          result.noteEncryptedLogs = result.noteEncryptedLogs.filter(l => allNoteLogs.includes(l));
+        }
+        chop(result);
+      });
+    chop(this);
   }
 
   /**
-   * Return the note encrypted logs emitted during this execution.
+   * Return the note encrypted logs emitted during this execution and nested executions.
    */
   public getAllNoteEncryptedLogs() {
     return this.noteCache.getLogs();