@aztec/simulator 0.69.1-devnet → 0.70.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 (119) hide show
  1. package/dest/acvm/acvm.d.ts +1 -2
  2. package/dest/acvm/acvm.d.ts.map +1 -1
  3. package/dest/acvm/index.d.ts +1 -1
  4. package/dest/acvm/index.d.ts.map +1 -1
  5. package/dest/acvm/index.js +2 -2
  6. package/dest/acvm/oracle/oracle.d.ts +4 -4
  7. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  8. package/dest/acvm/oracle/oracle.js +14 -14
  9. package/dest/acvm/oracle/typed_oracle.d.ts +6 -16
  10. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  11. package/dest/acvm/oracle/typed_oracle.js +10 -20
  12. package/dest/avm/avm_simulator.d.ts.map +1 -1
  13. package/dest/avm/avm_simulator.js +7 -2
  14. package/dest/avm/fixtures/index.d.ts +1 -1
  15. package/dest/avm/fixtures/index.d.ts.map +1 -1
  16. package/dest/avm/fixtures/index.js +2 -2
  17. package/dest/avm/journal/nullifiers.d.ts +1 -1
  18. package/dest/avm/journal/nullifiers.d.ts.map +1 -1
  19. package/dest/avm/journal/public_storage.d.ts +1 -1
  20. package/dest/avm/journal/public_storage.d.ts.map +1 -1
  21. package/dest/client/client_execution_context.d.ts +29 -18
  22. package/dest/client/client_execution_context.d.ts.map +1 -1
  23. package/dest/client/client_execution_context.js +42 -29
  24. package/dest/client/execution_note_cache.d.ts +27 -4
  25. package/dest/client/execution_note_cache.d.ts.map +1 -1
  26. package/dest/client/execution_note_cache.js +62 -12
  27. package/dest/client/index.d.ts +11 -3
  28. package/dest/client/index.d.ts.map +1 -1
  29. package/dest/client/index.js +11 -4
  30. package/dest/client/private_execution.d.ts +3 -2
  31. package/dest/client/private_execution.d.ts.map +1 -1
  32. package/dest/client/private_execution.js +9 -7
  33. package/dest/client/simulator.d.ts +4 -2
  34. package/dest/client/simulator.d.ts.map +1 -1
  35. package/dest/client/simulator.js +13 -8
  36. package/dest/client/unconstrained_execution.d.ts +2 -1
  37. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  38. package/dest/client/unconstrained_execution.js +6 -4
  39. package/dest/client/view_data_oracle.d.ts +1 -1
  40. package/dest/common/hashed_values_cache.d.ts +28 -0
  41. package/dest/common/hashed_values_cache.d.ts.map +1 -0
  42. package/dest/common/{packed_values_cache.js → hashed_values_cache.js} +22 -22
  43. package/dest/common/index.d.ts +1 -1
  44. package/dest/common/index.js +1 -1
  45. package/dest/common/message_load_oracle_inputs.d.ts +15 -0
  46. package/dest/common/message_load_oracle_inputs.d.ts.map +1 -0
  47. package/dest/common/message_load_oracle_inputs.js +15 -0
  48. package/dest/common/simulation_provider.d.ts +19 -0
  49. package/dest/common/simulation_provider.d.ts.map +1 -0
  50. package/dest/common/simulation_provider.js +27 -0
  51. package/dest/common.d.ts +2 -0
  52. package/dest/common.d.ts.map +1 -0
  53. package/dest/common.js +2 -0
  54. package/dest/providers/acvm_native.d.ts +5 -2
  55. package/dest/providers/acvm_native.d.ts.map +1 -1
  56. package/dest/providers/acvm_native.js +5 -2
  57. package/dest/providers/acvm_wasm.d.ts +8 -2
  58. package/dest/providers/acvm_wasm.d.ts.map +1 -1
  59. package/dest/providers/acvm_wasm.js +31 -5
  60. package/dest/providers/acvm_wasm_with_blobs.d.ts +14 -2
  61. package/dest/providers/acvm_wasm_with_blobs.d.ts.map +1 -1
  62. package/dest/providers/acvm_wasm_with_blobs.js +24 -4
  63. package/dest/providers/factory.d.ts +1 -1
  64. package/dest/providers/factory.d.ts.map +1 -1
  65. package/dest/providers/factory.js +1 -1
  66. package/dest/providers/index.d.ts +1 -1
  67. package/dest/providers/index.d.ts.map +1 -1
  68. package/dest/providers/index.js +2 -2
  69. package/dest/public/db_interfaces.d.ts +1 -1
  70. package/dest/public/db_interfaces.d.ts.map +1 -1
  71. package/dest/public/fixtures/index.d.ts +3 -3
  72. package/dest/public/fixtures/index.d.ts.map +1 -1
  73. package/dest/public/fixtures/index.js +48 -18
  74. package/dest/public/public_db_sources.d.ts +2 -1
  75. package/dest/public/public_db_sources.d.ts.map +1 -1
  76. package/dest/public/public_db_sources.js +2 -2
  77. package/dest/public/public_tx_simulator.js +2 -2
  78. package/{src/index.ts → dest/server.d.ts} +1 -2
  79. package/dest/server.d.ts.map +1 -0
  80. package/dest/server.js +6 -0
  81. package/package.json +11 -12
  82. package/src/acvm/acvm.ts +1 -1
  83. package/src/acvm/index.ts +1 -1
  84. package/src/acvm/oracle/oracle.ts +14 -14
  85. package/src/acvm/oracle/typed_oracle.ts +12 -20
  86. package/src/avm/avm_simulator.ts +6 -1
  87. package/src/avm/fixtures/index.ts +2 -1
  88. package/src/avm/journal/nullifiers.ts +1 -1
  89. package/src/avm/journal/public_storage.ts +1 -1
  90. package/src/client/client_execution_context.ts +47 -30
  91. package/src/client/execution_note_cache.ts +67 -14
  92. package/src/client/index.ts +11 -3
  93. package/src/client/private_execution.ts +21 -17
  94. package/src/client/simulator.ts +20 -7
  95. package/src/client/unconstrained_execution.ts +17 -13
  96. package/src/common/hashed_values_cache.ts +55 -0
  97. package/src/common/index.ts +1 -1
  98. package/src/common/message_load_oracle_inputs.ts +15 -0
  99. package/src/common/simulation_provider.ts +45 -0
  100. package/src/common.ts +1 -0
  101. package/src/providers/acvm_native.ts +12 -2
  102. package/src/providers/acvm_wasm.ts +36 -9
  103. package/src/providers/acvm_wasm_with_blobs.ts +34 -9
  104. package/src/providers/factory.ts +1 -1
  105. package/src/providers/index.ts +1 -1
  106. package/src/public/db_interfaces.ts +1 -1
  107. package/src/public/fixtures/index.ts +62 -26
  108. package/src/public/public_db_sources.ts +3 -6
  109. package/src/public/public_tx_simulator.ts +1 -1
  110. package/{dest/index.d.ts → src/server.ts} +0 -3
  111. package/dest/common/packed_values_cache.d.ts +0 -28
  112. package/dest/common/packed_values_cache.d.ts.map +0 -1
  113. package/dest/index.d.ts.map +0 -1
  114. package/dest/index.js +0 -8
  115. package/dest/providers/simulation_provider.d.ts +0 -9
  116. package/dest/providers/simulation_provider.d.ts.map +0 -1
  117. package/dest/providers/simulation_provider.js +0 -2
  118. package/src/common/packed_values_cache.ts +0 -55
  119. package/src/providers/simulation_provider.ts +0 -10
