@aztec/simulator 0.72.1 → 0.73.0

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 (114) hide show
  1. package/README.md +1 -1
  2. package/dest/avm/avm_simulator.d.ts +0 -1
  3. package/dest/avm/avm_simulator.d.ts.map +1 -1
  4. package/dest/avm/avm_simulator.js +4 -19
  5. package/dest/avm/avm_tree.d.ts +9 -8
  6. package/dest/avm/avm_tree.d.ts.map +1 -1
  7. package/dest/avm/avm_tree.js +35 -30
  8. package/dest/avm/fixtures/avm_simulation_tester.d.ts +21 -0
  9. package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +1 -0
  10. package/dest/avm/fixtures/avm_simulation_tester.js +74 -0
  11. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +35 -0
  12. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -0
  13. package/dest/avm/fixtures/base_avm_simulation_tester.js +76 -0
  14. package/dest/avm/fixtures/index.d.ts +6 -2
  15. package/dest/avm/fixtures/index.d.ts.map +1 -1
  16. package/dest/avm/fixtures/index.js +28 -14
  17. package/dest/avm/fixtures/simple_contract_data_source.d.ts +31 -0
  18. package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +1 -0
  19. package/dest/avm/fixtures/simple_contract_data_source.js +75 -0
  20. package/dest/avm/journal/journal.d.ts +3 -3
  21. package/dest/avm/journal/journal.d.ts.map +1 -1
  22. package/dest/avm/journal/journal.js +24 -21
  23. package/dest/avm/opcodes/accrued_substate.js +2 -2
  24. package/dest/avm/opcodes/hashing.js +2 -2
  25. package/dest/avm/test_utils.d.ts +1 -1
  26. package/dest/avm/test_utils.d.ts.map +1 -1
  27. package/dest/avm/test_utils.js +4 -3
  28. package/dest/client/client_execution_context.d.ts +1 -1
  29. package/dest/client/client_execution_context.d.ts.map +1 -1
  30. package/dest/client/client_execution_context.js +21 -18
  31. package/dest/client/execution_note_cache.d.ts +3 -3
  32. package/dest/client/execution_note_cache.d.ts.map +1 -1
  33. package/dest/client/execution_note_cache.js +10 -10
  34. package/dest/client/pick_notes.js +5 -5
  35. package/dest/client/simulator.js +4 -4
  36. package/dest/client/view_data_oracle.js +2 -2
  37. package/dest/common/hashed_values_cache.d.ts +1 -1
  38. package/dest/common/hashed_values_cache.d.ts.map +1 -1
  39. package/dest/common/hashed_values_cache.js +5 -5
  40. package/dest/providers/acvm_wasm.d.ts +2 -0
  41. package/dest/providers/acvm_wasm.d.ts.map +1 -1
  42. package/dest/providers/acvm_wasm.js +15 -2
  43. package/dest/public/execution.d.ts +1 -1
  44. package/dest/public/execution.d.ts.map +1 -1
  45. package/dest/public/execution.js +3 -3
  46. package/dest/public/fee_payment.d.ts +2 -2
  47. package/dest/public/fee_payment.d.ts.map +1 -1
  48. package/dest/public/fee_payment.js +3 -3
  49. package/dest/public/fixtures/index.d.ts +2 -37
  50. package/dest/public/fixtures/index.d.ts.map +1 -1
  51. package/dest/public/fixtures/index.js +3 -250
  52. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +21 -0
  53. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -0
  54. package/dest/public/fixtures/public_tx_simulation_tester.js +89 -0
  55. package/dest/public/fixtures/utils.d.ts +17 -0
  56. package/dest/public/fixtures/utils.d.ts.map +1 -0
  57. package/dest/public/fixtures/utils.js +66 -0
  58. package/dest/public/index.d.ts +1 -1
  59. package/dest/public/index.d.ts.map +1 -1
  60. package/dest/public/index.js +2 -2
  61. package/dest/public/public_db_sources.d.ts +2 -1
  62. package/dest/public/public_db_sources.d.ts.map +1 -1
  63. package/dest/public/public_db_sources.js +27 -21
  64. package/dest/public/public_processor.d.ts +1 -1
  65. package/dest/public/public_processor.d.ts.map +1 -1
  66. package/dest/public/public_processor.js +19 -18
  67. package/dest/public/public_tx_context.d.ts +5 -5
  68. package/dest/public/public_tx_context.d.ts.map +1 -1
  69. package/dest/public/public_tx_context.js +43 -17
  70. package/dest/public/public_tx_simulator.js +7 -7
  71. package/dest/public/{enqueued_call_side_effect_trace.d.ts → side_effect_trace.d.ts} +5 -5
  72. package/dest/public/side_effect_trace.d.ts.map +1 -0
  73. package/dest/public/{enqueued_call_side_effect_trace.js → side_effect_trace.js} +7 -7
  74. package/dest/public/side_effect_trace_interface.d.ts +1 -1
  75. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  76. package/dest/test/utils.d.ts +1 -1
  77. package/dest/test/utils.d.ts.map +1 -1
  78. package/dest/test/utils.js +3 -3
  79. package/package.json +9 -9
  80. package/src/avm/avm_simulator.ts +3 -27
  81. package/src/avm/avm_tree.ts +39 -37
  82. package/src/avm/fixtures/avm_simulation_tester.ts +105 -0
  83. package/src/avm/fixtures/base_avm_simulation_tester.ts +104 -0
  84. package/src/avm/fixtures/index.ts +46 -17
  85. package/src/avm/fixtures/simple_contract_data_source.ts +98 -0
  86. package/src/avm/journal/journal.ts +24 -21
  87. package/src/avm/opcodes/accrued_substate.ts +1 -1
  88. package/src/avm/opcodes/hashing.ts +1 -1
  89. package/src/avm/test_utils.ts +3 -4
  90. package/src/client/client_execution_context.ts +27 -21
  91. package/src/client/execution_note_cache.ts +19 -14
  92. package/src/client/pick_notes.ts +4 -4
  93. package/src/client/simulator.ts +3 -3
  94. package/src/client/view_data_oracle.ts +1 -1
  95. package/src/common/hashed_values_cache.ts +4 -4
  96. package/src/providers/acvm_wasm.ts +13 -2
  97. package/src/public/execution.ts +3 -3
  98. package/src/public/fee_payment.ts +2 -2
  99. package/src/public/fixtures/index.ts +2 -387
  100. package/src/public/fixtures/public_tx_simulation_tester.ts +174 -0
  101. package/src/public/fixtures/utils.ts +110 -0
  102. package/src/public/index.ts +1 -1
  103. package/src/public/public_db_sources.ts +31 -20
  104. package/src/public/public_processor.ts +25 -18
  105. package/src/public/public_tx_context.ts +86 -27
  106. package/src/public/public_tx_simulator.ts +6 -6
  107. package/src/public/{enqueued_call_side_effect_trace.ts → side_effect_trace.ts} +7 -7
  108. package/src/public/side_effect_trace_interface.ts +1 -1
  109. package/src/test/utils.ts +2 -2
  110. package/dest/public/enqueued_call_side_effect_trace.d.ts.map +0 -1
  111. package/dest/public/transitional_adapters.d.ts +0 -4
  112. package/dest/public/transitional_adapters.d.ts.map +0 -1
  113. package/dest/public/transitional_adapters.js +0 -29
  114. package/src/public/transitional_adapters.ts +0 -113
