fix(port): block #24580 — mechanical: standard-contracts regen + next-boundary re-grafts

Standard-contracts fixed-point regen on the final tree (next's bb, VK 4832; recipe: pin-standard-build
+ generate:data until no drift, 3 iterations).

Next-boundary re-grafts forced by the v5-tip alignment (each restores an established next-only
adaptation):
- contract_function_simulator.ts / txe_oracle_top_level_context.ts: pass next-only txRequestSalt to
  PrivateExecutionOracle (request.salt / Fr.ZERO as before the restack).
- contract_function_simulator.ts: PrivateExecutionStep.kind = CircuitKind.App (next's bb.js type).
- txe_oracle_top_level_context.ts: CppPublicTxSimulator -> PublicTxSimulator (next superseded the
  cpp-variant class; same decision as block #24223).
- sequencer-publisher.test.ts: v5 prune-suite mock gains next's L1TxState field; restored a closing
  brace lost in the base-sync union.
- oracle_version.ts: ORACLE_VERSION_MINOR 4->5 (matches v5 noir side) + recorded interface hash for
  this tree's oracle surface (v5 interface + next-only salt), per the gate's instruction.

Author: AztecBot

noir-projects/aztec-nr/aztec/src/standard_addresses.nr

@@ -2,17 +2,17 @@
 use protocol_types::{address::AztecAddress, traits::FromField};
 
 pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x0292b01f4e566555534c40ed729eb023cc08afaca647b8c3642738449673480c,
+    0x04fe1d86b5ae0f926883c34905a3c25cb30924138823a9883e2813d4f8b86ad9,
 );
 
 pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x18470168ca7a775b442cde110b668732f7b6390a505f3784b50f39993c5f3dce,
+    0x21d17a596e8ae64c399cc7bffaf3f0346ae067a34948510f041dff8babed9e9a,
 );
 
 pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x2d7745526508f5ceb278bb773a49f776842d1d2f0854c4a385bb661a2fabb9a8,
+    0x2f96c5a68fc1d04b13b76167a254f0a1a906c2dc0b571fcbca107254f064b045,
 );
 
 pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x0bd62e76a9a3a103dae2e73040e05d3970ac900baff5637ae9f183396745ec7e,
+    0x090d0f9525c99184e3741290b2695c5e3af23f51e96061b74b953111b0d4f59d,
 );

noir-projects/noir-contracts/pinned-standard-contracts.tar.gz

@@ -20,7 +20,6 @@ import {
   MAX_PRIVATE_LOGS_PER_TX,
   MAX_TX_LIFETIME,
   PRIVATE_TX_L2_GAS_OVERHEAD,
-  PUBLIC_DATA_WRITE_LENGTH,
   PUBLIC_TX_L2_GAS_OVERHEAD,
   TX_DA_GAS_OVERHEAD,
 } from '@aztec/constants';
@@ -315,7 +314,8 @@ export class ContractFunctionSimulator {
       );
       const simulatorTeardownTimer = new Timer();
 
-      const firstNullifier = noteCache.getNonceGenerator();
+      noteCache.finish();
+      const firstNullifierHint = noteCache.getNonceGenerator();
 
       const publicCallRequests = collectNested([executionResult], r =>
         r.publicInputs.publicCallRequests
@@ -338,9 +338,9 @@ export class ContractFunctionSimulator {
       }
 
       // Not to be confused with a PrivateCallExecutionResult. This is a superset
-      // of the PrivateCallExecutionResult, containing also firstNullifier
+      // of the PrivateCallExecutionResult, containing also firstNullifierHint
       // and publicFunctionsCalldata.
-      return new PrivateExecutionResult(executionResult, firstNullifier, publicFunctionsCalldata);
+      return new PrivateExecutionResult(executionResult, firstNullifierHint, publicFunctionsCalldata);
     } catch (err) {
       throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
     }
@@ -588,10 +588,10 @@ export async function generateSimulatedProvingResult(
         execution.publicInputs.callContext.functionSelector,
       ),
       timings: execution.profileResult?.timings ?? { witgen: 0, oracles: {} },
+      kind: CircuitKind.App,
       bytecode: execution.acir,
       vk: execution.vk,
       witness: execution.partialWitness,
-      kind: CircuitKind.App,
     });
   }
 
@@ -657,12 +657,12 @@ export async function generateSimulatedProvingResult(
     siloedNullifiers,
     minRevertibleSideEffectCounter,
   );
-  // The protocol nullifier is the nonce generator and the tx's first nullifier. It is injected by the
-  // init kernel (at counter 1, index 0) rather than emitted by any private call, so it is absent from
-  // the executed nullifiers above. Mirror the kernel here by prepending it as the first non-revertible
-  // nullifier.
   const nonceGenerator = privateExecutionResult.firstNullifier;