@@ -203,7 +203,7 @@ let PublicTxSimulator = (() => {
203
203
  /*transactionFee=*/ context.getTransactionFee(phase), fnName);
204
204
  const gasUsed = allocatedGas.sub(result.gasLeft); // by enqueued call
205
205
  context.consumeGas(phase, gasUsed);
206
- this.log.debug(`Simulated enqueued public call consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
206
+ this.log.debug(`Simulated enqueued public call (${fnName}) consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
207
207
  stateManager.traceEnqueuedCall(callRequest, executionRequest.args, result.reverted);
208
208
  if (result.reverted) {
209
209
  const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
@@ -333,4 +333,4 @@ let PublicTxSimulator = (() => {
333
333
  _a;
334
334
  })();
335
335
  export { PublicTxSimulator };
336
- //# 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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"}
336
+ //# 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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"}
@@ -1,7 +1,6 @@
1
- export * from './acvm/index.js';
2
1
  export * from './avm/index.js';
3
- export * from './client/index.js';
4
2
  export * from './common/index.js';
5
3
  export * from './public/index.js';
6
4
  export * from './providers/index.js';
7
5
  export * from './stats/index.js';
6
+ //# sourceMappingURL=server.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
package/dest/server.js ADDED
@@ -0,0 +1,6 @@
1
+ export * from './avm/index.js';
2
+ export * from './common/index.js';
3
+ export * from './public/index.js';
4
+ export * from './providers/index.js';
5
+ export * from './stats/index.js';
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsa0JBQWtCLENBQUMifQ==
package/package.json CHANGED
@@ -1,12 +1,11 @@
1
1
  {
2
2
  "name": "@aztec/simulator",
3
- "version": "0.69.1-devnet",
3
+ "version": "0.70.0",
4
4
  "type": "module",
5
5
  "exports": {
6
- ".": "./dest/index.js",
6
+ "./common": "./dest/common.js",
7
+ "./server": "./dest/server.js",
7
8
  "./client": "./dest/client/index.js",
8
- "./acvm": "./dest/acvm/index.js",
9
- "./errors": "./dest/common/errors.js",
10
9
  "./public/fixtures": "./dest/public/fixtures/index.js"
11
10
  },
12
11
  "typedocOptions": {
@@ -61,14 +60,14 @@
61
60
  ]
62
61
  },
63
62
  "dependencies": {
64
- "@aztec/circuit-types": "0.69.1-devnet",
65
- "@aztec/circuits.js": "0.69.1-devnet",
66
- "@aztec/foundation": "0.69.1-devnet",
67
- "@aztec/noir-protocol-circuits-types": "0.69.1-devnet",
68
- "@aztec/protocol-contracts": "0.69.1-devnet",
69
- "@aztec/telemetry-client": "0.69.1-devnet",
70
- "@aztec/types": "0.69.1-devnet",
71
- "@aztec/world-state": "0.69.1-devnet",
63
+ "@aztec/circuit-types": "0.70.0",
64
+ "@aztec/circuits.js": "0.70.0",
65
+ "@aztec/foundation": "0.70.0",
66
+ "@aztec/noir-protocol-circuits-types": "0.70.0",
67
+ "@aztec/protocol-contracts": "0.70.0",
68
+ "@aztec/telemetry-client": "0.70.0",
69
+ "@aztec/types": "0.70.0",
70
+ "@aztec/world-state": "0.70.0",
72
71
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
73
72
  "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
74
73
  "@noir-lang/types": "portal:../../noir/packages/types",
package/src/acvm/acvm.ts CHANGED
@@ -16,7 +16,7 @@ import { type ORACLE_NAMES } from './oracle/index.js';
16
16
  /**
17
17
  * The callback interface for the ACIR.
18
18
  */
19
- type ACIRCallback = Record<
19
+ export type ACIRCallback = Record<
20
20
  ORACLE_NAMES,
21
21
  (
22
22
  ...args: ForeignCallInput[]
package/src/acvm/index.ts CHANGED
@@ -1,4 +1,4 @@
1
- export * from './acvm.js';
1
+ export { extractCallStack, type ACIRCallback, type ACIRExecutionResult } from './acvm.js';
2
2
  export * from './acvm_types.js';
3
3
  export * from './deserialize.js';
4
4
  export * from './oracle/index.js';
@@ -22,25 +22,20 @@ export class Oracle {
22
22
  return toACVMField(val);
23
23
  }
24
24
 
25
- async packArgumentsArray(args: ACVMField[]): Promise<ACVMField> {
26
- const packed = await this.typedOracle.packArgumentsArray(args.map(fromACVMField));
27
- return toACVMField(packed);
28
- }
29
-
30
- async packArguments(_length: ACVMField[], values: ACVMField[]): Promise<ACVMField> {
31
- const packed = await this.typedOracle.packArgumentsArray(values.map(fromACVMField));
32
- return toACVMField(packed);
25
+ async storeArrayInExecutionCache(values: ACVMField[]): Promise<ACVMField> {
26
+ const hash = await this.typedOracle.storeArrayInExecutionCache(values.map(fromACVMField));
27
+ return toACVMField(hash);
33
28
  }
34
29
 
35
30
  // Since the argument is a slice, noir automatically adds a length field to oracle call.
36
- async packReturns(_length: ACVMField[], values: ACVMField[]): Promise<ACVMField> {
37
- const packed = await this.typedOracle.packReturns(values.map(fromACVMField));
38
- return toACVMField(packed);
31
+ async storeInExecutionCache(_length: ACVMField[], values: ACVMField[]): Promise<ACVMField> {
32
+ const hash = await this.typedOracle.storeInExecutionCache(values.map(fromACVMField));
33
+ return toACVMField(hash);
39
34
  }
40
35
 
41
- async unpackReturns([returnsHash]: ACVMField[]): Promise<ACVMField[]> {
42
- const unpacked = await this.typedOracle.unpackReturns(fromACVMField(returnsHash));
43
- return unpacked.map(toACVMField);
36
+ async loadFromExecutionCache([returnsHash]: ACVMField[]): Promise<ACVMField[]> {
37
+ const values = await this.typedOracle.loadFromExecutionCache(fromACVMField(returnsHash));
38
+ return values.map(toACVMField);
44
39
  }
45
40
 
46
41
  async getBlockNumber(): Promise<ACVMField> {
@@ -258,6 +253,11 @@ export class Oracle {
258
253
  return toACVMField(0);
259
254
  }
260
255
 
256
+ async notifyCreatedNullifier([innerNullifier]: ACVMField[]): Promise<ACVMField> {
257
+ await this.typedOracle.notifyCreatedNullifier(fromACVMField(innerNullifier));
258
+ return toACVMField(0);
259
+ }
260
+
261
261
  async checkNullifierExists([innerNullifier]: ACVMField[]): Promise<ACVMField> {
262
262
  const exists = await this.typedOracle.checkNullifierExists(fromACVMField(innerNullifier));
263
263
  return toACVMField(exists);
@@ -5,7 +5,6 @@ import {
5
5
  type NoteStatus,
6
6
  type NullifierMembershipWitness,
7
7
  type PublicDataWitness,
8
- type SiblingPath,
9
8
  type UnencryptedL2Log,
10
9
  } from '@aztec/circuit-types';
11
10
  import {
@@ -19,6 +18,8 @@ import { type FunctionSelector, type NoteSelector } from '@aztec/foundation/abi'
19
18
  import { type AztecAddress } from '@aztec/foundation/aztec-address';
20
19
  import { Fr } from '@aztec/foundation/fields';
21
20
 
21
+ import { type MessageLoadOracleInputs } from '../../common/message_load_oracle_inputs.js';
22
+
22
23
  /**
23
24
  * Information about a note needed during execution.
24
25
  */
@@ -39,19 +40,6 @@ export interface NoteData {
39
40
  index?: bigint;
40
41
  }
41
42
 
42
- export class MessageLoadOracleInputs<N extends number> {
43
- constructor(
44
- /** The index of the message commitment in the merkle tree. */
45
- public index: bigint,
46
- /** The path in the merkle tree to the message. */
47
- public siblingPath: SiblingPath<N>,
48
- ) {}
49
-
50
- toFields(): Fr[] {
51
- return [new Fr(this.index), ...this.siblingPath.toFields()];
52
- }
53
- }
54
-
55
43
  class OracleMethodNotAvailableError extends Error {
56
44
  constructor(methodName: string) {
57
45
  super(`Oracle method ${methodName} is not available.`);
@@ -68,16 +56,16 @@ export abstract class TypedOracle {
68
56
  return Fr.random();
69
57
  }
70
58
 
71
- packArgumentsArray(_args: Fr[]): Promise<Fr> {
72
- throw new OracleMethodNotAvailableError('packArgumentsArray');
59
+ storeArrayInExecutionCache(_args: Fr[]): Promise<Fr> {
60
+ throw new OracleMethodNotAvailableError('storeArrayInExecutionCache');
73
61
  }
74
62
 
75
- packReturns(_returns: Fr[]): Promise<Fr> {
76
- throw new OracleMethodNotAvailableError('packReturns');
63
+ storeInExecutionCache(_values: Fr[]): Promise<Fr> {
64
+ throw new OracleMethodNotAvailableError('storeInExecutionCache');
77
65
  }
78
66
 
79
- unpackReturns(_returnsHash: Fr): Promise<Fr[]> {
80
- throw new OracleMethodNotAvailableError('unpackReturns');
67
+ loadFromExecutionCache(_hash: Fr): Promise<Fr[]> {
68
+ throw new OracleMethodNotAvailableError('loadFromExecutionCache');
81
69
  }
82
70
 
83
71
  getBlockNumber(): Promise<number> {
@@ -166,6 +154,10 @@ export abstract class TypedOracle {
166
154
  throw new OracleMethodNotAvailableError('notifyNullifiedNote');
167
155
  }
168
156
 
157
+ notifyCreatedNullifier(_innerNullifier: Fr): Promise<void> {
158
+ throw new OracleMethodNotAvailableError('notifyCreatedNullifier');
159
+ }
160
+
169
161
  checkNullifierExists(_innerNullifier: Fr): Promise<boolean> {
170
162
  throw new OracleMethodNotAvailableError('checkNullifierExists');
171
163
  }
@@ -137,6 +137,7 @@ export class AvmSimulator {
137
137
  this.bytecode = bytecode;
138
138
 
139
139
  const { machineState } = this.context;
140
+ const callStartGas = machineState.gasLeft; // Save gas before executing instruction (for profiling)
140
141
  try {
141
142
  // Execute instruction pointed to by the current program counter
142
143
  // continuing until the machine state signifies a halt
@@ -180,7 +181,11 @@ export class AvmSimulator {
180
181
  const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
181
182
  const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason);
182
183
  this.log.debug(`Context execution results: ${results.toString()}`);
183
- this.log.debug(`Executed ${instrCounter} instructions`);
184
+ const totalGasUsed: Gas = {
185
+ l2Gas: callStartGas.l2Gas - machineState.l2GasLeft,
186
+ daGas: callStartGas.daGas - machineState.daGasLeft,
187
+ };
188
+ this.log.debug(`Executed ${instrCounter} instructions and consumed ${totalGasUsed.l2Gas} L2 Gas`);
184
189
 
185
190
  this.tallyPrintFunction();
186
191
  // Return results for processing by calling context
@@ -10,8 +10,9 @@ import { strict as assert } from 'assert';
10
10
  import { mock } from 'jest-mock-extended';
11
11
  import merge from 'lodash.merge';
12
12
 
13
- import { type WorldStateDB, resolveAssertionMessageFromRevertData, traverseCauseChain } from '../../index.js';
13
+ import { resolveAssertionMessageFromRevertData, traverseCauseChain } from '../../common.js';
14
14
  import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js';
15
+ import { type WorldStateDB } from '../../server.js';
15
16
  import { AvmContext } from '../avm_context.js';
16
17
  import { AvmExecutionEnvironment } from '../avm_execution_environment.js';
17
18
  import { AvmMachineState } from '../avm_machine_state.js';
@@ -1,6 +1,6 @@
1
1
  import { Fr } from '@aztec/foundation/fields';
2
2
 
3
- import type { CommitmentsDB } from '../../index.js';
3
+ import type { CommitmentsDB } from '../../server.js';
4
4
 
5
5
  /**
6
6
  * A class to manage new nullifier staging and existence checks during a contract call's AVM simulation.
@@ -1,7 +1,7 @@
1
1
  import { type AztecAddress } from '@aztec/circuits.js';
2
2
  import { Fr } from '@aztec/foundation/fields';
3
3
 
4
- import type { PublicStateDB } from '../../index.js';
4
+ import type { PublicStateDB } from '../../server.js';
5
5
 
6
6
  type PublicStorageReadResult = {
7
7
  value: Fr;
@@ -6,7 +6,7 @@ import {
6
6
  Note,
7
7
  NoteAndSlot,
8
8
  type NoteStatus,
9
- type PrivateExecutionResult,
9
+ type PrivateCallExecutionResult,
10
10
  PublicExecutionRequest,
11
11
  type UnencryptedL2Log,
12
12
  } from '@aztec/circuit-types';
@@ -26,7 +26,8 @@ import { Fr } from '@aztec/foundation/fields';
26
26
  import { createLogger } from '@aztec/foundation/log';
27
27
 
28
28
  import { type NoteData, toACVMWitness } from '../acvm/index.js';
29
- import { type PackedValuesCache } from '../common/packed_values_cache.js';
29
+ import { type HashedValuesCache } from '../common/hashed_values_cache.js';
30
+ import { type SimulationProvider } from '../server.js';
30
31
  import { type DBOracle } from './db_oracle.js';
31
32
  import { type ExecutionNoteCache } from './execution_note_cache.js';
32
33
  import { pickNotes } from './pick_notes.js';
@@ -57,7 +58,7 @@ export class ClientExecutionContext extends ViewDataOracle {
57
58
  private noteHashLeafIndexMap: Map<bigint, bigint> = new Map();
58
59
  private noteHashNullifierCounterMap: Map<number, number> = new Map();
59
60
  private contractClassLogs: CountedContractClassLog[] = [];
60
- private nestedExecutions: PrivateExecutionResult[] = [];
61
+ private nestedExecutions: PrivateCallExecutionResult[] = [];
61
62
  private enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[] = [];
62
63
  private publicTeardownFunctionCall: PublicExecutionRequest = PublicExecutionRequest.empty();
63
64
 
@@ -69,10 +70,11 @@ export class ClientExecutionContext extends ViewDataOracle {
69
70
  protected readonly historicalHeader: BlockHeader,
70
71
  /** List of transient auth witnesses to be used during this simulation */
71
72
  authWitnesses: AuthWitness[],
72
- private readonly packedValuesCache: PackedValuesCache,
73
+ private readonly executionCache: HashedValuesCache,
73
74
  private readonly noteCache: ExecutionNoteCache,
74
75
  db: DBOracle,
75
76
  private node: AztecNode,
77
+ private provider: SimulationProvider,
76
78
  protected sideEffectCounter: number = 0,
77
79
  log = createLogger('simulator:client_execution_context'),
78
80
  scopes?: AztecAddress[],
@@ -90,7 +92,7 @@ export class ClientExecutionContext extends ViewDataOracle {
90
92
  public getInitialWitness(abi: FunctionAbi) {
91
93
  const argumentsSize = countArgumentsSize(abi);
92
94
 
93
- const args = this.packedValuesCache.unpack(this.argsHash);
95
+ const args = this.executionCache.getPreimage(this.argsHash);
94
96
 
95
97
  if (args.length !== argumentsSize) {
96
98
  throw new Error('Invalid arguments size');
@@ -159,27 +161,29 @@ export class ClientExecutionContext extends ViewDataOracle {
159
161
  }
160
162
 
161
163
  /**
162
- * Pack the given array of arguments.
163
- * @param args - Arguments to pack
164
+ * Store values in the execution cache.
165
+ * @param values - Values to store.
164
166
  */
165
- public override packArgumentsArray(args: Fr[]): Promise<Fr> {
166
- return Promise.resolve(this.packedValuesCache.pack(args));
167
+ public override storeArrayInExecutionCache(args: Fr[]): Promise<Fr> {
168
+ return Promise.resolve(this.executionCache.store(args));
167
169
  }
168
170
 
169
171
  /**
170
- * Pack the given returns.
171
- * @param returns - Returns to pack
172
+ * Store values in the execution cache.
173
+ * @param values - Values to store.
174
+ * @returns The hash of the values.
172
175
  */
173
- public override packReturns(returns: Fr[]): Promise<Fr> {
174
- return Promise.resolve(this.packedValuesCache.pack(returns));
176
+ public override storeInExecutionCache(values: Fr[]): Promise<Fr> {
177
+ return Promise.resolve(this.executionCache.store(values));
175
178
  }
176
179
 
177
180
  /**
178
- * Unpack the given returns.
179
- * @param returnsHash - Returns hash to unpack
181
+ * Gets values from the execution cache.
182
+ * @param hash - Hash of the values.
183
+ * @returns The values.
180
184
  */
181
- public override unpackReturns(returnsHash: Fr): Promise<Fr[]> {
182
- return Promise.resolve(this.packedValuesCache.unpack(returnsHash));
185
+ public override loadFromExecutionCache(hash: Fr): Promise<Fr[]> {
186
+ return Promise.resolve(this.executionCache.getPreimage(hash));
183
187
  }
184
188
 
185
189
  /**
@@ -307,6 +311,17 @@ export class ClientExecutionContext extends ViewDataOracle {
307
311
  return Promise.resolve();
308
312
  }
309
313
 
314
+ /**
315
+ * Adding a siloed nullifier into the current set of all pending nullifiers created
316
+ * within the current transaction/execution.
317
+ * @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
318
+ * @param noteHash - A hash of the new note.
319
+ */
320
+ public override notifyCreatedNullifier(innerNullifier: Fr) {
321
+ this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
322
+ return Promise.resolve();
323
+ }
324
+
310
325
  /**
311
326
  * Emit a contract class unencrypted log.
312
327
  * This fn exists because sha hashing the preimage
@@ -323,7 +338,7 @@ export class ClientExecutionContext extends ViewDataOracle {
323
338
  return Fr.fromBuffer(log.hash());
324
339
  }
325
340
 
326
- #checkValidStaticCall(childExecutionResult: PrivateExecutionResult) {
341
+ #checkValidStaticCall(childExecutionResult: PrivateCallExecutionResult) {
327
342
  if (
328
343
  childExecutionResult.publicInputs.noteHashes.some(item => !item.isEmpty()) ||
329
344
  childExecutionResult.publicInputs.nullifiers.some(item => !item.isEmpty()) ||
@@ -339,7 +354,7 @@ export class ClientExecutionContext extends ViewDataOracle {
339
354
  * Calls a private function as a nested execution.
340
355
  * @param targetContractAddress - The address of the contract to call.
341
356
  * @param functionSelector - The function selector of the function to call.
342
- * @param argsHash - The packed arguments to pass to the function.
357
+ * @param argsHash - The arguments hash to pass to the function.
343
358
  * @param sideEffectCounter - The side effect counter at the start of the call.
344
359
  * @param isStaticCall - Whether the call is a static call.
345
360
  * @returns The execution result.
@@ -369,16 +384,18 @@ export class ClientExecutionContext extends ViewDataOracle {
369
384
  derivedCallContext,
370
385
  this.historicalHeader,
371
386
  this.authWitnesses,
372
- this.packedValuesCache,
387
+ this.executionCache,
373
388
  this.noteCache,
374
389
  this.db,
375
390
  this.node,
391
+ this.provider,
376
392
  sideEffectCounter,
377
393
  this.log,
378
394
  this.scopes,
379
395
  );
380
396
 
381
397
  const childExecutionResult = await executePrivateFunction(
398
+ this.provider,
382
399
  context,
383
400
  targetArtifact,
384
401
  targetContractAddress,
@@ -402,7 +419,7 @@ export class ClientExecutionContext extends ViewDataOracle {
402
419
  * Creates a PublicExecutionRequest object representing the request to call a public function.
403
420
  * @param targetContractAddress - The address of the contract to call.
404
421
  * @param functionSelector - The function selector of the function to call.
405
- * @param argsHash - The packed arguments to pass to the function.
422
+ * @param argsHash - The arguments hash to pass to the function.
406
423
  * @param sideEffectCounter - The side effect counter at the start of the call.
407
424
  * @param isStaticCall - Whether the call is a static call.
408
425
  * @returns The public call stack item with the request information.
@@ -417,7 +434,7 @@ export class ClientExecutionContext extends ViewDataOracle {
417
434
  ) {
418
435
  const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
419
436
  const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
420
- const args = this.packedValuesCache.unpack(argsHash);
437
+ const args = this.executionCache.getPreimage(argsHash);
421
438
 
422
439
  this.log.verbose(
423
440
  `Created ${callType} public execution request to ${targetArtifact.name}@${targetContractAddress}`,
@@ -448,7 +465,7 @@ export class ClientExecutionContext extends ViewDataOracle {
448
465
  * of the execution are empty.
449
466
  * @param targetContractAddress - The address of the contract to call.
450
467
  * @param functionSelector - The function selector of the function to call.
451
- * @param argsHash - The packed arguments to pass to the function.
468
+ * @param argsHash - The arguments hash to pass to the function.
452
469
  * @param sideEffectCounter - The side effect counter at the start of the call.
453
470
  * @param isStaticCall - Whether the call is a static call.
454
471
  * @returns The public call stack item with the request information.
@@ -462,13 +479,13 @@ export class ClientExecutionContext extends ViewDataOracle {
462
479
  ): Promise<Fr> {
463
480
  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
464
481
  // WARNING: This is insecure and should be temporary!
465
- // The oracle repacks the arguments and returns a new args_hash.
482
+ // The oracle re-hashes the arguments and returns a new args_hash.
466
483
  // new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
467
484
  // We don't validate or compute it in the circuit because a) it's harder to do with slices, and
468
485
  // b) this is only temporary.
469
- const newArgsHash = this.packedValuesCache.pack([
486
+ const newArgsHash = this.executionCache.store([
470
487
  functionSelector.toField(),
471
- ...this.packedValuesCache.unpack(argsHash),
488
+ ...this.executionCache.getPreimage(argsHash),
472
489
  ]);
473
490
  await this.createPublicExecutionRequest(
474
491
  'enqueued',
@@ -487,7 +504,7 @@ export class ClientExecutionContext extends ViewDataOracle {
487
504
  * of the execution are empty.
488
505
  * @param targetContractAddress - The address of the contract to call.
489
506
  * @param functionSelector - The function selector of the function to call.
490
- * @param argsHash - The packed arguments to pass to the function.
507
+ * @param argsHash - The arguments hash to pass to the function.
491
508
  * @param sideEffectCounter - The side effect counter at the start of the call.
492
509
  * @param isStaticCall - Whether the call is a static call.
493
510
  * @returns The public call stack item with the request information.
@@ -501,13 +518,13 @@ export class ClientExecutionContext extends ViewDataOracle {
501
518
  ): Promise<Fr> {
502
519
  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
503
520
  // WARNING: This is insecure and should be temporary!
504
- // The oracle repacks the arguments and returns a new args_hash.
521
+ // The oracle rehashes the arguments and returns a new args_hash.
505
522
  // new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
506
523
  // We don't validate or compute it in the circuit because a) it's harder to do with slices, and
507
524
  // b) this is only temporary.
508
- const newArgsHash = this.packedValuesCache.pack([
525
+ const newArgsHash = this.executionCache.store([
509
526
  functionSelector.toField(),
510
- ...this.packedValuesCache.unpack(argsHash),
527
+ ...this.executionCache.getPreimage(argsHash),
511
528
  ]);
512
529
  await this.createPublicExecutionRequest(
513
530
  'teardown',