@aztec/txe 0.0.1-commit.0b941701 → 0.0.1-commit.10bd49492

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/dest/index.d.ts +1 -1
  2. package/dest/index.d.ts.map +1 -1
  3. package/dest/index.js +88 -54
  4. package/dest/oracle/interfaces.d.ts +29 -28
  5. package/dest/oracle/interfaces.d.ts.map +1 -1
  6. package/dest/oracle/txe_oracle_public_context.d.ts +13 -13
  7. package/dest/oracle/txe_oracle_public_context.d.ts.map +1 -1
  8. package/dest/oracle/txe_oracle_public_context.js +14 -15
  9. package/dest/oracle/txe_oracle_top_level_context.d.ts +22 -23
  10. package/dest/oracle/txe_oracle_top_level_context.d.ts.map +1 -1
  11. package/dest/oracle/txe_oracle_top_level_context.js +128 -55
  12. package/dest/rpc_translator.d.ts +85 -83
  13. package/dest/rpc_translator.d.ts.map +1 -1
  14. package/dest/rpc_translator.js +279 -169
  15. package/dest/state_machine/archiver.d.ts +3 -3
  16. package/dest/state_machine/archiver.d.ts.map +1 -1
  17. package/dest/state_machine/archiver.js +7 -7
  18. package/dest/state_machine/dummy_p2p_client.d.ts +16 -12
  19. package/dest/state_machine/dummy_p2p_client.d.ts.map +1 -1
  20. package/dest/state_machine/dummy_p2p_client.js +28 -16
  21. package/dest/state_machine/index.d.ts +7 -5
  22. package/dest/state_machine/index.d.ts.map +1 -1
  23. package/dest/state_machine/index.js +19 -10
  24. package/dest/state_machine/mock_epoch_cache.d.ts +3 -1
  25. package/dest/state_machine/mock_epoch_cache.d.ts.map +1 -1
  26. package/dest/state_machine/mock_epoch_cache.js +4 -0
  27. package/dest/txe_session.d.ts +9 -6
  28. package/dest/txe_session.d.ts.map +1 -1
  29. package/dest/txe_session.js +86 -24
  30. package/dest/util/txe_public_contract_data_source.d.ts +2 -3
  31. package/dest/util/txe_public_contract_data_source.d.ts.map +1 -1
  32. package/dest/util/txe_public_contract_data_source.js +5 -22
  33. package/dest/utils/block_creation.d.ts +1 -1
  34. package/dest/utils/block_creation.d.ts.map +1 -1
  35. package/dest/utils/block_creation.js +3 -1
  36. package/package.json +15 -15
  37. package/src/index.ts +89 -52
  38. package/src/oracle/interfaces.ts +32 -31
  39. package/src/oracle/txe_oracle_public_context.ts +14 -16
  40. package/src/oracle/txe_oracle_top_level_context.ts +157 -103
  41. package/src/rpc_translator.ts +309 -183
  42. package/src/state_machine/archiver.ts +7 -5
  43. package/src/state_machine/dummy_p2p_client.ts +40 -22
  44. package/src/state_machine/index.ts +29 -9
  45. package/src/state_machine/mock_epoch_cache.ts +5 -0
  46. package/src/txe_session.ts +95 -84
  47. package/src/util/txe_public_contract_data_source.ts +10 -36
  48. package/src/utils/block_creation.ts +3 -1
  49. package/dest/util/txe_contract_store.d.ts +0 -12
  50. package/dest/util/txe_contract_store.d.ts.map +0 -1
  51. package/dest/util/txe_contract_store.js +0 -22
  52. package/src/util/txe_contract_store.ts +0 -36
@@ -12,9 +12,11 @@ import { Fr } from '@aztec/foundation/curves/bn254';
12
12
  import { LogLevels, type Logger, applyStringFormatting, createLogger } from '@aztec/foundation/log';
13
13
  import { TestDateProvider } from '@aztec/foundation/timer';
14
14
  import type { KeyStore } from '@aztec/key-store';
