fix avm emitted nullifiers

AztecProtocol · Dec 9, 2024 · 3003cb3 · 3003cb3
1 parent a98b002
commit 3003cb3
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/yarn-project/simulator/src/public/transitional_adapters.ts b/yarn-project/simulator/src/public/transitional_adapters.ts
@@ -118,7 +118,8 @@ export function generateAvmCircuitPublicInputs(
     revertibleAccumulatedDataFromPrivate,
   );
 
-  const firstNullifier = nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
+  const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
+
   for (
     let revertibleIndex = 0;
     revertibleIndex < avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes.length;
@@ -130,7 +131,8 @@ export function generateAvmCircuitPublicInputs(
     }
     const indexInTx =
       revertibleIndex + avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths.noteHashes;
-    const nonce = computeNoteHashNonce(firstNullifier, indexInTx);
+
+    const nonce = computeNoteHashNonce(txHash, indexInTx);
     const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
     avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex] = uniqueNoteHash;
   }
@@ -147,18 +149,17 @@ export function generateAvmCircuitPublicInputs(
     MAX_NOTE_HASHES_PER_TX,
   );
 
-  const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
-
   const scopedNoteHashesFromPublic = trace.getSideEffects().noteHashes;
   for (let i = 0; i < scopedNoteHashesFromPublic.length; i++) {
     const scopedNoteHash = scopedNoteHashesFromPublic[i];
     const noteHash = scopedNoteHash.value;
     if (!noteHash.isZero()) {
       const noteHashIndexInTx = i + countAccumulatedItems(noteHashesFromPrivate);
       const nonce = computeNoteHashNonce(txHash, noteHashIndexInTx);
-      const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
-      const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, uniqueNoteHash);
-      avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = siloedNoteHash;
+      const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, noteHash);
+      const uniqueNoteHash = computeUniqueNoteHash(nonce, siloedNoteHash);
+
+      avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = uniqueNoteHash;
     }
   }