-  nonRevertibleNullifiers.unshift(nonceGenerator);
+  if (nonRevertibleNullifiers.length === 0) {
+    nonRevertibleNullifiers.push(nonceGenerator);
+  } else if (!nonRevertibleNullifiers[0].equals(nonceGenerator)) {
+    throw new Error('The first non revertible nullifier should be equal to the nonce generator. This is a bug!');
+  }
 
   if (isPrivateOnlyTx) {
     // We must make the note hashes unique by using the
@@ -925,11 +925,6 @@ function meterGasUsed(data: PrivateToRollupAccumulatedData | PrivateToPublicAccu
   );
   meteredL2Gas += numContractClassLogs * L2_GAS_PER_CONTRACT_CLASS_LOG;
 
-  if (isPrivateOnlyTx) {
-    // The public data write that the private tx base rollup always performs to update the fee payer's balance.
-    meteredDAFields += PUBLIC_DATA_WRITE_LENGTH;
-  }
-
   const meteredDAGas = meteredDAFields * DA_GAS_PER_FIELD;
 
   if ((data as PrivateToPublicAccumulatedData).publicCallRequests) {

yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts

@@ -43,6 +43,12 @@ export class ExecutionNoteCache {
 
   private inRevertiblePhase = false;
 
+  /**
+   * Whether the protocol nullifier was used for nonce generation.
+   * We don't need to use the protocol nullifier if a non-revertible nullifier is emitted.
+   */
+  private usedProtocolNullifierForNonces: boolean | undefined;
+
   constructor(private readonly protocolNullifier: Fr) {}
 
   /**
@@ -58,9 +64,12 @@ export class ExecutionNoteCache {
     this.inRevertiblePhase = true;
     this.minRevertibleSideEffectCounter = minRevertibleSideEffectCounter;
 
-    // The protocol nullifier is always the tx's first nullifier (injected by the kernel init), so it is the
-    // nonce generator for every note hash.
-    const nonceGenerator = this.protocolNullifier;
+    const nullifiers = this.getEmittedNullifiers();
+    // If there are no nullifiers emitted by private calls so far, we use the protocol nullifier as the nonce generator.
+    // Note: There could still be nullifiers emitted after the counter is set, but those nullifiers are revertible, so
+    // we don't want to use them as the nonce generator.
+    this.usedProtocolNullifierForNonces = nullifiers.length === 0;
+    const nonceGenerator = this.usedProtocolNullifierForNonces ? this.protocolNullifier : new Fr(nullifiers[0]);
 
     // The existing pending notes are all non-revertible.
     // They cannot be squashed by nullifiers emitted after minRevertibleSideEffectCounter is set.
@@ -93,6 +102,14 @@ export class ExecutionNoteCache {
     return sideEffectCounter >= this.minRevertibleSideEffectCounter;
   }
 
+  public finish() {
+    // If we never entered the revertible phase, and there are no nullifiers emitted, we need to use the protocol
+    // nullifier as the nonce generator.
+    if (!this.inRevertiblePhase) {
+      this.usedProtocolNullifierForNonces = this.getEmittedNullifiers().length === 0;
+    }
+  }
+
   /**
    * Add a new note to cache.
    * @param note - New note created during execution.
@@ -206,15 +223,19 @@ export class ExecutionNoteCache {
   }
 
   /**
-   * @returns All nullifiers of the transaction: the protocol nullifier (the kernel-injected first nullifier),
-   * followed by those emitted by private calls.
+   * @returns All nullifiers emitted by private calls in this transaction. If the protocol nullifier was used as the
+   * nonce generator, it is injected as the first nullifier.
    */
   getAllNullifiers(): Fr[] {
-    return [this.protocolNullifier, ...this.getEmittedNullifiers()];
+    if (this.usedProtocolNullifierForNonces === undefined) {
+      throw new Error('usedProtocolNullifierForNonces is not set yet. Call finish() to complete the transaction.');
+    }
+    const allNullifiers = this.getEmittedNullifiers();
+    return [...(this.usedProtocolNullifierForNonces ? [this.protocolNullifier] : []), ...allNullifiers];
   }
 
   getNonceGenerator(): Fr {
-    return this.protocolNullifier;
+    return this.getAllNullifiers()[0];
   }
 
   #recordNullifier(contractAddress: AztecAddress, siloedNullifier: bigint) {

yarn-project/pxe/src/contract_function_simulator/execution_note_cache.ts

@@ -21,11 +21,11 @@ export {
   ETH_ADDRESS,
   EVENT_VALIDATION_REQUEST,
   FIELD,
+  FIXED_ARRAY,
   FUNCTION_SELECTOR,
   LOG_RETRIEVAL_REQUEST,
   LOG_RETRIEVAL_RESPONSE,
   MEMBERSHIP_WITNESS,
-  MESSAGE_CONTEXT,
   NOTE_SELECTOR,
   NOTE_VALIDATION_REQUEST,
   OPTION,
@@ -34,6 +34,7 @@ export {
   PROVIDED_SECRET,
   SLOT_NUMBER,
   STR,
+  STRUCT,
   U32,
   tryFieldWidth,
   type InputSlot,
@@ -70,6 +71,7 @@ export { EventValidationRequest } from './noir-structs/event_validation_request.
 export type { LogRetrievalRequest } from './noir-structs/log_retrieval_request.js';
 export type { LogRetrievalResponse } from './noir-structs/log_retrieval_response.js';
 export { NoteValidationRequest } from './noir-structs/note_validation_request.js';
+export type { PendingTaggedLog } from './noir-structs/pending_tagged_log.js';
 export type { TxEffectData } from './noir-structs/tx_effect_data.js';
 export type { ProvidedSecret } from './noir-structs/provided_secret.js';
 export { ResolvedTx } from './noir-structs/resolved_tx.js';

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

@@ -0,0 +1,12 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+
+import type { ResolvedTx } from './resolved_tx.js';
+
+/**
+ * Represents a pending tagged log as it is stored in the pending tagged log array to which the fetchTaggedLogs oracle
+ * inserts found private logs. A TS version of `pending_tagged_log.nr`.
+ */
+export type PendingTaggedLog = {
+  log: Fr[];
+  context: ResolvedTx;
+};

yarn-project/pxe/src/contract_function_simulator/noir-structs/pending_tagged_log.ts

@@ -1,5 +1,5 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { AppTaggingSecretKind } from '@aztec/stdlib/logs';
 
-/** A tagging secret an app supplies explicitly to `getPendingTaggedLogs` when PXE cannot derive it internally. */
+/** A tagging secret an app supplies explicitly to `getPendingTaggedLogsV2` when PXE cannot derive it internally. */
 export type ProvidedSecret = { secret: Fr; mode: AppTaggingSecretKind };

yarn-project/pxe/src/contract_function_simulator/noir-structs/provided_secret.ts

@@ -1,8 +1,10 @@
 /* eslint-disable camelcase */
-import { MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_CIPHERTEXT_LEN } from '@aztec/constants';
+import { MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_CIPHERTEXT_LEN, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 
 import type { EphemeralArray } from '../noir-structs/ephemeral_array.js';
 import type { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
+import type { PendingTaggedLog } from '../noir-structs/pending_tagged_log.js';
+import type { ResolvedTx } from '../noir-structs/resolved_tx.js';
 import {
   type InferDeserializedParams,
   ORACLE_REGISTRY,
@@ -26,6 +28,19 @@ const LEGACY_LOG_RETRIEVAL_RESPONSE: TypeMapping<LegacyLogRetrievalResponse> = S
   { name: 'firstNullifierInTx', type: FIELD },
 ]);
 
+// Block-less transaction context: the prefix of `ResolvedTx`'s wire carried by the original `getPendingTaggedLogs`
+// oracle. Known as `MessageContext` in the Aztec.nr versions that call that oracle.
+const LEGACY_MESSAGE_CONTEXT: TypeMapping<LegacyMessageContext> = STRUCT<LegacyMessageContext>([
+  { name: 'txHash', type: TX_HASH },
+  { name: 'uniqueNoteHashesInTx', type: FIXED_BOUNDED_VEC(FIELD, MAX_NOTE_HASHES_PER_TX) },
+  { name: 'firstNullifierInTx', type: FIELD },
+]);
+
+const LEGACY_PENDING_TAGGED_LOG: TypeMapping<LegacyPendingTaggedLog> = STRUCT<LegacyPendingTaggedLog>([
+  { name: 'log', type: FIXED_BOUNDED_VEC(FIELD, PRIVATE_LOG_SIZE_IN_FIELDS) },
+  { name: 'context', type: LEGACY_MESSAGE_CONTEXT },
+]);
+
 /**
  * Wire shapes that already-deployed contracts still call by their original oracle name, keyed by that retired name.
  * New Aztec.nr calls the current name in `ORACLE_REGISTRY`; old bytecode keeps calling the name compiled into it and
@@ -43,13 +58,28 @@ export const LEGACY_ORACLE_REGISTRY: Record<string, LegacyOracleEntry> = {
       mapping: result => result as unknown as EphemeralArray<EphemeralArray<LegacyLogRetrievalResponse>>,
     },
   }),
+  aztec_utl_getPendingTaggedLogs: legacyOracle({
+    modernOracle: 'aztec_utl_getPendingTaggedLogsV2',
+    returnType: {
+      legacyType: EPHEMERAL_ARRAY(LEGACY_PENDING_TAGGED_LOG),
+      // We can map this directly, since `ResolvedTx` carries the legacy context's fields under the same names
+      mapping: result => result as unknown as EphemeralArray<LegacyPendingTaggedLog>,
+    },
+  }),
 };
 
 type LegacyLogRetrievalResponse = Pick<
   LogRetrievalResponse,
   'logPayload' | 'txHash' | 'uniqueNoteHashesInTx' | 'firstNullifierInTx'
 >;
 
+type LegacyMessageContext = Pick<ResolvedTx, 'txHash' | 'uniqueNoteHashesInTx' | 'firstNullifierInTx'>;
+
+type LegacyPendingTaggedLog = {
+  log: PendingTaggedLog['log'];
+  context: LegacyMessageContext;
+};
+
 type Registry = typeof ORACLE_REGISTRY;
 
 /** The handler return value type of a modern oracle entry. */

yarn-project/pxe/src/contract_function_simulator/oracle/legacy_oracle_registry.ts

@@ -225,7 +225,7 @@ export const ORACLE_REGISTRY = {
     returnType: BOUNDED_VEC(NOTE),
   }),
 
-  aztec_utl_getPendingTaggedLogs: makeEntry({
+  aztec_utl_getPendingTaggedLogsV2: makeEntry({
     params: [
       { name: 'scope', type: AZTEC_ADDRESS },
       { name: 'providedSecrets', type: EPHEMERAL_ARRAY(PROVIDED_SECRET) },

yarn-project/pxe/src/contract_function_simulator/oracle/oracle_registry.ts

@@ -55,6 +55,7 @@ import type { EmbeddedCurvePoint } from '../noir-structs/embedded_curve_point.js
 import { EphemeralArray } from '../noir-structs/ephemeral_array.js';
 import { Option } from '../noir-structs/option.js';
 import type { ProvidedSecret } from '../noir-structs/provided_secret.js';
+import { ResolvedTx } from '../noir-structs/resolved_tx.js';
 import { TransientArrayService } from '../transient_array_service.js';
 import { UtilityExecutionOracle, type UtilityExecutionOracleArgs } from './utility_execution_oracle.js';
 
@@ -449,8 +450,8 @@ describe('Utility Execution test suite', () => {
     });
 
     // Pins the production oracle's default-authorization allowlist for cross-contract utility reads of the
-    // standard HandshakeRegistry: only get_handshakes and get_app_siloed_secrets are allowed, everything else is
-    // denied.
+    // standard HandshakeRegistry: only get_non_interactive_handshakes and get_app_siloed_secrets are allowed,
+    // everything else is denied.
     describe('cross-contract utility authorization', () => {
       const prepareNestedUtilityCall = async (
         targetContractAddress: AztecAddress,
@@ -493,7 +494,7 @@ describe('Utility Execution test suite', () => {
         nestedSimulator = makeNestedSimulator();
         utilityExecutionOracle = makeOracle({ simulator: nestedSimulator });
         defaultAuthorizedHandshakeRegistryReads = new Map<string, Fr[]>([
-          ['get_handshakes', []],
+          ['get_non_interactive_handshakes', []],
           ['get_app_siloed_secrets', [Fr.random(), Fr.random()]],
         ]);
       });
@@ -592,7 +593,7 @@ describe('Utility Execution test suite', () => {
       });
     });
 
-    describe('getPendingTaggedLogs', () => {
+    describe('getPendingTaggedLogsV2', () => {
       const service = new EphemeralArrayService();
 
       it("uses the provided secret's delivery mode when querying pending log tags", async () => {
@@ -630,7 +631,7 @@ describe('Utility Execution test suite', () => {
           );
         });
 
-        const result = await utilityExecutionOracle.getPendingTaggedLogs(
+        const result = await utilityExecutionOracle.getPendingTaggedLogsV2(
           owner,
           EphemeralArray.fromValues(service, providedSecrets),
         );
@@ -644,11 +645,13 @@ describe('Utility Execution test suite', () => {
         expect(resultLogs).toEqual([
           {
             log: log.logData,
-            context: {
-              txHash: log.txHash,
-              uniqueNoteHashesInTx: log.noteHashes,
-              firstNullifierInTx: log.nullifiers[0],
-            },
+            context: new ResolvedTx(
+              log.txHash,
+              log.noteHashes,
+              log.nullifiers[0],
+              log.blockNumber,
+              log.blockHash.toFr(),
+            ),
           },
         ]);
       });