@aztec/txe 0.0.1-commit.2eb6648a → 0.0.1-commit.343b43af6

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 (48) 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 +12 -12
  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 +115 -53
  12. package/dest/rpc_translator.d.ts +82 -83
  13. package/dest/rpc_translator.d.ts.map +1 -1
  14. package/dest/rpc_translator.js +241 -150
  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 +5 -7
  18. package/dest/state_machine/dummy_p2p_client.d.ts +14 -11
  19. package/dest/state_machine/dummy_p2p_client.d.ts.map +1 -1
  20. package/dest/state_machine/dummy_p2p_client.js +23 -14
  21. package/dest/state_machine/index.d.ts +1 -1
  22. package/dest/state_machine/index.d.ts.map +1 -1
  23. package/dest/state_machine/index.js +1 -1
  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 +77 -21
  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/package.json +15 -15
  34. package/src/index.ts +89 -52
  35. package/src/oracle/interfaces.ts +32 -31
  36. package/src/oracle/txe_oracle_public_context.ts +12 -12
  37. package/src/oracle/txe_oracle_top_level_context.ts +118 -101
  38. package/src/rpc_translator.ts +258 -169
  39. package/src/state_machine/archiver.ts +5 -5
  40. package/src/state_machine/dummy_p2p_client.ts +33 -20
  41. package/src/state_machine/index.ts +1 -0
  42. package/src/state_machine/mock_epoch_cache.ts +5 -0
  43. package/src/txe_session.ts +80 -71
  44. package/src/util/txe_public_contract_data_source.ts +10 -36
  45. package/dest/util/txe_contract_store.d.ts +0 -12
  46. package/dest/util/txe_contract_store.d.ts.map +0 -1
  47. package/dest/util/txe_contract_store.js +0 -22
  48. package/src/util/txe_contract_store.ts +0 -36
@@ -30,7 +30,7 @@ import {
30
30
  toSingle,
31
31
  } from './util/encoding.js';
32
32
 
33
- const MAX_EVENT_LEN = 12; // This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_RESERVED_FIELDS
33
+ const MAX_EVENT_LEN = 10; // This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_MSG_PLAINTEXT_RESERVED_FIELDS_LEN
34
34
  const MAX_PRIVATE_EVENTS_PER_TXE_QUERY = 5;
35
35
 