15
+ import type { AccessScopes } from '@aztec/pxe/client/lazy';
15
16
  import {
16
17
  AddressStore,
17
18
  CapsuleStore,
19
+ type ContractStore,
18
20
  NoteStore,
19
21
  ORACLE_VERSION,
20
22
  PrivateEventStore,
@@ -22,7 +24,6 @@ import {
22
24
  SenderAddressBookStore,
23
25
  SenderTaggingStore,
24
26
  enrichPublicSimulationError,
25
- syncState,
26
27
  } from '@aztec/pxe/server';
27
28
  import {
28
29
  ExecutionNoteCache,
@@ -84,7 +85,6 @@ import { ForkCheckpoint } from '@aztec/world-state';
84
85
  import { DEFAULT_ADDRESS } from '../constants.js';
85
86
  import type { TXEStateMachine } from '../state_machine/index.js';
86
87
  import type { TXEAccountStore } from '../util/txe_account_store.js';
87
- import type { TXEContractStore } from '../util/txe_contract_store.js';
88
88
  import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
89
89
  import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from '../utils/block_creation.js';
90
90
  import type { ITxeExecutionOracle } from './interfaces.js';
@@ -97,7 +97,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
97
97
 
98
98
  constructor(
99
99
  private stateMachine: TXEStateMachine,
100
- private contractStore: TXEContractStore,
100
+ private contractStore: ContractStore,
101
101
  private noteStore: NoteStore,
102
102
  private keyStore: KeyStore,
103
103
  private addressStore: AddressStore,
@@ -107,7 +107,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
107
107
  private senderAddressBookStore: SenderAddressBookStore,
108
108
  private capsuleStore: CapsuleStore,
109
109
  private privateEventStore: PrivateEventStore,
110
- private jobId: string,
111
110
  private nextBlockTimestamp: bigint,
112
111
  private version: Fr,
113
112
  private chainId: Fr,
@@ -117,7 +116,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
117
116
  this.logger.debug('Entering Top Level Context');
118
117
  }
119
118
 
120
- utilityAssertCompatibleOracleVersion(version: number): void {
119
+ assertCompatibleOracleVersion(version: number): void {
121
120
  if (version !== ORACLE_VERSION) {
122
121
  throw new Error(
123
122
  `Incompatible oracle version. TXE is using version '${ORACLE_VERSION}', but got a request for '${version}'.`,
@@ -127,37 +126,38 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
127
126
 
128
127
  // This is typically only invoked in private contexts, but it is convenient to also have it in top-level for testing
129
128
  // setup.
130
- utilityGetRandomField(): Fr {
129
+ getRandomField(): Fr {
131
130
  return Fr.random();
132
131
  }
133
132
 
134
133
  // We instruct users to debug contracts via this oracle, so it makes sense that they'd expect it to also work in tests
135
- utilityDebugLog(level: number, message: string, fields: Fr[]): void {
134
+ log(level: number, message: string, fields: Fr[]): Promise<void> {
136
135
  if (!LogLevels[level]) {
137
- throw new Error(`Invalid debug log level: ${level}`);
136
+ throw new Error(`Invalid log level: ${level}`);
138
137
  }
139
138
  const levelName = LogLevels[level];
140
139
 
141
140
  this.logger[levelName](`${applyStringFormatting(message, fields)}`, { module: `${this.logger.module}:debug_log` });
141
+ return Promise.resolve();
142
142
  }
143
143
 
144
- txeGetDefaultAddress(): AztecAddress {
144
+ getDefaultAddress(): AztecAddress {
145
145
  return DEFAULT_ADDRESS;
146
146
  }
147
147
 
148
- async txeGetNextBlockNumber(): Promise<BlockNumber> {
148
+ async getNextBlockNumber(): Promise<BlockNumber> {
149
149
  return BlockNumber((await this.getLastBlockNumber()) + 1);
150
150
  }
151
151
 
152
- txeGetNextBlockTimestamp(): Promise<bigint> {
152
+ getNextBlockTimestamp(): Promise<bigint> {
153
153
  return Promise.resolve(this.nextBlockTimestamp);
154
154
  }
155
155
 
156
- async txeGetLastBlockTimestamp() {
156
+ async getLastBlockTimestamp() {
157
157
  return (await this.stateMachine.node.getBlockHeader('latest'))!.globalVariables.timestamp;
158
158
  }
159
159
 
160
- async txeGetLastTxEffects() {
160
+ async getLastTxEffects() {
161
161
  const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
162
162
  const block = await this.stateMachine.archiver.getBlock(latestBlockNumber);
163
163
 
@@ -171,7 +171,26 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
171
171
  return { txHash: txEffects.txHash, noteHashes: txEffects.noteHashes, nullifiers: txEffects.nullifiers };
172
172
  }
173
173
 
174
- async txeGetPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress) {
174
+ async syncContractNonOracleMethod(contractAddress: AztecAddress, scope: AztecAddress, jobId: string) {
175
+ if (contractAddress.equals(DEFAULT_ADDRESS)) {
176
+ this.logger.debug(`Skipping sync in getPrivateEvents because the events correspond to the default address.`);
177
+ return;
178
+ }
179
+
180
+ const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
181
+ await this.stateMachine.contractSyncService.ensureContractSynced(
182
+ contractAddress,
183
+ null,
184
+ async (call, execScopes) => {
185
+ await this.executeUtilityCall(call, execScopes, jobId);
186
+ },
187
+ blockHeader,
188
+ jobId,
189
+ [scope],
190
+ );
191
+ }
192
+
193
+ async getPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress) {
175
194
  return (
176
195
  await this.privateEventStore.getPrivateEvents(selector, {
177
196
  contractAddress,
@@ -182,7 +201,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
182
201
  ).map(e => e.packedEvent);
183
202
  }
184
203
 
185
- async txeAdvanceBlocksBy(blocks: number) {
204
+ async advanceBlocksBy(blocks: number) {
186
205
  this.logger.debug(`time traveling ${blocks} blocks`);
187
206
 
188
207
  for (let i = 0; i < blocks; i++) {
@@ -190,12 +209,12 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
190
209
  }
191
210
  }
192
211
 
193
- txeAdvanceTimestampBy(duration: UInt64) {
212
+ advanceTimestampBy(duration: UInt64) {
194
213
  this.logger.debug(`time traveling ${duration} seconds`);
195
214
  this.nextBlockTimestamp += duration;
196
215
  }
197
216
 
198
- async txeDeploy(artifact: ContractArtifact, instance: ContractInstanceWithAddress, secret: Fr) {
217
+ async deploy(artifact: ContractArtifact, instance: ContractInstanceWithAddress, secret: Fr) {
199
218
  // Emit deployment nullifier
200
219
  await this.mineBlock({
201
220
  nullifiers: [
@@ -207,20 +226,20 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
207
226
  });
208
227
 
209
228
  if (!secret.equals(Fr.ZERO)) {
210
- await this.txeAddAccount(artifact, instance, secret);
229
+ await this.addAccount(artifact, instance, secret);
211
230
  } else {
212
231
  await this.contractStore.addContractInstance(instance);
213
- await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
232
+ await this.contractStore.addContractArtifact(artifact);
214
233
  this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
215
234
  }
216
235
  }
217
236
 
218
- async txeAddAccount(artifact: ContractArtifact, instance: ContractInstanceWithAddress, secret: Fr) {
237
+ async addAccount(artifact: ContractArtifact, instance: ContractInstanceWithAddress, secret: Fr) {
219
238
  const partialAddress = await computePartialAddress(instance);
220
239
 
221
240
  this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
222
241
  await this.contractStore.addContractInstance(instance);
223
- await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
242
+ await this.contractStore.addContractArtifact(artifact);
224
243
 
225
244
  const completeAddress = await this.keyStore.addAccount(secret, partialAddress);
226
245
  await this.accountStore.setAccount(completeAddress.address, completeAddress);
@@ -230,7 +249,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
230
249
  return completeAddress;
231
250
  }
232
251
 
233
- async txeCreateAccount(secret: Fr) {
252
+ async createAccount(secret: Fr) {
234
253
  // This is a foot gun !
235
254
  const completeAddress = await this.keyStore.addAccount(secret, secret);
236
255
  await this.accountStore.setAccount(completeAddress.address, completeAddress);
@@ -240,7 +259,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
240
259
  return completeAddress;
241
260
  }
242
261
 
243
- async txeAddAuthWitness(address: AztecAddress, messageHash: Fr) {
262
+ async addAuthWitness(address: AztecAddress, messageHash: Fr) {
244
263
  const account = await this.accountStore.getAccount(address);
245
264
  const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
246
265
 
@@ -253,7 +272,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
253
272
  }
254
273
 
255
274
  async mineBlock(options: { nullifiers?: Fr[] } = {}) {
256
- const blockNumber = await this.txeGetNextBlockNumber();
275
+ const blockNumber = await this.getNextBlockNumber();
257
276
 
258
277
  const txEffect = TxEffect.empty();
259
278
  txEffect.nullifiers = [getSingleTxBlockRequestHash(blockNumber), ...(options.nullifiers ?? [])];
@@ -277,13 +296,14 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
277
296
  await this.stateMachine.handleL2Block(block);
278
297
  }
279
298
 
280
- async txePrivateCallNewFlow(
299
+ async privateCallNewFlow(
281
300
  from: AztecAddress,
282
301
  targetContractAddress: AztecAddress = AztecAddress.zero(),
283
302
  functionSelector: FunctionSelector = FunctionSelector.empty(),
284
303
  args: Fr[],
285
304
  argsHash: Fr = Fr.zero(),
286
305
  isStaticCall: boolean = false,
306
+ jobId: string,
287
307
  ) {
288
308
  this.logger.verbose(
289
309
  `Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`,
@@ -297,14 +317,26 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
297
317
  throw new Error(message);
298
318
  }
299
319
 
320
+ // When `from` is the zero address (e.g. when deploying a new account contract), we return an
321
+ // empty scope list which acts as deny-all: no notes are visible and no keys are accessible.
322
+ const effectiveScopes = from.isZero() ? [] : [from];
323
+
300
324
  // Sync notes before executing private function to discover notes from previous transactions
301
- const utilityExecutor = async (call: FunctionCall) => {
302
- await this.executeUtilityCall(call);
325
+ const utilityExecutor = async (call: FunctionCall, execScopes: AccessScopes) => {
326
+ await this.executeUtilityCall(call, execScopes, jobId);
303
327
  };
304
328
 
305
- await syncState(targetContractAddress, this.contractStore, functionSelector, utilityExecutor);
329
+ const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
330
+ await this.stateMachine.contractSyncService.ensureContractSynced(
331
+ targetContractAddress,
332
+ functionSelector,
333
+ utilityExecutor,
334
+ blockHeader,
335
+ jobId,
336
+ effectiveScopes,
337
+ );
306
338
 
307
- const blockNumber = await this.txeGetNextBlockNumber();
339
+ const blockNumber = await this.getNextBlockNumber();
308
340
 
309
341
  const callContext = new CallContext(from, targetContractAddress, functionSelector, isStaticCall);
310
342
 
@@ -314,8 +346,6 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
314
346
 
315
347
  const txContext = new TxContext(this.chainId, this.version, gasSettings);
316
348
 
317
- const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
318
-
319
349
  const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
320
350
  const noteCache = new ExecutionNoteCache(protocolNullifier);
321
351
  // In production, the account contract sets the min revertible counter before calling the app function.
@@ -327,43 +357,38 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
327
357
 
328
358
  const simulator = new WASMSimulator();
329
359
 
330
- const privateExecutionOracle = new PrivateExecutionOracle(
360
+ const privateExecutionOracle = new PrivateExecutionOracle({
331
361
  argsHash,
332
362
  txContext,
333
363
  callContext,
334
- /** Header of a block whose state is used during private execution (not the block the transaction is included in). */
335
- blockHeader,
364
+ anchorBlockHeader: blockHeader,
336
365
  utilityExecutor,
337
- /** List of transient auth witnesses to be used during this simulation */
338
- Array.from(this.authwits.values()),
339
- /** List of transient auth witnesses to be used during this simulation */
340
- [],
341
- HashedValuesCache.create([new HashedValues(args, argsHash)]),
366
+ authWitnesses: Array.from(this.authwits.values()),
367
+ capsules: [],
368
+ executionCache: HashedValuesCache.create([new HashedValues(args, argsHash)]),
342
369
  noteCache,
343
370
  taggingIndexCache,
344
- this.contractStore,
345
- this.noteStore,
346
- this.keyStore,
347
- this.addressStore,
348
- this.stateMachine.node,
349
- this.stateMachine.anchorBlockStore,
350
- this.senderTaggingStore,
351
- this.recipientTaggingStore,
352
- this.senderAddressBookStore,
353
- this.capsuleStore,
354
- this.privateEventStore,
355
- this.jobId,
356
- 0, // totalPublicArgsCount
357
- minRevertibleSideEffectCounter, // (start) sideEffectCounter
358
- undefined, // log
359
- undefined, // scopes
360
- /**
361
- * In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
362
- * contract would perform, including setting senderForTags.
363
- */
364
- from,
371
+ contractStore: this.contractStore,
372
+ noteStore: this.noteStore,
373
+ keyStore: this.keyStore,
374
+ addressStore: this.addressStore,
375
+ aztecNode: this.stateMachine.node,
376
+ senderTaggingStore: this.senderTaggingStore,
377
+ recipientTaggingStore: this.recipientTaggingStore,
378
+ senderAddressBookStore: this.senderAddressBookStore,
379
+ capsuleStore: this.capsuleStore,
380
+ privateEventStore: this.privateEventStore,
381
+ contractSyncService: this.stateMachine.contractSyncService,
382
+ jobId,
383
+ totalPublicCalldataCount: 0,
384
+ sideEffectCounter: minRevertibleSideEffectCounter,
385
+ scopes: effectiveScopes,
386
+ // In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
387
+ // contract would perform, including setting senderForTags.
388
+ senderForTags: from,
365
389
  simulator,
366
- );
390
+ messageContextService: this.stateMachine.messageContextService,
391
+ });
367
392
 
368
393
  // Note: This is a slight modification of simulator.run without any of the checks. Maybe we should modify simulator.run with a boolean value to skip checks.
369
394
  let result: PrivateExecutionResult;
@@ -385,7 +410,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
385
410
  );
386
411
  const publicFunctionsCalldata = await Promise.all(
387
412
  publicCallRequests.map(async r => {
388
- const calldata = await privateExecutionOracle.privateLoadFromExecutionCache(r.calldataHash);
413
+ const calldata = await privateExecutionOracle.loadFromExecutionCache(r.calldataHash);
389
414
  return new HashedValues(calldata, r.calldataHash);
390
415
  }),
391
416
  );
@@ -402,7 +427,8 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
402
427
  // We pass the non-zero minRevertibleSideEffectCounter to make sure the side effects are split correctly.
403
428
  const { publicInputs } = await generateSimulatedProvingResult(
404
429
  result,
405
- this.contractStore,
430
+ (addr, sel) => this.contractStore.getDebugFunctionName(addr, sel),
431
+ this.stateMachine.node,
406
432
  minRevertibleSideEffectCounter,
407
433
  );
408
434
 
@@ -415,7 +441,11 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
415
441
 
416
442
  const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
417
443
 
418
- const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore));
444
+ const bindings = this.logger.getBindings();
445
+ const contractsDB = new PublicContractsDB(
446
+ new TXEPublicContractDataSource(blockNumber, this.contractStore),
447
+ bindings,
448
+ );
419
449
  const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
420
450
  const config = PublicSimulatorConfig.from({
421
451
  skipFeeEnforcement: true,
@@ -428,8 +458,10 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
428
458
  globals,
429
459
  guardedMerkleTrees,
430
460
  contractsDB,
431
- new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config),
461
+ new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config, bindings),
432
462
  new TestDateProvider(),
463
+ undefined,
464
+ createLogger('simulator:public-processor', bindings),
433
465
  );
434
466
 
435
467
  const tx = await Tx.create({
@@ -492,7 +524,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
492
524
  return executionResult.returnValues ?? [];
493
525
  }
494
526
 
495
- async txePublicCallNewFlow(
527
+ async publicCallNewFlow(
496
528
  from: AztecAddress,
497
529
  targetContractAddress: AztecAddress,
498
530
  calldata: Fr[],
@@ -502,7 +534,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
502
534
  `Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`,
503
535
  );
504
536
 
505
- const blockNumber = await this.txeGetNextBlockNumber();
537
+ const blockNumber = await this.getNextBlockNumber();
506
538
 
507
539
  const gasLimits = new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
508
540
 
@@ -526,7 +558,11 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
526
558
 
527
559
  const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
528
560
 
529
- const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore));
561
+ const bindings2 = this.logger.getBindings();
562
+ const contractsDB = new PublicContractsDB(
563
+ new TXEPublicContractDataSource(blockNumber, this.contractStore),
564
+ bindings2,
565
+ );
530
566
  const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
531
567
  const config = PublicSimulatorConfig.from({
532
568
  skipFeeEnforcement: true,
@@ -535,8 +571,16 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
535
571
  collectStatistics: false,
536
572
  collectCallMetadata: true,
537
573
  });
538
- const simulator = new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config);
539
- const processor = new PublicProcessor(globals, guardedMerkleTrees, contractsDB, simulator, new TestDateProvider());
574
+ const simulator = new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config, bindings2);
575
+ const processor = new PublicProcessor(
576
+ globals,
577
+ guardedMerkleTrees,
578
+ contractsDB,
579
+ simulator,
580
+ new TestDateProvider(),
581
+ undefined,
582
+ createLogger('simulator:public-processor', bindings2),
583
+ );
540
584
 
541
585
  // We're simulating a scenario in which private execution immediately enqueues a public call and halts. The private
542
586
  // kernel init would in this case inject a nullifier with the transaction request hash as a non-revertible
@@ -567,7 +611,7 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
567
611
  constantData,
568
612
  /*gasUsed=*/ new Gas(0, 0),
569
613
  /*feePayer=*/ AztecAddress.zero(),
570
- /*includeByTimestamp=*/ 0n,
614
+ /*expirationTimestamp=*/ 0n,
571
615
  inputsForPublic,
572
616
  undefined,
573
617
  );
@@ -635,10 +679,11 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
635
679
  return returnValues ?? [];
636
680
  }
637
681
 
638
- async txeSimulateUtilityFunction(
682
+ async executeUtilityFunction(
639
683
  targetContractAddress: AztecAddress,
640
684
  functionSelector: FunctionSelector,
641
685
  args: Fr[],
686
+ jobId: string,
642
687
  ) {
643
688
  const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
644
689
  if (!artifact) {
@@ -646,25 +691,33 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
646
691
  }
647
692
 
648
693
  // Sync notes before executing utility function to discover notes from previous transactions
649
- await syncState(targetContractAddress, this.contractStore, functionSelector, async call => {
650
- await this.executeUtilityCall(call);
651
- });
652
-
653
- const call = new FunctionCall(
654
- artifact.name,
694
+ const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
695
+ await this.stateMachine.contractSyncService.ensureContractSynced(
655
696
  targetContractAddress,
656
697
  functionSelector,
657
- FunctionType.UTILITY,
658
- false,
659
- false,
660
- args,
661
- [],
698
+ async (call, execScopes) => {
699
+ await this.executeUtilityCall(call, execScopes, jobId);
700
+ },
701
+ blockHeader,
702
+ jobId,
703
+ 'ALL_SCOPES',
662
704
  );
663
705
 
664
- return this.executeUtilityCall(call);
706
+ const call = FunctionCall.from({
707
+ name: artifact.name,
708
+ to: targetContractAddress,
709
+ selector: functionSelector,
710
+ type: FunctionType.UTILITY,
711
+ hideMsgSender: false,
712
+ isStatic: false,
713
+ args,
714
+ returnTypes: [],
715
+ });
716
+
717
+ return this.executeUtilityCall(call, 'ALL_SCOPES', jobId);
665
718
  }
666
719
 
667
- private async executeUtilityCall(call: FunctionCall): Promise<Fr[]> {
720
+ private async executeUtilityCall(call: FunctionCall, scopes: AccessScopes, jobId: string): Promise<Fr[]> {
668
721
  const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
669
722
  if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
670
723
  throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
@@ -677,23 +730,24 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
677
730
 
678
731
  try {
679
732
  const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
680
- const oracle = new UtilityExecutionOracle(
681
- call.to,
682
- [],
683
- [],
733
+ const oracle = new UtilityExecutionOracle({
734
+ contractAddress: call.to,
735
+ authWitnesses: [],
736
+ capsules: [],
684
737
  anchorBlockHeader,
685
- this.contractStore,
686
- this.noteStore,
687
- this.keyStore,
688
- this.addressStore,
689
- this.stateMachine.node,
690
- this.stateMachine.anchorBlockStore,
691
- this.recipientTaggingStore,
692
- this.senderAddressBookStore,
693
- this.capsuleStore,
694
- this.privateEventStore,
695
- this.jobId,
696
- );
738
+ contractStore: this.contractStore,
739
+ noteStore: this.noteStore,
740
+ keyStore: this.keyStore,
741
+ addressStore: this.addressStore,
742
+ aztecNode: this.stateMachine.node,
743
+ recipientTaggingStore: this.recipientTaggingStore,
744
+ senderAddressBookStore: this.senderAddressBookStore,
745
+ capsuleStore: this.capsuleStore,
746
+ privateEventStore: this.privateEventStore,
747
+ messageContextService: this.stateMachine.messageContextService,
748
+ jobId,
749
+ scopes,
750
+ });
697
751
  const acirExecutionResult = await new WASMSimulator()
698
752
  .executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
699
753
  .catch((err: Error) => {
@@ -709,10 +763,10 @@ export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracl
709
763
  );
710
764
  });
711
765
 
712
- this.logger.verbose(`Utility simulation for ${call.to}.${call.selector} completed`);
766
+ this.logger.verbose(`Utility execution for ${call.to}.${call.selector} completed`);
713
767
  return witnessMapToFields(acirExecutionResult.returnWitness);
714
768
  } catch (err) {
715
- throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during utility simulation'));
769
+ throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during utility execution'));
716
770
  }
717
771
  }
718
772