@@ -1,11 +1,12 @@
1
1
  import { MerkleTreeId, ProvingRequestType, TxExecutionPhase, } from '@aztec/circuit-types';
2
- import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PublicCircuitPublicInputs, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, } from '@aztec/circuits.js';
2
+ import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, mergeAccumulatedData, } from '@aztec/circuits.js';
3
+ import { padArrayEnd } from '@aztec/foundation/collection';
3
4
  import { createLogger } from '@aztec/foundation/log';
5
+ import { assertLength } from '@aztec/foundation/serialize';
4
6
  import { strict as assert } from 'assert';
5
7
  import { inspect } from 'util';
6
8
  import { AvmPersistableStateManager } from '../avm/index.js';
7
- import { PublicEnqueuedCallSideEffectTrace, SideEffectArrayLengths } from './enqueued_call_side_effect_trace.js';
8
- import { generateAvmCircuitPublicInputs } from './transitional_adapters.js';
9
+ import { SideEffectArrayLengths, SideEffectTrace } from './side_effect_trace.js';
9
10
  import { getCallRequestsByPhase, getExecutionRequestsByPhase } from './utils.js';
10
11
  /**
11
12
  * The transaction-level context for public execution.
@@ -47,16 +48,15 @@ export class PublicTxContext {
47
48
  /*noteHashes*/ 0,
