Skip to content

refactor: moving syncNoteNullifiers call #20110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benesjan merged 1 commit into from
Feb 2, 2026
Merged

refactor: moving syncNoteNullifiers call #20110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,9 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
this.utilityExecutor,
this.aztecNode,
this.contractStore,
this.noteStore,
this.anchorBlockHeader,
this.jobId,
);

const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(
Expand Down
11 changes: 1 addition & 10 deletions yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,16 +363,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
this.log.getBindings(),
);

const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);

// It is acceptable to run the following operations in parallel for several reasons:
// 1. syncTaggedLogs does not write to the note store — it only stores the pending tagged logs in a capsule array,
// which is then processed in Noir after this handler returns.
// 2. Even if syncTaggedLogs did write to the note store, it would not cause inconsistent state.
await Promise.all([
logService.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes),
noteService.syncNoteNullifiers(this.contractAddress),
]);
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
Copy link
Contributor Author

@benesjan benesjan Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this cute?

(renamed syncTaggedLogs to fetchTaggedLogs to unfuck the naming here)

}

/**
Expand Down
25 changes: 23 additions & 2 deletions yarn-project/pxe/src/contract_sync/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
import type { BlockHeader } from '@aztec/stdlib/tx';

import { NoteService } from '../notes/note_service.js';
import type { ContractStore } from '../storage/contract_store/contract_store.js';
import type { NoteStore } from '../storage/note_store/note_store.js';

/**
* Read the current class id of a contract from the execution data provider or AztecNode. If not found, class id
Expand Down Expand Up @@ -41,6 +43,10 @@ export async function syncState(
contractStore: ContractStore,
functionToInvokeAfterSync: FunctionSelector | null,
utilityExecutor: (privateSyncCall: FunctionCall) => Promise<any>,
noteStore: NoteStore,
aztecNode: AztecNode,
header: BlockHeader,
jobId: string,
) {
// Protocol contracts don't have private state to sync
if (!isProtocolContract(contractAddress)) {
Expand All @@ -51,7 +57,11 @@ export async function syncState(
);
}

return utilityExecutor(syncStateFunctionCall);
const noteService = new NoteService(noteStore, aztecNode, header, jobId);

// Both sync_state and syncNoteNullifiers interact with the note store, but running them in parallel is safe
// because note store is designed to handle concurrent operations.
await Promise.all([utilityExecutor(syncStateFunctionCall), noteService.syncNoteNullifiers(contractAddress)]);
}
}

Expand Down Expand Up @@ -89,10 +99,21 @@ export async function ensureContractSynced(
utilityExecutor: (call: FunctionCall) => Promise<any>,
aztecNode: AztecNode,
contractStore: ContractStore,
noteStore: NoteStore,
header: BlockHeader,
jobId: string,
): Promise<void> {
await Promise.all([
syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor),
syncState(
contractAddress,
contractStore,
functionToInvokeAfterSync,
utilityExecutor,
noteStore,
aztecNode,
header,
jobId,
),
verifyCurrentClassId(contractAddress, aztecNode, contractStore, header),
]);
}
4 changes: 2 additions & 2 deletions yarn-project/pxe/src/logs/log_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ export class LogService {
);
}

public async syncTaggedLogs(
public async fetchTaggedLogs(
contractAddress: AztecAddress,
pendingTaggedLogArrayBaseSlot: Fr,
scopes?: AztecAddress[],
) {
this.log.verbose('Searching for tagged logs', { contract: contractAddress });
this.log.verbose(`Fetching tagged logs for ${contractAddress.toString()}`);

// We only load logs from block up to and including the anchor block number
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
Expand Down
6 changes: 6 additions & 0 deletions yarn-project/pxe/src/pxe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,9 @@ export class PXE {
privateSyncCall => this.#simulateUtility(contractFunctionSimulator, privateSyncCall, [], undefined, jobId),
this.node,
this.contractStore,
this.noteStore,
anchorBlockHeader,
jobId,
);

const result = await contractFunctionSimulator.run(
Expand Down Expand Up @@ -976,7 +978,9 @@ export class PXE {
privateSyncCall => this.#simulateUtility(contractFunctionSimulator, privateSyncCall, [], undefined, jobId),
this.node,
this.contractStore,
this.noteStore,
anchorBlockHeader,
jobId,
);

const executionResult = await this.#simulateUtility(
Expand Down Expand Up @@ -1047,7 +1051,9 @@ export class PXE {
await this.#simulateUtility(contractFunctionSimulator, privateSyncCall, [], undefined, jobId),
this.node,
this.contractStore,
this.noteStore,
anchorBlockHeader,
jobId,
);
});

Expand Down
30 changes: 24 additions & 6 deletions yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,17 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
await this.executeUtilityCall(call);
};

await syncState(targetContractAddress, this.contractStore, functionSelector, utilityExecutor);
const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
await syncState(
targetContractAddress,
this.contractStore,
functionSelector,
utilityExecutor,
this.noteStore,
this.stateMachine.node,
blockHeader,
this.jobId,
);

const blockNumber = await this.txeGetNextBlockNumber();

Expand All @@ -314,8 +324,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl

const txContext = new TxContext(this.chainId, this.version, gasSettings);

const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();

const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
const noteCache = new ExecutionNoteCache(protocolNullifier);
// In production, the account contract sets the min revertible counter before calling the app function.
Expand Down Expand Up @@ -663,9 +671,19 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
}

// Sync notes before executing utility function to discover notes from previous transactions
await syncState(targetContractAddress, this.contractStore, functionSelector, async call => {
await this.executeUtilityCall(call);
});
const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
await syncState(
targetContractAddress,
this.contractStore,
functionSelector,
async call => {
await this.executeUtilityCall(call);
},
this.noteStore,
this.stateMachine.node,
blockHeader,
this.jobId,
);

const call = new FunctionCall(
artifact.name,
Expand Down
Loading