@aztec/txe 0.0.1-commit.b655e406 → 0.0.1-commit.fce3e4f

package/src/txe_session.ts

@@ -25,6 +25,7 @@ import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Body, L2Block } from '@aztec/stdlib/block';
 import { GasSettings } from '@aztec/stdlib/gas';
+import { computeProtocolNullifier } from '@aztec/stdlib/hash';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
 import { makeAppendOnlyTreeSnapshot, makeGlobalVariables } from '@aztec/stdlib/testing';
 import { CallContext, GlobalVariables, TxContext } from '@aztec/stdlib/tx';
@@ -66,7 +67,7 @@ type SessionState =
   | {
       name: 'PRIVATE';
       nextBlockGlobalVariables: GlobalVariables;
-      txRequestHash: Fr;
+      protocolNullifier: Fr;
       noteCache: ExecutionNoteCache;
       taggingIndexCache: ExecutionTaggingIndexCache;
     }
@@ -295,7 +296,8 @@ export class TXESession implements TXESessionStateHandler {
     });
 
     const txRequestHash = getSingleTxBlockRequestHash(nextBlockGlobalVariables.blockNumber);
-    const noteCache = new ExecutionNoteCache(txRequestHash);
+    const protocolNullifier = await computeProtocolNullifier(txRequestHash);
+    const noteCache = new ExecutionNoteCache(protocolNullifier);
     const taggingIndexCache = new ExecutionTaggingIndexCache();
 
     this.oracleHandler = new PrivateExecutionOracle(
@@ -316,7 +318,7 @@ export class TXESession implements TXESessionStateHandler {
     // difference resides in that the simulator has all information needed in order to run the simulation, while ours
     // will be ongoing as the different oracles will be invoked from the Noir test, until eventually the private
     // execution finishes.
-    this.state = { name: 'PRIVATE', nextBlockGlobalVariables, txRequestHash, noteCache, taggingIndexCache };
+    this.state = { name: 'PRIVATE', nextBlockGlobalVariables, protocolNullifier, noteCache, taggingIndexCache };
     this.logger.debug(`Entered state ${this.state.name}`);
 
     return (this.oracleHandler as PrivateExecutionOracle).getPrivateContextInputs();
@@ -392,7 +394,7 @@ export class TXESession implements TXESessionStateHandler {
     // logs (other effects like enqueued public calls don't need to be considered since those are not allowed).
     const txEffect = await makeTxEffect(
       this.state.noteCache,
-      this.state.txRequestHash,
+      this.state.protocolNullifier,
       this.state.nextBlockGlobalVariables.blockNumber,
     );
 

package/src/utils/block_creation.ts

@@ -58,5 +58,6 @@ export async function makeTXEBlockHeader(
     Fr.ZERO,
     Fr.ZERO,
     Fr.ZERO,
+    Fr.ZERO,
   );
 }

package/src/utils/tx_effect_creation.ts

@@ -5,13 +5,13 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx';
 
 export async function makeTxEffect(
   noteCache: ExecutionNoteCache,
-  txRequestHash: Fr,
+  protocolNullifier: Fr,
   txBlockNumber: number,
 ): Promise<TxEffect> {
   const txEffect = TxEffect.empty();
 
-  const { usedTxRequestHashForNonces } = noteCache.finish();
-  const nonceGenerator = usedTxRequestHashForNonces ? txRequestHash : noteCache.getAllNullifiers()[0];
+  const { usedProtocolNullifierForNonces } = noteCache.finish();
+  const nonceGenerator = usedProtocolNullifierForNonces ? protocolNullifier : noteCache.getAllNullifiers()[0];
 
   txEffect.noteHashes = await Promise.all(
     noteCache
@@ -27,8 +27,8 @@ export async function makeTxEffect(
   // Nullifiers are already siloed
   txEffect.nullifiers = noteCache.getAllNullifiers();
 
-  if (usedTxRequestHashForNonces) {
-    txEffect.nullifiers.unshift(txRequestHash);
+  if (usedProtocolNullifierForNonces) {
+    txEffect.nullifiers.unshift(protocolNullifier);
   }
 
   txEffect.txHash = new TxHash(new Fr(txBlockNumber));