48
49
  /*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs),
49
50
  /*publicLogs*/ 0);
50
- const enqueuedCallTrace = new PublicEnqueuedCallSideEffectTrace(
51
- /*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
51
+ const trace = new SideEffectTrace(/*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
52
52
  const firstNullifier = nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
53
53
  // Transaction level state manager that will be forked for revertible phases.
54
- const txStateManager = await AvmPersistableStateManager.create(worldStateDB, enqueuedCallTrace, doMerkleOperations, firstNullifier);
54
+ const txStateManager = await AvmPersistableStateManager.create(worldStateDB, trace, doMerkleOperations, firstNullifier);
55
55
  const gasSettings = tx.data.constants.txContext.gasSettings;
56
56
  const gasUsedByPrivate = tx.data.gasUsed;
57
57
  // Gas allocated to public is "whatever's left" after private, but with some max applied.
58
58
  const gasAllocatedToPublic = applyMaxToAvailableGas(gasSettings.gasLimits.sub(gasUsedByPrivate));
59
- return new PublicTxContext(tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await db.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, getCallRequestsByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP), getExecutionRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getExecutionRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, enqueuedCallTrace);
59
+ return new PublicTxContext(await tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await db.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, getCallRequestsByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP), getExecutionRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getExecutionRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace);
60
60
  }
61
61
  /**
62
62
  * Signal that the entire transaction execution is done.
@@ -230,12 +230,12 @@ export class PublicTxContext {
230
230
  /**
231
231
  * Generate the public inputs for the AVM circuit.
232
232
  */
233
- generateAvmCircuitPublicInputs(endStateReference) {
233
+ async generateAvmCircuitPublicInputs(endStateReference) {
234
234
  assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
235
235
  const ephemeralTrees = this.state.getActiveStateManager().merkleTrees;
236
- const noteHashTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
237
- const nullifierTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
238
- const publicDataTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
236
+ const noteHashTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
237
+ const nullifierTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
238
+ const publicDataTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
239
239
  // Pad the note hash and nullifier trees
240
240
  const paddedNoteHashTreeSize = this.startStateReference.partial.noteHashTree.nextAvailableLeafIndex + MAX_NOTE_HASHES_PER_TX;
241
241
  if (noteHashTree.nextAvailableLeafIndex > paddedNoteHashTreeSize) {
@@ -248,18 +248,44 @@ export class PublicTxContext {
248
248
  }
249
249
  nullifierTree.nextAvailableLeafIndex = paddedNullifierTreeSize;
250
250
  const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, noteHashTree, nullifierTree, publicDataTree);
251
- return generateAvmCircuitPublicInputs(this.trace, this.globalVariables, this.startStateReference,
252
- /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, this.teardownCallRequests, this.nonRevertibleAccumulatedDataFromPrivate, this.revertibleAccumulatedDataFromPrivate, endTreeSnapshots,
253
- /*endGasUsed=*/ this.getTotalGasUsed(), this.getTransactionFeeUnsafe(), this.revertCode);
251
+ const startTreeSnapshots = new TreeSnapshots(this.startStateReference.l1ToL2MessageTree, this.startStateReference.partial.noteHashTree, this.startStateReference.partial.nullifierTree, this.startStateReference.partial.publicDataTree);
252
+ const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots,
253
+ /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests,
254
+ /*teardownCallRequest=*/ this.teardownCallRequests.length
255
+ ? this.teardownCallRequests[0]
256
+ : PublicCallRequest.empty(), endTreeSnapshots,
257
+ /*endGasUsed=*/ this.getTotalGasUsed(),
258
+ /*transactionFee=*/ this.getTransactionFeeUnsafe(),
259
+ /*reverted=*/ !this.revertCode.isOK());
260
+ const getArrayLengths = (from) => new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
261
+ const convertAccumulatedData = (from) => new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
262
+ // Temporary overrides as these entries aren't yet populated in trace
263
+ avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.nonRevertibleAccumulatedDataFromPrivate);
264
+ avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.revertibleAccumulatedDataFromPrivate);
265
+ avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(this.nonRevertibleAccumulatedDataFromPrivate);
266
+ avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(this.revertibleAccumulatedDataFromPrivate);
267
+ const msgsFromPrivate = this.revertCode.isOK()
268
+ ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs)
269
+ : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
270
+ avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs = assertLength(mergeAccumulatedData(msgsFromPrivate, avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs), MAX_L2_TO_L1_MSGS_PER_TX);
271
+ // Maps slot to value. Maps in TS are iterable in insertion order, which is exactly what we want for
272
+ // squashing "to the left", where the first occurrence of a slot uses the value of the last write to it,
273
+ // and the rest occurrences are omitted
274
+ const squashedPublicDataWrites = new Map();
275
+ for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
276
+ squashedPublicDataWrites.set(publicDataWrite.leafSlot.toBigInt(), publicDataWrite.value);
277
+ }
278
+ avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(Array.from(squashedPublicDataWrites.entries()).map(([slot, value]) => new PublicDataWrite(new Fr(slot), value)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
279
+ return avmCircuitPublicInputs;
254
280
  }
255
281
  /**
256
282
  * Generate the proving request for the AVM circuit.
257
283
  */
258
- generateProvingRequest(endStateReference) {
284
+ async generateProvingRequest(endStateReference) {
259
285
  const hints = this.trace.getAvmCircuitHints();
260
286
  return {
261
287
  type: ProvingRequestType.PUBLIC_VM,
262
- inputs: new AvmCircuitInputs('public_dispatch', [], PublicCircuitPublicInputs.empty(), hints, this.generateAvmCircuitPublicInputs(endStateReference)),
288
+ inputs: new AvmCircuitInputs('public_dispatch', [], hints, await this.generateAvmCircuitPublicInputs(endStateReference)),
263
289
  };
264
290
  }
265
291
  }
@@ -312,4 +338,4 @@ function applyMaxToAvailableGas(availableGas) {
312
338
  /*daGas=*/ availableGas.daGas,
313
339
  /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
314
340
  }
315
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}
341
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}
@@ -35,7 +35,7 @@ let PublicTxSimulator = (() => {
35
35
  * @returns The result of the transaction's public execution.
36
36
  */
37
37
  async simulate(tx) {
38
- const txHash = tx.getTxHash();
38
+ const txHash = await tx.getTxHash();
39
39
  this.log.debug(`Simulating ${tx.enqueuedPublicFunctionCalls.length} public calls for tx ${txHash}`, { txHash });
40
40
  const context = await PublicTxContext.create(this.db, this.worldStateDB, tx, this.globalVariables, this.doMerkleOperations);
41
41
  // add new contracts to the contracts db so that their functions may be found and called
@@ -70,14 +70,14 @@ let PublicTxSimulator = (() => {
70
70
  context.halt();
71
71
  await this.payFee(context);
72
72
  const endStateReference = await this.db.getStateReference();
73
- const avmProvingRequest = context.generateProvingRequest(endStateReference);
73
+ const avmProvingRequest = await context.generateProvingRequest(endStateReference);
74
74
  const revertCode = context.getFinalRevertCode();
75
75
  if (!revertCode.isOK()) {
76
76
  // TODO(#6464): Should we allow emitting contracts in the private setup phase?
77
77
  // if so, this is removing contracts deployed in private setup
78
78
  // You can't submit contracts in public, so this is only relevant for private-created side effects
79
79
  // FIXME: we shouldn't need to directly modify worldStateDb here!
80
- await this.worldStateDB.removeNewContracts(tx);
80
+ await this.worldStateDB.removeNewContracts(tx, true);
81
81
  // FIXME(dbanks12): should not be changing immutable tx
82
82
  tx.filterRevertedLogs(tx.data.forPublic.nonRevertibleAccumulatedData);
83
83
  }
@@ -260,7 +260,7 @@ let PublicTxSimulator = (() => {
260
260
  }
261
261
  for (const noteHash of context.nonRevertibleAccumulatedDataFromPrivate.noteHashes) {
262
262
  if (!noteHash.isEmpty()) {
263
- stateManager.writeUniqueNoteHash(noteHash);
263
+ await stateManager.writeUniqueNoteHash(noteHash);
264
264
  }
265
265
  }
266
266
  }
@@ -283,7 +283,7 @@ let PublicTxSimulator = (() => {
283
283
  for (const noteHash of context.revertibleAccumulatedDataFromPrivate.noteHashes) {
284
284
  if (!noteHash.isEmpty()) {
285
285
  // Revertible note hashes from private are not hashed with nonce, since private can't know their final position, only we can.
286
- stateManager.writeSiloedNoteHash(noteHash);
286
+ await stateManager.writeSiloedNoteHash(noteHash);
287
287
  }
288
288
  }
289
289
  }
@@ -294,7 +294,7 @@ let PublicTxSimulator = (() => {
294
294
  return;
295
295
  }
296
296
  const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
297
- const balanceSlot = computeFeePayerBalanceStorageSlot(context.feePayer);
297
+ const balanceSlot = await computeFeePayerBalanceStorageSlot(context.feePayer);
298
298
  this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${context.feePayer}`);
299
299
  const stateManager = context.state.getActiveStateManager();
300
300
  let currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
@@ -330,4 +330,4 @@ let PublicTxSimulator = (() => {
330
330
  _a;
331
331
  })();
332
332
  export { PublicTxSimulator };
333
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
333
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
@@ -31,9 +31,9 @@ export declare class SideEffectArrayLengths {
31
31
  static empty(): SideEffectArrayLengths;
32
32
  }
33
33
  /**
34
- * Trace side effects for an entire enqueued call.
34
+ * Trace side effects for an enqueued public call's execution.
35
35
  */
36
- export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffectTraceInterface {
36
+ export declare class SideEffectTrace implements PublicSideEffectTraceInterface {
37
37
  /** The counter of this trace's first side effect. */
38
38
  readonly startSideEffectCounter: number;
39
39
  /** Track parent's (or previous kernel's) lengths so the AVM can properly enforce TX-wide limits,
@@ -65,14 +65,14 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
65
65
  previousSideEffectArrayLengths?: SideEffectArrayLengths,
66
66
  /** We need to track the set of class IDs used for bytecode retrieval to deduplicate and enforce limits. */
67
67
  gotBytecodeFromClassIds?: UniqueClassIds);
68
- fork(): PublicEnqueuedCallSideEffectTrace;
68
+ fork(): SideEffectTrace;
69
69
  merge(forkedTrace: this, reverted?: boolean): void;
70
70
  private mergeHints;
71
71
  getCounter(): number;
72
72
  private incrementSideEffectCounter;
73
73
  getNoteHashCount(): number;
74
74
  tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage?: PublicDataTreeLeafPreimage, leafIndex?: Fr, path?: Fr[]): void;
75
- tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
75
+ tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): Promise<void>;
76
76
  traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, _exists: boolean, path?: Fr[]): void;
77
77
  traceNewNoteHash(noteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
78
78
  traceNullifierCheck(_siloedNullifier: Fr, _exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
@@ -143,4 +143,4 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
143
143
  getAvmCircuitHints(): AvmExecutionHints;
144
144
  private getAvmAccumulatedData;
145
145
  }
146
- //# sourceMappingURL=enqueued_call_side_effect_trace.d.ts.map
146
+ //# sourceMappingURL=side_effect_trace.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
@@ -25,9 +25,9 @@ export class SideEffectArrayLengths {
25
25
  }
26
26
  }
27
27
  /**
28
- * Trace side effects for an entire enqueued call.
28
+ * Trace side effects for an enqueued public call's execution.
29
29
  */
30
- export class PublicEnqueuedCallSideEffectTrace {
30
+ export class SideEffectTrace {
31
31
  constructor(
32
32
  /** The counter of this trace's first side effect. */
33
33
  startSideEffectCounter = 0,
@@ -40,7 +40,7 @@ export class PublicEnqueuedCallSideEffectTrace {
40
40
  this.startSideEffectCounter = startSideEffectCounter;
41
41
  this.previousSideEffectArrayLengths = previousSideEffectArrayLengths;
42
42
  this.gotBytecodeFromClassIds = gotBytecodeFromClassIds;
43
- this.log = createLogger('simulator:public_enqueued_call_side_effect_trace');
43
+ this.log = createLogger('simulator:side_effect_trace');
44
44
  this.enqueuedCalls = [];
45
45
  this.publicDataWrites = [];
46
46
  this.protocolPublicDataWritesLength = 0;
@@ -56,7 +56,7 @@ export class PublicEnqueuedCallSideEffectTrace {
56
56
  this.avmCircuitHints = AvmExecutionHints.empty();
57
57
  }
58
58
  fork() {
59
- return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new SideEffectArrayLengths(this.previousSideEffectArrayLengths.publicDataWrites + this.userPublicDataWritesLength, this.previousSideEffectArrayLengths.protocolPublicDataWrites + this.protocolPublicDataWritesLength, this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length, this.previousSideEffectArrayLengths.nullifiers + this.nullifiers.length, this.previousSideEffectArrayLengths.l2ToL1Msgs + this.l2ToL1Messages.length, this.previousSideEffectArrayLengths.publicLogs + this.publicLogs.length), this.gotBytecodeFromClassIds.fork());
59
+ return new SideEffectTrace(this.sideEffectCounter, new SideEffectArrayLengths(this.previousSideEffectArrayLengths.publicDataWrites + this.userPublicDataWritesLength, this.previousSideEffectArrayLengths.protocolPublicDataWrites + this.protocolPublicDataWritesLength, this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length, this.previousSideEffectArrayLengths.nullifiers + this.nullifiers.length, this.previousSideEffectArrayLengths.l2ToL1Msgs + this.l2ToL1Messages.length, this.previousSideEffectArrayLengths.publicLogs + this.publicLogs.length), this.gotBytecodeFromClassIds.fork());
60
60
  }
61
61
  merge(forkedTrace, reverted = false) {
62
62
  // sanity check to avoid merging the same forked trace twice
@@ -105,7 +105,7 @@ export class PublicEnqueuedCallSideEffectTrace {
105
105
  this.log.debug(`Tracing storage read (address=${contractAddress}, slot=${slot}): value=${value} (counter=${this.sideEffectCounter})`);
106
106
  this.incrementSideEffectCounter();
107
107
  }
108
- tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
108
+ async tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
109
109
  if (protocolWrite) {
110
110
  if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >=
111
111
  PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
@@ -120,7 +120,7 @@ export class PublicEnqueuedCallSideEffectTrace {
120
120
  }
121
121
  this.userPublicDataWritesLength++;
122
122
  }
123
- const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
123
+ const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
124
124
  this.publicDataWrites.push(new PublicDataUpdateRequest(leafSlot, value, this.sideEffectCounter));
125
125
  // New hinting
126
126
  const readHint = new AvmPublicDataReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
@@ -347,4 +347,4 @@ export class PublicEnqueuedCallSideEffectTrace {
347
347
  return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n => n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map(n => n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.publicLogs, PublicLog.empty(), MAX_PUBLIC_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map(w => new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
348
348
  }
349
349
  }
350
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
350
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ export interface PublicSideEffectTraceInterface {
12
12
  getCounter(): number;
13
13
  tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage?: PublicDataTreeLeafPreimage, leafIndex?: Fr, path?: Fr[]): void;
14
14
  tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, // This is the storage slot not the computed leaf slot
15
- value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
15
+ value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): Promise<void>;
16
16
  traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
17
17
  traceNewNoteHash(uniqueNoteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
18
18
  getNoteHashCount(): number;
@@ -1 +1 @@
1
- {"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}
@@ -8,5 +8,5 @@ import { type AztecAddress, Fr } from '@aztec/circuits.js';
8
8
  * @param secret - The secret to unlock the message.
9
9
  * @returns The L1 to L2 message.
10
10
  */
11
- export declare const buildL1ToL2Message: (selector: string, contentPreimage: Fr[], targetContract: AztecAddress, secret: Fr, msgIndex: Fr | number) => L1ToL2Message;
11
+ export declare const buildL1ToL2Message: (selector: string, contentPreimage: Fr[], targetContract: AztecAddress, secret: Fr, msgIndex: Fr | number) => Promise<L1ToL2Message>;
12
12
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAW,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAc,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIvE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,mBACC,EAAE,EAAE,kBACL,YAAY,UACpB,EAAE,YACA,EAAE,GAAG,MAAM,kBAetB,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAW,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,YAAY,EAAc,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIvE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,mBACC,EAAE,EAAE,kBACL,YAAY,UACpB,EAAE,YACA,EAAE,GAAG,MAAM,2BAetB,CAAC"}
@@ -10,11 +10,11 @@ import { sha256ToField } from '@aztec/foundation/crypto';
10
10
  * @param secret - The secret to unlock the message.
11
11
  * @returns The L1 to L2 message.
12
12
  */
13
- export const buildL1ToL2Message = (selector, contentPreimage, targetContract, secret, msgIndex) => {
13
+ export const buildL1ToL2Message = async (selector, contentPreimage, targetContract, secret, msgIndex) => {
14
14
  // Write the selector into a buffer.
15
15
  const selectorBuf = Buffer.from(selector, 'hex');
16
16
  const content = sha256ToField([selectorBuf, ...contentPreimage]);
17
- const secretHash = computeSecretHash(secret);
17
+ const secretHash = await computeSecretHash(secret);
18
18
  return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash, new Fr(msgIndex));
19
19
  };
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQXFCLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLENBQ2hDLFFBQWdCLEVBQ2hCLGVBQXFCLEVBQ3JCLGNBQTRCLEVBQzVCLE1BQVUsRUFDVixRQUFxQixFQUNyQixFQUFFO0lBQ0Ysb0NBQW9DO0lBQ3BDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBRWpELE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLFdBQVcsRUFBRSxHQUFHLGVBQWUsQ0FBQyxDQUFDLENBQUM7SUFDakUsTUFBTSxVQUFVLEdBQUcsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFN0MsT0FBTyxJQUFJLGFBQWEsQ0FDdEIsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUNuQyxJQUFJLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDLEVBQzlCLE9BQU8sRUFDUCxVQUFVLEVBQ1YsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQ2pCLENBQUM7QUFDSixDQUFDLENBQUMifQ==
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQXFCLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLEtBQUssRUFDckMsUUFBZ0IsRUFDaEIsZUFBcUIsRUFDckIsY0FBNEIsRUFDNUIsTUFBVSxFQUNWLFFBQXFCLEVBQ3JCLEVBQUU7SUFDRixvQ0FBb0M7SUFDcEMsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFakQsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsZUFBZSxDQUFDLENBQUMsQ0FBQztJQUNqRSxNQUFNLFVBQVUsR0FBRyxNQUFNLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRW5ELE9BQU8sSUFBSSxhQUFhLENBQ3RCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFDbkMsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQyxFQUM5QixPQUFPLEVBQ1AsVUFBVSxFQUNWLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUNqQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/simulator",
3
- "version": "0.72.1",
3
+ "version": "0.73.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./common": "./dest/common.js",
@@ -60,14 +60,14 @@
60
60
  ]
61
61
  },
62
62
  "dependencies": {
63
- "@aztec/circuit-types": "0.72.1",
64
- "@aztec/circuits.js": "0.72.1",
65
- "@aztec/foundation": "0.72.1",
66
- "@aztec/noir-protocol-circuits-types": "0.72.1",
67
- "@aztec/protocol-contracts": "0.72.1",
68
- "@aztec/telemetry-client": "0.72.1",
69
- "@aztec/types": "0.72.1",
70
- "@aztec/world-state": "0.72.1",
63
+ "@aztec/circuit-types": "0.73.0",
64
+ "@aztec/circuits.js": "0.73.0",
65
+ "@aztec/foundation": "0.73.0",
66
+ "@aztec/noir-protocol-circuits-types": "0.73.0",
67
+ "@aztec/protocol-contracts": "0.73.0",
68
+ "@aztec/telemetry-client": "0.73.0",
69
+ "@aztec/types": "0.73.0",
70
+ "@aztec/world-state": "0.73.0",
71
71
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
72
72
  "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
73
73
  "@noir-lang/types": "portal:../../noir/packages/types",