36
36
  export class UnavailableOracleError extends Error {
@@ -104,13 +104,15 @@ export class RPCTranslator {
104
104
 
105
105
  // TXE session state transition functions - these get handled by the state handler
106
106
 
107
- async txeSetTopLevelTXEContext() {
107
+ // eslint-disable-next-line camelcase
108
+ async aztec_txe_setTopLevelTXEContext() {
108
109
  await this.stateHandler.enterTopLevelState();
109
110
 
110
111
  return toForeignCallResult([]);
111
112
  }
112
113
 
113
- async txeSetPrivateTXEContext(
114
+ // eslint-disable-next-line camelcase
115
+ async aztec_txe_setPrivateTXEContext(
114
116
  foreignContractAddressIsSome: ForeignCallSingle,
115
117
  foreignContractAddressValue: ForeignCallSingle,
116
118
  foreignAnchorBlockNumberIsSome: ForeignCallSingle,
@@ -129,7 +131,8 @@ export class RPCTranslator {
129
131
  return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
130
132
  }
131
133
 
132
- async txeSetPublicTXEContext(
134
+ // eslint-disable-next-line camelcase
135
+ async aztec_txe_setPublicTXEContext(
133
136
  foreignContractAddressIsSome: ForeignCallSingle,
134
137
  foreignContractAddressValue: ForeignCallSingle,
135
138
  ) {
@@ -142,7 +145,8 @@ export class RPCTranslator {
142
145
  return toForeignCallResult([]);
143
146
  }
144
147
 
145
- async txeSetUtilityTXEContext(
148
+ // eslint-disable-next-line camelcase
149
+ async aztec_txe_setUtilityTXEContext(
146
150
  foreignContractAddressIsSome: ForeignCallSingle,
147
151
  foreignContractAddressValue: ForeignCallSingle,
148
152
  ) {
@@ -159,44 +163,54 @@ export class RPCTranslator {
159
163
 
160
164
  // TXE-specific oracles
161
165
 
162
- txeGetDefaultAddress() {
163
- const defaultAddress = this.handlerAsTxe().txeGetDefaultAddress();
166
+ // eslint-disable-next-line camelcase
167
+ aztec_txe_getDefaultAddress() {
168
+ const defaultAddress = this.handlerAsTxe().getDefaultAddress();
164
169
 
165
170
  return toForeignCallResult([toSingle(defaultAddress)]);
166
171
  }
167
172
 
168
- async txeGetNextBlockNumber() {
169
- const nextBlockNumber = await this.handlerAsTxe().txeGetNextBlockNumber();
173
+ // eslint-disable-next-line camelcase
174
+ async aztec_txe_getNextBlockNumber() {
175
+ const nextBlockNumber = await this.handlerAsTxe().getNextBlockNumber();
170
176
 
171
177
  return toForeignCallResult([toSingle(nextBlockNumber)]);
172
178
  }
173
179
 
174
- async txeGetNextBlockTimestamp() {
175
- const nextBlockTimestamp = await this.handlerAsTxe().txeGetNextBlockTimestamp();
180
+ // eslint-disable-next-line camelcase
181
+ async aztec_txe_getNextBlockTimestamp() {
182
+ const nextBlockTimestamp = await this.handlerAsTxe().getNextBlockTimestamp();
176
183
 
177
184
  return toForeignCallResult([toSingle(nextBlockTimestamp)]);
178
185
  }
179
186
 
180
- async txeAdvanceBlocksBy(foreignBlocks: ForeignCallSingle) {
187
+ // eslint-disable-next-line camelcase
188
+ async aztec_txe_advanceBlocksBy(foreignBlocks: ForeignCallSingle) {
181
189
  const blocks = fromSingle(foreignBlocks).toNumber();
182
190
 
183
- await this.handlerAsTxe().txeAdvanceBlocksBy(blocks);
191
+ await this.handlerAsTxe().advanceBlocksBy(blocks);
184
192
 
185
193
  return toForeignCallResult([]);
186
194
  }
187
195
 
188
- txeAdvanceTimestampBy(foreignDuration: ForeignCallSingle) {
196
+ // eslint-disable-next-line camelcase
197
+ aztec_txe_advanceTimestampBy(foreignDuration: ForeignCallSingle) {
189
198
  const duration = fromSingle(foreignDuration).toBigInt();
190
199
 
191
- this.handlerAsTxe().txeAdvanceTimestampBy(duration);
200
+ this.handlerAsTxe().advanceTimestampBy(duration);
192
201
 
193
202
  return toForeignCallResult([]);
194
203
  }
195
204
 
196
- async txeDeploy(artifact: ContractArtifact, instance: ContractInstanceWithAddress, foreignSecret: ForeignCallSingle) {
205
+ // eslint-disable-next-line camelcase
206
+ async aztec_txe_deploy(
207
+ artifact: ContractArtifact,
208
+ instance: ContractInstanceWithAddress,
209
+ foreignSecret: ForeignCallSingle,
210
+ ) {
197
211
  const secret = fromSingle(foreignSecret);
198
212
 
199
- await this.handlerAsTxe().txeDeploy(artifact, instance, secret);
213
+ await this.handlerAsTxe().deploy(artifact, instance, secret);
200
214
 
201
215
  return toForeignCallResult([
202
216
  toArray([
@@ -209,10 +223,11 @@ export class RPCTranslator {
209
223
  ]);
210
224
  }
211
225
 
212
- async txeCreateAccount(foreignSecret: ForeignCallSingle) {
226
+ // eslint-disable-next-line camelcase
227
+ async aztec_txe_createAccount(foreignSecret: ForeignCallSingle) {
213
228
  const secret = fromSingle(foreignSecret);
214
229
 
215
- const completeAddress = await this.handlerAsTxe().txeCreateAccount(secret);
230
+ const completeAddress = await this.handlerAsTxe().createAccount(secret);
216
231
 
217
232
  return toForeignCallResult([
218
233
  toSingle(completeAddress.address),
@@ -220,14 +235,15 @@ export class RPCTranslator {
220
235
  ]);
221
236
  }
222
237
 
223
- async txeAddAccount(
238
+ // eslint-disable-next-line camelcase
239
+ async aztec_txe_addAccount(
224
240
  artifact: ContractArtifact,
225
241
  instance: ContractInstanceWithAddress,
226
242
  foreignSecret: ForeignCallSingle,
227
243
  ) {
228
244
  const secret = fromSingle(foreignSecret);
229
245
 
230
- const completeAddress = await this.handlerAsTxe().txeAddAccount(artifact, instance, secret);
246
+ const completeAddress = await this.handlerAsTxe().addAccount(artifact, instance, secret);
231
247
 
232
248
  return toForeignCallResult([
233
249
  toSingle(completeAddress.address),
@@ -235,39 +251,44 @@ export class RPCTranslator {
235
251
  ]);
236
252
  }
237
253
 
238
- async txeAddAuthWitness(foreignAddress: ForeignCallSingle, foreignMessageHash: ForeignCallSingle) {
254
+ // eslint-disable-next-line camelcase
255
+ async aztec_txe_addAuthWitness(foreignAddress: ForeignCallSingle, foreignMessageHash: ForeignCallSingle) {
239
256
  const address = addressFromSingle(foreignAddress);
240
257
  const messageHash = fromSingle(foreignMessageHash);
241
258
 
242
- await this.handlerAsTxe().txeAddAuthWitness(address, messageHash);
259
+ await this.handlerAsTxe().addAuthWitness(address, messageHash);
243
260
 
244
261
  return toForeignCallResult([]);
245
262
  }
246
263
 
247
264
  // PXE oracles
248
265
 
249
- utilityAssertCompatibleOracleVersion(foreignVersion: ForeignCallSingle) {
266
+ // eslint-disable-next-line camelcase
267
+ aztec_utl_assertCompatibleOracleVersion(foreignVersion: ForeignCallSingle) {
250
268
  const version = fromSingle(foreignVersion).toNumber();
251
269
 
252
- this.handlerAsMisc().utilityAssertCompatibleOracleVersion(version);
270
+ this.handlerAsMisc().assertCompatibleOracleVersion(version);
253
271
 
254
272
  return toForeignCallResult([]);
255
273
  }
256
274
 
257
- utilityGetRandomField() {
258
- const randomField = this.handlerAsMisc().utilityGetRandomField();
275
+ // eslint-disable-next-line camelcase
276
+ aztec_utl_getRandomField() {
277
+ const randomField = this.handlerAsMisc().getRandomField();
259
278
 
260
279
  return toForeignCallResult([toSingle(randomField)]);
261
280
  }
262
281
 
263
- async txeGetLastBlockTimestamp() {
264
- const timestamp = await this.handlerAsTxe().txeGetLastBlockTimestamp();
282
+ // eslint-disable-next-line camelcase
283
+ async aztec_txe_getLastBlockTimestamp() {
284
+ const timestamp = await this.handlerAsTxe().getLastBlockTimestamp();
265
285
 
266
286
  return toForeignCallResult([toSingle(new Fr(timestamp))]);
267
287
  }
268
288
 
269
- async txeGetLastTxEffects() {
270
- const { txHash, noteHashes, nullifiers } = await this.handlerAsTxe().txeGetLastTxEffects();
289
+ // eslint-disable-next-line camelcase
290
+ async aztec_txe_getLastTxEffects() {
291
+ const { txHash, noteHashes, nullifiers } = await this.handlerAsTxe().getLastTxEffects();
271
292
 
272
293
  return toForeignCallResult([
273
294
  toSingle(txHash.hash),
@@ -276,7 +297,8 @@ export class RPCTranslator {
276
297
  ]);
277
298
  }
278
299
 
279
- async txeGetPrivateEvents(
300
+ // eslint-disable-next-line camelcase
301
+ async aztec_txe_getPrivateEvents(
280
302
  foreignSelector: ForeignCallSingle,
281
303
  foreignContractAddress: ForeignCallSingle,
282
304
  foreignScope: ForeignCallSingle,
@@ -285,7 +307,14 @@ export class RPCTranslator {
285
307
  const contractAddress = addressFromSingle(foreignContractAddress);
286
308
  const scope = addressFromSingle(foreignScope);
287
309
 
288
- const events = await this.handlerAsTxe().txeGetPrivateEvents(selector, contractAddress, scope);
310
+ // TODO(F-335): Avoid doing the following 2 calls here.
311
+ {
312
+ await this.handlerAsTxe().syncContractNonOracleMethod(contractAddress, scope, this.stateHandler.getCurrentJob());
313
+ // We cycle job to commit the stores after the contract sync.
314
+ await this.stateHandler.cycleJob();
315
+ }
316
+
317
+ const events = await this.handlerAsTxe().getPrivateEvents(selector, contractAddress, scope);
289
318
 
290
319
  if (events.length > MAX_PRIVATE_EVENTS_PER_TXE_QUERY) {
291
320
  throw new Error(`Array of length ${events.length} larger than maxLen ${MAX_PRIVATE_EVENTS_PER_TXE_QUERY}`);
@@ -309,26 +338,29 @@ export class RPCTranslator {
309
338
  return toForeignCallResult([toArray(rawArrayStorage), toArray(eventLengths), toSingle(queryLength)]);
310
339
  }
311
340
 
312
- privateStoreInExecutionCache(foreignValues: ForeignCallArray, foreignHash: ForeignCallSingle) {
341
+ // eslint-disable-next-line camelcase
342
+ aztec_prv_storeInExecutionCache(foreignValues: ForeignCallArray, foreignHash: ForeignCallSingle) {
313
343
  const values = fromArray(foreignValues);
314
344
  const hash = fromSingle(foreignHash);
315
345
 
316
- this.handlerAsPrivate().privateStoreInExecutionCache(values, hash);
346
+ this.handlerAsPrivate().storeInExecutionCache(values, hash);
317
347
 
318
348
  return toForeignCallResult([]);
319
349
  }
320
350
 
321
- async privateLoadFromExecutionCache(foreignHash: ForeignCallSingle) {
351
+ // eslint-disable-next-line camelcase
352
+ async aztec_prv_loadFromExecutionCache(foreignHash: ForeignCallSingle) {
322
353
  const hash = fromSingle(foreignHash);
323
354
 
324
- const returns = await this.handlerAsPrivate().privateLoadFromExecutionCache(hash);
355
+ const returns = await this.handlerAsPrivate().loadFromExecutionCache(hash);
325
356
 
326
357
  return toForeignCallResult([toArray(returns)]);
327
358
  }
328
359
 
329
360
  // When the argument is a slice, noir automatically adds a length field to oracle call.
330
361
  // When the argument is an array, we add the field length manually to the signature.
331
- utilityDebugLog(
362
+ // eslint-disable-next-line camelcase
363
+ async aztec_utl_log(
332
364
  foreignLevel: ForeignCallSingle,
333
365
  foreignMessage: ForeignCallArray,
334
366
  _foreignLength: ForeignCallSingle,
@@ -340,12 +372,13 @@ export class RPCTranslator {
340
372
  .join('');
341
373
  const fields = fromArray(foreignFields);
342
374
 
343
- this.handlerAsMisc().utilityDebugLog(level, message, fields);
375
+ await this.handlerAsMisc().log(level, message, fields);
344
376
 
345
377
  return toForeignCallResult([]);
346
378
  }
347
379
 
348
- async utilityStorageRead(
380
+ // eslint-disable-next-line camelcase
381
+ async aztec_utl_storageRead(
349
382
  foreignBlockHash: ForeignCallSingle,
350
383
  foreignContractAddress: ForeignCallSingle,
351
384
  foreignStartStorageSlot: ForeignCallSingle,
@@ -356,7 +389,7 @@ export class RPCTranslator {
356
389
  const startStorageSlot = fromSingle(foreignStartStorageSlot);
357
390
  const numberOfElements = fromSingle(foreignNumberOfElements).toNumber();
358
391
 
359
- const values = await this.handlerAsUtility().utilityStorageRead(
392
+ const values = await this.handlerAsUtility().storageRead(
360
393
  blockHash,
361
394
  contractAddress,
362
395
  startStorageSlot,
@@ -366,11 +399,12 @@ export class RPCTranslator {
366
399
  return toForeignCallResult([toArray(values)]);
367
400
  }
368
401
 
369
- async utilityGetPublicDataWitness(foreignBlockHash: ForeignCallSingle, foreignLeafSlot: ForeignCallSingle) {
402
+ // eslint-disable-next-line camelcase
403
+ async aztec_utl_getPublicDataWitness(foreignBlockHash: ForeignCallSingle, foreignLeafSlot: ForeignCallSingle) {
370
404
  const blockHash = new BlockHash(fromSingle(foreignBlockHash));
371
405
  const leafSlot = fromSingle(foreignLeafSlot);
372
406
 
373
- const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(blockHash, leafSlot);
407
+ const witness = await this.handlerAsUtility().getPublicDataWitness(blockHash, leafSlot);
374
408
 
375
409
  if (!witness) {
376
410
  throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockHash.toString()}.`);
@@ -378,7 +412,8 @@ export class RPCTranslator {
378
412
  return toForeignCallResult(witness.toNoirRepresentation());
379
413
  }
380
414
 
381
- async utilityGetNotes(
415
+ // eslint-disable-next-line camelcase
416
+ async aztec_utl_getNotes(
382
417
  foreignOwnerIsSome: ForeignCallSingle,
383
418
  foreignOwnerValue: ForeignCallSingle,
384
419
  foreignStorageSlot: ForeignCallSingle,
@@ -419,7 +454,7 @@ export class RPCTranslator {
419
454
  const maxNotes = fromSingle(foreignMaxNotes).toNumber();
420
455
  const packedHintedNoteLength = fromSingle(foreignPackedHintedNoteLength).toNumber();
421
456
 
422
- const noteDatas = await this.handlerAsUtility().utilityGetNotes(
457
+ const noteDatas = await this.handlerAsUtility().getNotes(
423
458
  owner,
424
459
  storageSlot,
425
460
  numSelects,
@@ -460,7 +495,8 @@ export class RPCTranslator {
460
495
  );
461
496
  }
462
497
 
463
- privateNotifyCreatedNote(
498
+ // eslint-disable-next-line camelcase
499
+ aztec_prv_notifyCreatedNote(
464
500
  foreignOwner: ForeignCallSingle,
465
501
  foreignStorageSlot: ForeignCallSingle,
466
502
  foreignRandomness: ForeignCallSingle,
@@ -477,20 +513,13 @@ export class RPCTranslator {
477
513
  const noteHash = fromSingle(foreignNoteHash);
478
514
  const counter = fromSingle(foreignCounter).toNumber();
479
515
 
480
- this.handlerAsPrivate().privateNotifyCreatedNote(
481
- owner,
482
- storageSlot,
483
- randomness,
484
- noteTypeId,
485
- note,
486
- noteHash,
487
- counter,
488
- );
516
+ this.handlerAsPrivate().notifyCreatedNote(owner, storageSlot, randomness, noteTypeId, note, noteHash, counter);
489
517
 
490
518
  return toForeignCallResult([]);
491
519
  }
492
520
 
493
- async privateNotifyNullifiedNote(
521
+ // eslint-disable-next-line camelcase
522
+ async aztec_prv_notifyNullifiedNote(
494
523
  foreignInnerNullifier: ForeignCallSingle,
495
524
  foreignNoteHash: ForeignCallSingle,
496
525
  foreignCounter: ForeignCallSingle,
@@ -499,40 +528,47 @@ export class RPCTranslator {
499
528
  const noteHash = fromSingle(foreignNoteHash);
500
529
  const counter = fromSingle(foreignCounter).toNumber();
501
530
 
502
- await this.handlerAsPrivate().privateNotifyNullifiedNote(innerNullifier, noteHash, counter);
531
+ await this.handlerAsPrivate().notifyNullifiedNote(innerNullifier, noteHash, counter);
503
532
 
504
533
  return toForeignCallResult([]);
505
534
  }
506
535
 
507
- async privateNotifyCreatedNullifier(foreignInnerNullifier: ForeignCallSingle) {
536
+ // eslint-disable-next-line camelcase
537
+ async aztec_prv_notifyCreatedNullifier(foreignInnerNullifier: ForeignCallSingle) {
508
538
  const innerNullifier = fromSingle(foreignInnerNullifier);
509
539
 
510
- await this.handlerAsPrivate().privateNotifyCreatedNullifier(innerNullifier);
540
+ await this.handlerAsPrivate().notifyCreatedNullifier(innerNullifier);
511
541
 
512
542
  return toForeignCallResult([]);
513
543
  }
514
544
 
515
- async privateIsNullifierPending(foreignInnerNullifier: ForeignCallSingle, foreignContractAddress: ForeignCallSingle) {
545
+ // eslint-disable-next-line camelcase
546
+ async aztec_prv_isNullifierPending(
547
+ foreignInnerNullifier: ForeignCallSingle,
548
+ foreignContractAddress: ForeignCallSingle,
549
+ ) {
516
550
  const innerNullifier = fromSingle(foreignInnerNullifier);
517
551
  const contractAddress = addressFromSingle(foreignContractAddress);
518
552
 
519
- const isPending = await this.handlerAsPrivate().privateIsNullifierPending(innerNullifier, contractAddress);
553
+ const isPending = await this.handlerAsPrivate().isNullifierPending(innerNullifier, contractAddress);
520
554
 
521
555
  return toForeignCallResult([toSingle(new Fr(isPending))]);
522
556
  }
523
557
 
524
- async utilityCheckNullifierExists(foreignInnerNullifier: ForeignCallSingle) {
558
+ // eslint-disable-next-line camelcase
559
+ async aztec_utl_checkNullifierExists(foreignInnerNullifier: ForeignCallSingle) {
525
560
  const innerNullifier = fromSingle(foreignInnerNullifier);
526
561
 
527
- const exists = await this.handlerAsUtility().utilityCheckNullifierExists(innerNullifier);
562
+ const exists = await this.handlerAsUtility().checkNullifierExists(innerNullifier);
528
563
 
529
564
  return toForeignCallResult([toSingle(new Fr(exists))]);
530
565
  }
531
566
 
532
- async utilityGetContractInstance(foreignAddress: ForeignCallSingle) {
567
+ // eslint-disable-next-line camelcase
568
+ async aztec_utl_getContractInstance(foreignAddress: ForeignCallSingle) {
533
569
  const address = addressFromSingle(foreignAddress);
534
570
 
535
- const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
571
+ const instance = await this.handlerAsUtility().getContractInstance(address);
536
572
 
537
573
  return toForeignCallResult(
538
574
  [
@@ -545,10 +581,11 @@ export class RPCTranslator {
545
581
  );
546
582
  }
547
583
 
548
- async utilityTryGetPublicKeysAndPartialAddress(foreignAddress: ForeignCallSingle) {
584
+ // eslint-disable-next-line camelcase
585
+ async aztec_utl_tryGetPublicKeysAndPartialAddress(foreignAddress: ForeignCallSingle) {
549
586
  const address = addressFromSingle(foreignAddress);
550
587
 
551
- const result = await this.handlerAsUtility().utilityTryGetPublicKeysAndPartialAddress(address);
588
+ const result = await this.handlerAsUtility().tryGetPublicKeysAndPartialAddress(address);
552
589
 
553
590
  // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
554
591
  // with two fields: `some` (a boolean) and `value` (a field array in this case).
@@ -564,15 +601,17 @@ export class RPCTranslator {
564
601
  }
565
602
  }
566
603
 
567
- async utilityGetKeyValidationRequest(foreignPkMHash: ForeignCallSingle) {
604
+ // eslint-disable-next-line camelcase
605
+ async aztec_utl_getKeyValidationRequest(foreignPkMHash: ForeignCallSingle) {
568
606
  const pkMHash = fromSingle(foreignPkMHash);
569
607
 
570
- const keyValidationRequest = await this.handlerAsUtility().utilityGetKeyValidationRequest(pkMHash);
608
+ const keyValidationRequest = await this.handlerAsUtility().getKeyValidationRequest(pkMHash);
571
609
 
572
610
  return toForeignCallResult(keyValidationRequest.toFields().map(toSingle));
573
611
  }
574
612
 
575
- privateCallPrivateFunction(
613
+ // eslint-disable-next-line camelcase
614
+ aztec_prv_callPrivateFunction(
576
615
  _foreignTargetContractAddress: ForeignCallSingle,
577
616
  _foreignFunctionSelector: ForeignCallSingle,
578
617
  _foreignArgsHash: ForeignCallSingle,
@@ -584,11 +623,15 @@ export class RPCTranslator {
584
623
  );
585
624
  }
586
625
 
587
- async utilityGetNullifierMembershipWitness(foreignBlockHash: ForeignCallSingle, foreignNullifier: ForeignCallSingle) {
626
+ // eslint-disable-next-line camelcase
627
+ async aztec_utl_getNullifierMembershipWitness(
628
+ foreignBlockHash: ForeignCallSingle,
629
+ foreignNullifier: ForeignCallSingle,
630
+ ) {
588
631
  const blockHash = new BlockHash(fromSingle(foreignBlockHash));
589
632
  const nullifier = fromSingle(foreignNullifier);
590
633
 
591
- const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(blockHash, nullifier);
634
+ const witness = await this.handlerAsUtility().getNullifierMembershipWitness(blockHash, nullifier);
592
635
 
593
636
  if (!witness) {
594
637
  throw new Error(`Nullifier membership witness not found at block ${blockHash}.`);
@@ -596,10 +639,11 @@ export class RPCTranslator {
596
639
  return toForeignCallResult(witness.toNoirRepresentation());
597
640
  }
598
641
 
599
- async utilityGetAuthWitness(foreignMessageHash: ForeignCallSingle) {
642
+ // eslint-disable-next-line camelcase
643
+ async aztec_utl_getAuthWitness(foreignMessageHash: ForeignCallSingle) {
600
644
  const messageHash = fromSingle(foreignMessageHash);
601
645
 
602
- const authWitness = await this.handlerAsUtility().utilityGetAuthWitness(messageHash);
646
+ const authWitness = await this.handlerAsUtility().getAuthWitness(messageHash);
603
647
 
604
648
  if (!authWitness) {
605
649
  throw new Error(`Auth witness not found for message hash ${messageHash}.`);
@@ -607,44 +651,35 @@ export class RPCTranslator {
607
651
  return toForeignCallResult([toArray(authWitness)]);
608
652
  }
609
653
 
610
- public privateNotifyEnqueuedPublicFunctionCall(
611
- _foreignTargetContractAddress: ForeignCallSingle,
612
- _foreignCalldataHash: ForeignCallSingle,
613
- _foreignSideEffectCounter: ForeignCallSingle,
614
- _foreignIsStaticCall: ForeignCallSingle,
615
- ) {
616
- throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
617
- }
618
-
619
- public privateNotifySetPublicTeardownFunctionCall(
620
- _foreignTargetContractAddress: ForeignCallSingle,
621
- _foreignCalldataHash: ForeignCallSingle,
622
- _foreignSideEffectCounter: ForeignCallSingle,
623
- _foreignIsStaticCall: ForeignCallSingle,
624
- ) {
654
+ // eslint-disable-next-line camelcase
655
+ public aztec_prv_validatePublicCalldata(_foreignCalldataHash: ForeignCallSingle) {
625
656
  throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
626
657
  }
627
658
 
628
- public privateNotifySetMinRevertibleSideEffectCounter(_foreignMinRevertibleSideEffectCounter: ForeignCallSingle) {
659
+ // eslint-disable-next-line camelcase
660
+ public aztec_prv_notifyRevertiblePhaseStart(_foreignMinRevertibleSideEffectCounter: ForeignCallSingle) {
629
661
  throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
630
662
  }
631
663
 
632
- public async privateIsSideEffectCounterRevertible(foreignSideEffectCounter: ForeignCallSingle) {
664
+ // eslint-disable-next-line camelcase
665
+ public async aztec_prv_inRevertiblePhase(foreignSideEffectCounter: ForeignCallSingle) {
633
666
  const sideEffectCounter = fromSingle(foreignSideEffectCounter).toNumber();
634
- const isRevertible = await this.handlerAsPrivate().privateIsSideEffectCounterRevertible(sideEffectCounter);
667
+ const isRevertible = await this.handlerAsPrivate().inRevertiblePhase(sideEffectCounter);
635
668
  return toForeignCallResult([toSingle(new Fr(isRevertible))]);
636
669
  }
637
670
 
638
- utilityGetUtilityContext() {
639
- const context = this.handlerAsUtility().utilityGetUtilityContext();
671
+ // eslint-disable-next-line camelcase
672
+ aztec_utl_getUtilityContext() {
673
+ const context = this.handlerAsUtility().getUtilityContext();
640
674
 
641
675
  return toForeignCallResult(context.toNoirRepresentation());
642
676
  }
643
677
 
644
- async utilityGetBlockHeader(foreignBlockNumber: ForeignCallSingle) {
678
+ // eslint-disable-next-line camelcase
679
+ async aztec_utl_getBlockHeader(foreignBlockNumber: ForeignCallSingle) {
645
680
  const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
646
681
 
647
- const header = await this.handlerAsUtility().utilityGetBlockHeader(blockNumber);
682
+ const header = await this.handlerAsUtility().getBlockHeader(blockNumber);
648
683
 
649
684
  if (!header) {
650
685
  throw new Error(`Block header not found for block ${blockNumber}.`);
@@ -652,14 +687,15 @@ export class RPCTranslator {
652
687
  return toForeignCallResult(header.toFields().map(toSingle));
653
688
  }
654
689
 
655
- async utilityGetNoteHashMembershipWitness(
690
+ // eslint-disable-next-line camelcase
691
+ async aztec_utl_getNoteHashMembershipWitness(
656
692
  foreignAnchorBlockHash: ForeignCallSingle,
657
693
  foreignNoteHash: ForeignCallSingle,
658
694
  ) {
659
695
  const blockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
660
696
  const noteHash = fromSingle(foreignNoteHash);
661
697
 
662
- const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(blockHash, noteHash);
698
+ const witness = await this.handlerAsUtility().getNoteHashMembershipWitness(blockHash, noteHash);
663
699
 
664
700
  if (!witness) {
665
701
  throw new Error(`Note hash ${noteHash} not found in the note hash tree at block ${blockHash.toString()}.`);
@@ -667,14 +703,15 @@ export class RPCTranslator {
667
703
  return toForeignCallResult(witness.toNoirRepresentation());
668
704
  }
669
705
 
670
- async utilityGetBlockHashMembershipWitness(
706
+ // eslint-disable-next-line camelcase
707
+ async aztec_utl_getBlockHashMembershipWitness(
671
708
  foreignAnchorBlockHash: ForeignCallSingle,
672
709
  foreignBlockHash: ForeignCallSingle,
673
710
  ) {
674
711
  const anchorBlockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
675
712
  const blockHash = new BlockHash(fromSingle(foreignBlockHash));
676
713
 
677
- const witness = await this.handlerAsUtility().utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash);
714
+ const witness = await this.handlerAsUtility().getBlockHashMembershipWitness(anchorBlockHash, blockHash);
678
715
 
679
716
  if (!witness) {
680
717
  throw new Error(
@@ -684,14 +721,15 @@ export class RPCTranslator {
684
721
  return toForeignCallResult(witness.toNoirRepresentation());
685
722
  }
686
723
 
687
- async utilityGetLowNullifierMembershipWitness(
724
+ // eslint-disable-next-line camelcase
725
+ async aztec_utl_getLowNullifierMembershipWitness(
688
726
  foreignBlockHash: ForeignCallSingle,
689
727
  foreignNullifier: ForeignCallSingle,
690
728
  ) {
691
729
  const blockHash = new BlockHash(fromSingle(foreignBlockHash));
692
730
  const nullifier = fromSingle(foreignNullifier);
693
731
 
694
- const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(blockHash, nullifier);
732
+ const witness = await this.handlerAsUtility().getLowNullifierMembershipWitness(blockHash, nullifier);
695
733
 
696
734
  if (!witness) {
697
735
  throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockHash}.`);
@@ -699,33 +737,42 @@ export class RPCTranslator {
699
737
  return toForeignCallResult(witness.toNoirRepresentation());
700
738
  }
701
739
 
702
- async utilityFetchTaggedLogs(foreignPendingTaggedLogArrayBaseSlot: ForeignCallSingle) {
740
+ // eslint-disable-next-line camelcase
741
+ async aztec_utl_fetchTaggedLogs(foreignPendingTaggedLogArrayBaseSlot: ForeignCallSingle) {
703
742
  const pendingTaggedLogArrayBaseSlot = fromSingle(foreignPendingTaggedLogArrayBaseSlot);
704
743
 
705
- await this.handlerAsUtility().utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
744
+ await this.handlerAsUtility().fetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
706
745
 
707
746
  return toForeignCallResult([]);
708
747
  }
709
748
 
710
- public async utilityValidateAndStoreEnqueuedNotesAndEvents(
749
+ // eslint-disable-next-line camelcase
750
+ public async aztec_utl_validateAndStoreEnqueuedNotesAndEvents(
711
751
  foreignContractAddress: ForeignCallSingle,
712
752
  foreignNoteValidationRequestsArrayBaseSlot: ForeignCallSingle,
713
753
  foreignEventValidationRequestsArrayBaseSlot: ForeignCallSingle,
754
+ foreignMaxNotePackedLen: ForeignCallSingle,
755
+ foreignMaxEventSerializedLen: ForeignCallSingle,
714
756
  ) {
715
757
  const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
716
758
  const noteValidationRequestsArrayBaseSlot = fromSingle(foreignNoteValidationRequestsArrayBaseSlot);
717
759
  const eventValidationRequestsArrayBaseSlot = fromSingle(foreignEventValidationRequestsArrayBaseSlot);
760
+ const maxNotePackedLen = fromSingle(foreignMaxNotePackedLen).toNumber();
761
+ const maxEventSerializedLen = fromSingle(foreignMaxEventSerializedLen).toNumber();
718
762
 
719
- await this.handlerAsUtility().utilityValidateAndStoreEnqueuedNotesAndEvents(
763
+ await this.handlerAsUtility().validateAndStoreEnqueuedNotesAndEvents(
720
764
  contractAddress,
721
765
  noteValidationRequestsArrayBaseSlot,
722
766
  eventValidationRequestsArrayBaseSlot,
767
+ maxNotePackedLen,
768
+ maxEventSerializedLen,
723
769
  );
724
770
 
725
771
  return toForeignCallResult([]);
726
772
  }
727
773
 
728
- public async utilityBulkRetrieveLogs(
774
+ // eslint-disable-next-line camelcase
775
+ public async aztec_utl_bulkRetrieveLogs(
729
776
  foreignContractAddress: ForeignCallSingle,
730
777
  foreignLogRetrievalRequestsArrayBaseSlot: ForeignCallSingle,
731
778
  foreignLogRetrievalResponsesArrayBaseSlot: ForeignCallSingle,
@@ -734,7 +781,7 @@ export class RPCTranslator {
734
781
  const logRetrievalRequestsArrayBaseSlot = fromSingle(foreignLogRetrievalRequestsArrayBaseSlot);
735
782
  const logRetrievalResponsesArrayBaseSlot = fromSingle(foreignLogRetrievalResponsesArrayBaseSlot);
736
783
 
737
- await this.handlerAsUtility().utilityBulkRetrieveLogs(
784
+ await this.handlerAsUtility().bulkRetrieveLogs(
738
785
  contractAddress,
739
786
  logRetrievalRequestsArrayBaseSlot,
740
787
  logRetrievalResponsesArrayBaseSlot,
@@ -743,7 +790,8 @@ export class RPCTranslator {
743
790
  return toForeignCallResult([]);
744
791
  }
745
792
 
746
- async utilityStoreCapsule(
793
+ // eslint-disable-next-line camelcase
794
+ async aztec_utl_storeCapsule(
747
795
  foreignContractAddress: ForeignCallSingle,
748
796
  foreignSlot: ForeignCallSingle,
749
797
  foreignCapsule: ForeignCallArray,
@@ -752,12 +800,13 @@ export class RPCTranslator {
752
800
  const slot = fromSingle(foreignSlot);
753
801
  const capsule = fromArray(foreignCapsule);
754
802
 
755
- await this.handlerAsUtility().utilityStoreCapsule(contractAddress, slot, capsule);
803
+ await this.handlerAsUtility().storeCapsule(contractAddress, slot, capsule);
756
804
 
757
805
  return toForeignCallResult([]);
758
806
  }
759
807
 
760
- async utilityLoadCapsule(
808
+ // eslint-disable-next-line camelcase
809
+ async aztec_utl_loadCapsule(
761
810
  foreignContractAddress: ForeignCallSingle,
762
811
  foreignSlot: ForeignCallSingle,
763
812
  foreignTSize: ForeignCallSingle,
@@ -766,7 +815,7 @@ export class RPCTranslator {
766
815
  const slot = fromSingle(foreignSlot);
767
816
  const tSize = fromSingle(foreignTSize).toNumber();
768
817
 
769
- const values = await this.handlerAsUtility().utilityLoadCapsule(contractAddress, slot);
818
+ const values = await this.handlerAsUtility().loadCapsule(contractAddress, slot);
770
819
 
771
820
  // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
772
821
  // with two fields: `some` (a boolean) and `value` (a field array in this case).
@@ -779,16 +828,18 @@ export class RPCTranslator {
779
828
  }
780
829
  }
781
830
 
782
- async utilityDeleteCapsule(foreignContractAddress: ForeignCallSingle, foreignSlot: ForeignCallSingle) {
831
+ // eslint-disable-next-line camelcase
832
+ async aztec_utl_deleteCapsule(foreignContractAddress: ForeignCallSingle, foreignSlot: ForeignCallSingle) {
783
833
  const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
784
834
  const slot = fromSingle(foreignSlot);
785
835
 
786
- await this.handlerAsUtility().utilityDeleteCapsule(contractAddress, slot);
836
+ await this.handlerAsUtility().deleteCapsule(contractAddress, slot);
787
837
 
788
838
  return toForeignCallResult([]);
789
839
  }
790
840
 
791
- async utilityCopyCapsule(
841
+ // eslint-disable-next-line camelcase
842
+ async aztec_utl_copyCapsule(
792
843
  foreignContractAddress: ForeignCallSingle,
793
844
  foreignSrcSlot: ForeignCallSingle,
794
845
  foreignDstSlot: ForeignCallSingle,
@@ -799,7 +850,7 @@ export class RPCTranslator {
799
850
  const dstSlot = fromSingle(foreignDstSlot);
800
851
  const numEntries = fromSingle(foreignNumEntries).toNumber();
801
852
 
802
- await this.handlerAsUtility().utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
853
+ await this.handlerAsUtility().copyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
803
854
 
804
855
  return toForeignCallResult([]);
805
856
  }
@@ -808,7 +859,8 @@ export class RPCTranslator {
808
859
  // The compiler didn't throw an error, so it took me a while to learn of the existence of this file, and that I need
809
860
  // to implement this function here. Isn't there a way to programmatically identify that this is missing, given the
810
861
  // existence of a txe_oracle method?
811
- async utilityAes128Decrypt(
862
+ // eslint-disable-next-line camelcase
863
+ async aztec_utl_aes128Decrypt(
812
864
  foreignCiphertextBVecStorage: ForeignCallArray,
813
865
  foreignCiphertextLength: ForeignCallSingle,
814
866
  foreignIv: ForeignCallArray,
@@ -818,14 +870,15 @@ export class RPCTranslator {
818
870
  const iv = fromUintArray(foreignIv, 8);
819
871
  const symKey = fromUintArray(foreignSymKey, 8);
820
872
 
821
- const plaintextBuffer = await this.handlerAsUtility().utilityAes128Decrypt(ciphertext, iv, symKey);
873
+ const plaintextBuffer = await this.handlerAsUtility().aes128Decrypt(ciphertext, iv, symKey);
822
874
 
823
875
  return toForeignCallResult(
824
876
  arrayToBoundedVec(bufferToU8Array(plaintextBuffer), foreignCiphertextBVecStorage.length),
825
877
  );
826
878
  }
827
879
 
828
- async utilityGetSharedSecret(
880
+ // eslint-disable-next-line camelcase
881
+ async aztec_utl_getSharedSecret(
829
882
  foreignAddress: ForeignCallSingle,
830
883
  foreignEphPKField0: ForeignCallSingle,
831
884
  foreignEphPKField1: ForeignCallSingle,
@@ -838,44 +891,49 @@ export class RPCTranslator {
838
891
  fromSingle(foreignEphPKField2),
839
892
  ]);
840
893
 
841
- const secret = await this.handlerAsUtility().utilityGetSharedSecret(address, ephPK);
894
+ const secret = await this.handlerAsUtility().getSharedSecret(address, ephPK);
842
895
 
843
896
  return toForeignCallResult(secret.toFields().map(toSingle));
844
897
  }
845
898
 
846
- emitOffchainEffect(_foreignData: ForeignCallArray) {
899
+ // eslint-disable-next-line camelcase
900
+ aztec_utl_emitOffchainEffect(_foreignData: ForeignCallArray) {
847
901
  throw new Error('Offchain effects are not yet supported in the TestEnvironment');
848
902
  }
849
903
 
850
904
  // AVM opcodes
851
905
 
852
- avmOpcodeEmitUnencryptedLog(_foreignMessage: ForeignCallArray) {
906
+ // eslint-disable-next-line camelcase
907
+ aztec_avm_emitPublicLog(_foreignMessage: ForeignCallArray) {
853
908
  // TODO(#8811): Implement
854
909
  return toForeignCallResult([]);
855
910
  }
856
911
 
857
- async avmOpcodeStorageRead(foreignSlot: ForeignCallSingle, foreignContractAddress: ForeignCallSingle) {
912
+ // eslint-disable-next-line camelcase
913
+ async aztec_avm_storageRead(foreignSlot: ForeignCallSingle, foreignContractAddress: ForeignCallSingle) {
858
914
  const slot = fromSingle(foreignSlot);
859
915
  const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
860
916
 
861
- const value = (await this.handlerAsAvm().avmOpcodeStorageRead(slot, contractAddress)).value;
917
+ const value = (await this.handlerAsAvm().storageRead(slot, contractAddress)).value;
862
918
 
863
919
  return toForeignCallResult([toSingle(new Fr(value))]);
864
920
  }
865
921
 
866
- async avmOpcodeStorageWrite(foreignSlot: ForeignCallSingle, foreignValue: ForeignCallSingle) {
922
+ // eslint-disable-next-line camelcase
923
+ async aztec_avm_storageWrite(foreignSlot: ForeignCallSingle, foreignValue: ForeignCallSingle) {
867
924
  const slot = fromSingle(foreignSlot);
868
925
  const value = fromSingle(foreignValue);
869
926
 
870
- await this.handlerAsAvm().avmOpcodeStorageWrite(slot, value);
927
+ await this.handlerAsAvm().storageWrite(slot, value);
871
928
 
872
929
  return toForeignCallResult([]);
873
930
  }
874
931
 
875
- async avmOpcodeGetContractInstanceDeployer(foreignAddress: ForeignCallSingle) {
932
+ // eslint-disable-next-line camelcase
933
+ async aztec_avm_getContractInstanceDeployer(foreignAddress: ForeignCallSingle) {
876
934
  const address = addressFromSingle(foreignAddress);
877
935
 
878
- const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
936
+ const instance = await this.handlerAsUtility().getContractInstance(address);
879
937
 
880
938
  return toForeignCallResult([
881
939
  toSingle(instance.deployer),
@@ -884,10 +942,11 @@ export class RPCTranslator {
884
942
  ]);
885
943
  }
886
944
 
887
- async avmOpcodeGetContractInstanceClassId(foreignAddress: ForeignCallSingle) {
945
+ // eslint-disable-next-line camelcase
946
+ async aztec_avm_getContractInstanceClassId(foreignAddress: ForeignCallSingle) {
888
947
  const address = addressFromSingle(foreignAddress);
889
948
 
890
- const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
949
+ const instance = await this.handlerAsUtility().getContractInstance(address);
891
950
 
892
951
  return toForeignCallResult([
893
952
  toSingle(instance.currentContractClassId),
@@ -896,10 +955,11 @@ export class RPCTranslator {
896
955
  ]);
897
956
  }
898
957
 
899
- async avmOpcodeGetContractInstanceInitializationHash(foreignAddress: ForeignCallSingle) {
958
+ // eslint-disable-next-line camelcase
959
+ async aztec_avm_getContractInstanceInitializationHash(foreignAddress: ForeignCallSingle) {
900
960
  const address = addressFromSingle(foreignAddress);
901
961
 
902
- const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
962
+ const instance = await this.handlerAsUtility().getContractInstance(address);
903
963
 
904
964
  return toForeignCallResult([
905
965
  toSingle(instance.initializationHash),
@@ -908,85 +968,98 @@ export class RPCTranslator {
908
968
  ]);
909
969
  }
910
970
 
911
- async avmOpcodeSender() {
912
- const sender = await this.handlerAsAvm().avmOpcodeSender();
971
+ // eslint-disable-next-line camelcase
972
+ async aztec_avm_sender() {
973
+ const sender = await this.handlerAsAvm().sender();
913
974
 
914
975
  return toForeignCallResult([toSingle(sender)]);
915
976
  }
916
977
 
917
- async avmOpcodeEmitNullifier(foreignNullifier: ForeignCallSingle) {
978
+ // eslint-disable-next-line camelcase
979
+ async aztec_avm_emitNullifier(foreignNullifier: ForeignCallSingle) {
918
980
  const nullifier = fromSingle(foreignNullifier);
919
981
 
920
- await this.handlerAsAvm().avmOpcodeEmitNullifier(nullifier);
982
+ await this.handlerAsAvm().emitNullifier(nullifier);
921
983
 
922
984
  return toForeignCallResult([]);
923
985
  }
924
986
 
925
- async avmOpcodeEmitNoteHash(foreignNoteHash: ForeignCallSingle) {
987
+ // eslint-disable-next-line camelcase
988
+ async aztec_avm_emitNoteHash(foreignNoteHash: ForeignCallSingle) {
926
989
  const noteHash = fromSingle(foreignNoteHash);
927
990
 
928
- await this.handlerAsAvm().avmOpcodeEmitNoteHash(noteHash);
991
+ await this.handlerAsAvm().emitNoteHash(noteHash);
929
992
 
930
993
  return toForeignCallResult([]);
931
994
  }
932
995
 
933
- async avmOpcodeNullifierExists(foreignSiloedNullifier: ForeignCallSingle) {
996
+ // eslint-disable-next-line camelcase
997
+ async aztec_avm_nullifierExists(foreignSiloedNullifier: ForeignCallSingle) {
934
998
  const siloedNullifier = fromSingle(foreignSiloedNullifier);
935
999
 
936
- const exists = await this.handlerAsAvm().avmOpcodeNullifierExists(siloedNullifier);
1000
+ const exists = await this.handlerAsAvm().nullifierExists(siloedNullifier);
937
1001
 
938
1002
  return toForeignCallResult([toSingle(new Fr(exists))]);
939
1003
  }
940
1004
 
941
- async avmOpcodeAddress() {
942
- const contractAddress = await this.handlerAsAvm().avmOpcodeAddress();
1005
+ // eslint-disable-next-line camelcase
1006
+ async aztec_avm_address() {
1007
+ const contractAddress = await this.handlerAsAvm().address();
943
1008
 
944
1009
  return toForeignCallResult([toSingle(contractAddress.toField())]);
945
1010
  }
946
1011
 
947
- async avmOpcodeBlockNumber() {
948
- const blockNumber = await this.handlerAsAvm().avmOpcodeBlockNumber();
1012
+ // eslint-disable-next-line camelcase
1013
+ async aztec_avm_blockNumber() {
1014
+ const blockNumber = await this.handlerAsAvm().blockNumber();
949
1015
 
950
1016
  return toForeignCallResult([toSingle(new Fr(blockNumber))]);
951
1017
  }
952
1018
 
953
- async avmOpcodeTimestamp() {
954
- const timestamp = await this.handlerAsAvm().avmOpcodeTimestamp();
1019
+ // eslint-disable-next-line camelcase
1020
+ async aztec_avm_timestamp() {
1021
+ const timestamp = await this.handlerAsAvm().timestamp();
955
1022
 
956
1023
  return toForeignCallResult([toSingle(new Fr(timestamp))]);
957
1024
  }
958
1025
 
959
- async avmOpcodeIsStaticCall() {
960
- const isStaticCall = await this.handlerAsAvm().avmOpcodeIsStaticCall();
1026
+ // eslint-disable-next-line camelcase
1027
+ async aztec_avm_isStaticCall() {
1028
+ const isStaticCall = await this.handlerAsAvm().isStaticCall();
961
1029
 
962
1030
  return toForeignCallResult([toSingle(new Fr(isStaticCall ? 1 : 0))]);
963
1031
  }
964
1032
 
965
- async avmOpcodeChainId() {
966
- const chainId = await this.handlerAsAvm().avmOpcodeChainId();
1033
+ // eslint-disable-next-line camelcase
1034
+ async aztec_avm_chainId() {
1035
+ const chainId = await this.handlerAsAvm().chainId();
967
1036
 
968
1037
  return toForeignCallResult([toSingle(chainId)]);
969
1038
  }
970
1039
 
971
- async avmOpcodeVersion() {
972
- const version = await this.handlerAsAvm().avmOpcodeVersion();
1040
+ // eslint-disable-next-line camelcase
1041
+ async aztec_avm_version() {
1042
+ const version = await this.handlerAsAvm().version();
973
1043
 
974
1044
  return toForeignCallResult([toSingle(version)]);
975
1045
  }
976
1046
 
977
- avmOpcodeReturndataSize() {
1047
+ // eslint-disable-next-line camelcase
1048
+ aztec_avm_returndataSize() {
978
1049
  throw new Error(
979
1050
  'Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead',
980
1051
  );
981
1052
  }
982
1053
 
983
- avmOpcodeReturndataCopy(_foreignRdOffset: ForeignCallSingle, _foreignCopySize: ForeignCallSingle) {
1054
+ // eslint-disable-next-line camelcase
1055
+ aztec_avm_returndataCopy(_foreignRdOffset: ForeignCallSingle, _foreignCopySize: ForeignCallSingle) {
984
1056
  throw new Error(
985
1057
  'Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead',
986
1058
  );
987
1059
  }
988
1060
 
989
- avmOpcodeCall(
1061
+ // eslint-disable-next-line camelcase
1062
+ aztec_avm_call(
990
1063
  _foreignL2Gas: ForeignCallSingle,
991
1064
  _foreignDaGas: ForeignCallSingle,
992
1065
  _foreignAddress: ForeignCallSingle,
@@ -998,7 +1071,8 @@ export class RPCTranslator {
998
1071
  );
999
1072
  }
1000
1073
 
1001
- avmOpcodeStaticCall(
1074
+ // eslint-disable-next-line camelcase
1075
+ aztec_avm_staticCall(
1002
1076
  _foreignL2Gas: ForeignCallSingle,
1003
1077
  _foreignDaGas: ForeignCallSingle,
1004
1078
  _foreignAddress: ForeignCallSingle,
@@ -1010,13 +1084,15 @@ export class RPCTranslator {
1010
1084
  );
1011
1085
  }
1012
1086
 
1013
- avmOpcodeSuccessCopy() {
1087
+ // eslint-disable-next-line camelcase
1088
+ aztec_avm_successCopy() {
1014
1089
  throw new Error(
1015
1090
  'Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead',
1016
1091
  );
1017
1092
  }
1018
1093
 
1019
- async txePrivateCallNewFlow(
1094
+ // eslint-disable-next-line camelcase
1095
+ async aztec_txe_privateCallNewFlow(
1020
1096
  foreignFrom: ForeignCallSingle,
1021
1097
  foreignTargetContractAddress: ForeignCallSingle,
1022
1098
  foreignFunctionSelector: ForeignCallSingle,
@@ -1031,19 +1107,23 @@ export class RPCTranslator {
1031
1107
  const argsHash = fromSingle(foreignArgsHash);
1032
1108
  const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
1033
1109
 
1034
- const returnValues = await this.handlerAsTxe().txePrivateCallNewFlow(
1110
+ const returnValues = await this.handlerAsTxe().privateCallNewFlow(
1035
1111
  from,
1036
1112
  targetContractAddress,
1037
1113
  functionSelector,
1038
1114
  args,
1039
1115
  argsHash,
1040
1116
  isStaticCall,
1117
+ this.stateHandler.getCurrentJob(),
1041
1118
  );
1042
1119
 
1120
+ // TODO(F-335): Avoid doing the following call here.
1121
+ await this.stateHandler.cycleJob();
1043
1122
  return toForeignCallResult([toArray(returnValues)]);
1044
1123
  }
1045
1124
 
1046
- async txeSimulateUtilityFunction(
1125
+ // eslint-disable-next-line camelcase
1126
+ async aztec_txe_executeUtilityFunction(
1047
1127
  foreignTargetContractAddress: ForeignCallSingle,
1048
1128
  foreignFunctionSelector: ForeignCallSingle,
1049
1129
  foreignArgs: ForeignCallArray,
@@ -1052,16 +1132,20 @@ export class RPCTranslator {
1052
1132
  const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
1053
1133
  const args = fromArray(foreignArgs);
1054
1134
 
1055
- const returnValues = await this.handlerAsTxe().txeSimulateUtilityFunction(
1135
+ const returnValues = await this.handlerAsTxe().executeUtilityFunction(
1056
1136
  targetContractAddress,
1057
1137
  functionSelector,
1058
1138
  args,
1139
+ this.stateHandler.getCurrentJob(),
1059
1140
  );
1060
1141
 
1142
+ // TODO(F-335): Avoid doing the following call here.
1143
+ await this.stateHandler.cycleJob();
1061
1144
  return toForeignCallResult([toArray(returnValues)]);
1062
1145
  }
1063
1146
 
1064
- async txePublicCallNewFlow(
1147
+ // eslint-disable-next-line camelcase
1148
+ async aztec_txe_publicCallNewFlow(
1065
1149
  foreignFrom: ForeignCallSingle,
1066
1150
  foreignAddress: ForeignCallSingle,
1067
1151
  foreignCalldata: ForeignCallArray,
@@ -1072,13 +1156,16 @@ export class RPCTranslator {
1072
1156
  const calldata = fromArray(foreignCalldata);
1073
1157
  const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
1074
1158
 
1075
- const returnValues = await this.handlerAsTxe().txePublicCallNewFlow(from, address, calldata, isStaticCall);
1159
+ const returnValues = await this.handlerAsTxe().publicCallNewFlow(from, address, calldata, isStaticCall);
1076
1160
 
1161
+ // TODO(F-335): Avoid doing the following call here.
1162
+ await this.stateHandler.cycleJob();
1077
1163
  return toForeignCallResult([toArray(returnValues)]);
1078
1164
  }
1079
1165
 
1080
- async privateGetSenderForTags() {
1081
- const sender = await this.handlerAsPrivate().privateGetSenderForTags();
1166
+ // eslint-disable-next-line camelcase
1167
+ async aztec_prv_getSenderForTags() {
1168
+ const sender = await this.handlerAsPrivate().getSenderForTags();
1082
1169
 
1083
1170
  // Return a Noir Option struct with `some` and `value` fields
1084
1171
  if (sender === undefined) {
@@ -1090,19 +1177,21 @@ export class RPCTranslator {
1090
1177
  }
1091
1178
  }
1092
1179
 
1093
- async privateSetSenderForTags(foreignSenderForTags: ForeignCallSingle) {
1180
+ // eslint-disable-next-line camelcase
1181
+ async aztec_prv_setSenderForTags(foreignSenderForTags: ForeignCallSingle) {
1094
1182
  const senderForTags = AztecAddress.fromField(fromSingle(foreignSenderForTags));
1095
1183
 
1096
- await this.handlerAsPrivate().privateSetSenderForTags(senderForTags);
1184
+ await this.handlerAsPrivate().setSenderForTags(senderForTags);
1097
1185
 
1098
1186
  return toForeignCallResult([]);
1099
1187
  }
1100
1188
 
1101
- async privateGetNextAppTagAsSender(foreignSender: ForeignCallSingle, foreignRecipient: ForeignCallSingle) {
1189
+ // eslint-disable-next-line camelcase
1190
+ async aztec_prv_getNextAppTagAsSender(foreignSender: ForeignCallSingle, foreignRecipient: ForeignCallSingle) {
1102
1191
  const sender = AztecAddress.fromField(fromSingle(foreignSender));
1103
1192
  const recipient = AztecAddress.fromField(fromSingle(foreignRecipient));
1104
1193
 
1105
- const nextAppTag = await this.handlerAsPrivate().privateGetNextAppTagAsSender(sender, recipient);
1194
+ const nextAppTag = await this.handlerAsPrivate().getNextAppTagAsSender(sender, recipient);
1106
1195
 
1107
1196
  return toForeignCallResult([toSingle(nextAppTag.value)]);
1108
1197
  }