@aztec/simulator 0.33.0 → 0.35.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 (186) hide show
  1. package/dest/acvm/acvm.d.ts +4 -1
  2. package/dest/acvm/acvm.d.ts.map +1 -1
  3. package/dest/acvm/acvm.js +5 -5
  4. package/dest/acvm/deserialize.d.ts +3 -5
  5. package/dest/acvm/deserialize.d.ts.map +1 -1
  6. package/dest/acvm/deserialize.js +6 -9
  7. package/dest/acvm/oracle/oracle.d.ts +3 -1
  8. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  9. package/dest/acvm/oracle/oracle.js +14 -6
  10. package/dest/acvm/oracle/typed_oracle.d.ts +2 -0
  11. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  12. package/dest/acvm/oracle/typed_oracle.js +7 -1
  13. package/dest/avm/avm_execution_environment.d.ts +6 -3
  14. package/dest/avm/avm_execution_environment.d.ts.map +1 -1
  15. package/dest/avm/avm_execution_environment.js +12 -9
  16. package/dest/avm/avm_gas.js +2 -2
  17. package/dest/avm/avm_machine_state.d.ts +2 -0
  18. package/dest/avm/avm_machine_state.d.ts.map +1 -1
  19. package/dest/avm/avm_machine_state.js +24 -6
  20. package/dest/avm/avm_memory_types.js +6 -6
  21. package/dest/avm/avm_simulator.js +7 -7
  22. package/dest/avm/fixtures/index.d.ts +3 -0
  23. package/dest/avm/fixtures/index.d.ts.map +1 -1
  24. package/dest/avm/fixtures/index.js +11 -4
  25. package/dest/avm/journal/journal.d.ts +15 -13
  26. package/dest/avm/journal/journal.d.ts.map +1 -1
  27. package/dest/avm/journal/journal.js +16 -5
  28. package/dest/avm/journal/trace.d.ts +8 -19
  29. package/dest/avm/journal/trace.d.ts.map +1 -1
  30. package/dest/avm/journal/trace.js +48 -116
  31. package/dest/avm/journal/trace_types.d.ts +23 -4
  32. package/dest/avm/journal/trace_types.d.ts.map +1 -1
  33. package/dest/avm/opcodes/accrued_substate.d.ts +2 -1
  34. package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
  35. package/dest/avm/opcodes/accrued_substate.js +14 -6
  36. package/dest/avm/opcodes/context_getters.js +2 -2
  37. package/dest/avm/opcodes/external_calls.d.ts +2 -2
  38. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  39. package/dest/avm/opcodes/external_calls.js +26 -10
  40. package/dest/avm/opcodes/hashing.d.ts +8 -8
  41. package/dest/avm/opcodes/hashing.d.ts.map +1 -1
  42. package/dest/avm/opcodes/hashing.js +35 -43
  43. package/dest/avm/serialization/instruction_serialization.d.ts +1 -1
  44. package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
  45. package/dest/avm/serialization/instruction_serialization.js +2 -2
  46. package/dest/client/client_execution_context.d.ts +14 -4
  47. package/dest/client/client_execution_context.d.ts.map +1 -1
  48. package/dest/client/client_execution_context.js +28 -13
  49. package/dest/client/private_execution.d.ts +1 -1
  50. package/dest/client/private_execution.d.ts.map +1 -1
  51. package/dest/client/private_execution.js +10 -8
  52. package/dest/client/simulator.d.ts.map +1 -1
  53. package/dest/client/simulator.js +6 -5
  54. package/dest/client/unconstrained_execution.d.ts +1 -1
  55. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  56. package/dest/client/unconstrained_execution.js +6 -5
  57. package/dest/client/view_data_oracle.d.ts +2 -2
  58. package/dest/client/view_data_oracle.d.ts.map +1 -1
  59. package/dest/client/view_data_oracle.js +2 -2
  60. package/dest/common/index.d.ts +1 -1
  61. package/dest/common/index.d.ts.map +1 -1
  62. package/dest/common/index.js +2 -2
  63. package/dest/common/packed_values_cache.d.ts +28 -0
  64. package/dest/common/packed_values_cache.d.ts.map +1 -0
  65. package/dest/common/packed_values_cache.js +50 -0
  66. package/dest/index.d.ts +1 -0
  67. package/dest/index.d.ts.map +1 -1
  68. package/dest/index.js +2 -1
  69. package/dest/mocks/fixtures.d.ts +42 -0
  70. package/dest/mocks/fixtures.d.ts.map +1 -0
  71. package/dest/mocks/fixtures.js +84 -0
  72. package/dest/mocks/index.d.ts +2 -0
  73. package/dest/mocks/index.d.ts.map +1 -0
  74. package/dest/mocks/index.js +2 -0
  75. package/dest/public/abstract_phase_manager.d.ts +82 -0
  76. package/dest/public/abstract_phase_manager.d.ts.map +1 -0
  77. package/dest/public/abstract_phase_manager.js +320 -0
  78. package/dest/public/app_logic_phase_manager.d.ts +29 -0
  79. package/dest/public/app_logic_phase_manager.d.ts.map +1 -0
  80. package/dest/public/app_logic_phase_manager.js +50 -0
  81. package/dest/public/execution.d.ts +3 -0
  82. package/dest/public/execution.d.ts.map +1 -1
  83. package/dest/public/execution.js +1 -1
  84. package/dest/public/executor.d.ts +1 -15
  85. package/dest/public/executor.d.ts.map +1 -1
  86. package/dest/public/executor.js +80 -83
  87. package/dest/public/hints_builder.d.ts +23 -0
  88. package/dest/public/hints_builder.d.ts.map +1 -0
  89. package/dest/public/hints_builder.js +62 -0
  90. package/dest/public/index.d.ts +5 -0
  91. package/dest/public/index.d.ts.map +1 -1
  92. package/dest/public/index.js +6 -1
  93. package/dest/public/phase_manager_factory.d.ts +18 -0
  94. package/dest/public/phase_manager_factory.d.ts.map +1 -0
  95. package/dest/public/phase_manager_factory.js +56 -0
  96. package/dest/public/public_execution_context.d.ts +20 -10
  97. package/dest/public/public_execution_context.d.ts.map +1 -1
  98. package/dest/public/public_execution_context.js +35 -23
  99. package/dest/public/public_executor.d.ts +79 -0
  100. package/dest/public/public_executor.d.ts.map +1 -0
  101. package/dest/public/public_executor.js +198 -0
  102. package/dest/public/public_kernel.d.ts +37 -0
  103. package/dest/public/public_kernel.d.ts.map +1 -0
  104. package/dest/public/public_kernel.js +97 -0
  105. package/dest/public/public_kernel_circuit_simulator.d.ts +31 -0
  106. package/dest/public/public_kernel_circuit_simulator.d.ts.map +1 -0
  107. package/dest/public/public_kernel_circuit_simulator.js +2 -0
  108. package/dest/public/public_processor.d.ts +53 -0
  109. package/dest/public/public_processor.d.ts.map +1 -0
  110. package/dest/public/public_processor.js +144 -0
  111. package/dest/public/setup_phase_manager.d.ts +30 -0
  112. package/dest/public/setup_phase_manager.d.ts.map +1 -0
  113. package/dest/public/setup_phase_manager.js +46 -0
  114. package/dest/public/tail_phase_manager.d.ts +30 -0
  115. package/dest/public/tail_phase_manager.d.ts.map +1 -0
  116. package/dest/public/tail_phase_manager.js +60 -0
  117. package/dest/public/teardown_phase_manager.d.ts +30 -0
  118. package/dest/public/teardown_phase_manager.d.ts.map +1 -0
  119. package/dest/public/teardown_phase_manager.js +46 -0
  120. package/dest/public/transitional_adaptors.d.ts +33 -0
  121. package/dest/public/transitional_adaptors.d.ts.map +1 -0
  122. package/dest/public/transitional_adaptors.js +162 -0
  123. package/dest/public/utils.d.ts +8 -0
  124. package/dest/public/utils.d.ts.map +1 -0
  125. package/dest/public/utils.js +29 -0
  126. package/dest/simulator/acvm_native.d.ts +19 -3
  127. package/dest/simulator/acvm_native.d.ts.map +1 -1
  128. package/dest/simulator/acvm_native.js +75 -48
  129. package/dest/simulator/acvm_wasm.d.ts.map +1 -1
  130. package/dest/simulator/acvm_wasm.js +3 -4
  131. package/package.json +8 -5
  132. package/src/acvm/acvm.ts +8 -5
  133. package/src/acvm/deserialize.ts +5 -9
  134. package/src/acvm/oracle/oracle.ts +15 -5
  135. package/src/acvm/oracle/typed_oracle.ts +8 -0
  136. package/src/avm/avm_execution_environment.ts +17 -17
  137. package/src/avm/avm_gas.ts +1 -1
  138. package/src/avm/avm_machine_state.ts +26 -5
  139. package/src/avm/avm_memory_types.ts +5 -5
  140. package/src/avm/avm_simulator.ts +6 -6
  141. package/src/avm/fixtures/index.ts +14 -1
  142. package/src/avm/journal/journal.ts +37 -17
  143. package/src/avm/journal/trace.ts +59 -121
  144. package/src/avm/journal/trace_types.ts +39 -39
  145. package/src/avm/opcodes/accrued_substate.ts +17 -5
  146. package/src/avm/opcodes/context_getters.ts +1 -1
  147. package/src/avm/opcodes/external_calls.ts +32 -9
  148. package/src/avm/opcodes/hashing.ts +38 -54
  149. package/src/avm/serialization/instruction_serialization.ts +1 -1
  150. package/src/client/client_execution_context.ts +30 -11
  151. package/src/client/private_execution.ts +9 -8
  152. package/src/client/simulator.ts +7 -3
  153. package/src/client/unconstrained_execution.ts +5 -4
  154. package/src/client/view_data_oracle.ts +1 -1
  155. package/src/common/index.ts +1 -1
  156. package/src/common/packed_values_cache.ts +55 -0
  157. package/src/index.ts +1 -0
  158. package/src/mocks/fixtures.ts +169 -0
  159. package/src/mocks/index.ts +1 -0
  160. package/src/public/abstract_phase_manager.ts +571 -0
  161. package/src/public/app_logic_phase_manager.ts +76 -0
  162. package/src/public/execution.ts +4 -0
  163. package/src/public/executor.ts +93 -93
  164. package/src/public/hints_builder.ts +119 -0
  165. package/src/public/index.ts +5 -0
  166. package/src/public/phase_manager_factory.ts +126 -0
  167. package/src/public/public_execution_context.ts +43 -37
  168. package/src/public/public_executor.ts +267 -0
  169. package/src/public/public_kernel.ts +139 -0
  170. package/src/public/public_kernel_circuit_simulator.ts +36 -0
  171. package/src/public/public_processor.ts +212 -0
  172. package/src/public/setup_phase_manager.ts +66 -0
  173. package/src/public/tail_phase_manager.ts +120 -0
  174. package/src/public/teardown_phase_manager.ts +66 -0
  175. package/src/public/transitional_adaptors.ts +249 -0
  176. package/src/public/utils.ts +31 -0
  177. package/src/simulator/acvm_native.ts +94 -47
  178. package/src/simulator/acvm_wasm.ts +7 -3
  179. package/dest/avm/temporary_executor_migration.d.ts +0 -27
  180. package/dest/avm/temporary_executor_migration.d.ts.map +0 -1
  181. package/dest/avm/temporary_executor_migration.js +0 -94
  182. package/dest/common/packed_args_cache.d.ts +0 -28
  183. package/dest/common/packed_args_cache.d.ts.map +0 -1
  184. package/dest/common/packed_args_cache.js +0 -50
  185. package/src/avm/temporary_executor_migration.ts +0 -136
  186. package/src/common/packed_args_cache.ts +0 -55
@@ -1 +1 @@
1
- {"version":3,"file":"public_execution_context.d.ts","sourceRoot":"","sources":["../../src/public/public_execution_context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,yBAAyB,EACzB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,MAAM,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAIxG;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,WAAW;IAMnD;;OAEG;aACa,SAAS,EAAE,eAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,eAAe,CAA0B;;IAG/C;;OAEG;IACa,SAAS,EAAE,eAAe,EACzB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EACrC,GAAG,8CAAgE;IAM7E;;;;;;;;OAQG;IACI,iBAAiB,CAAC,iBAAiB,SAAI;IAa9C;;OAEG;IACI,mBAAmB;IAI1B;;OAEG;IACI,kBAAkB;IAIzB;;OAEG;IACI,oBAAoB;;;;IAK3B;;;OAGG;IACI,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAI7C;;;;;;;OAOG;IACU,0BAA0B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;IAIlG;;;OAGG;IACI,kBAAkB,CAAC,GAAG,EAAE,gBAAgB;IAM/C;;;;;OAKG;IACU,wBAAwB,CAAC,eAAe,EAAE,YAAY;IAInE;;;;OAIG;IACU,WAAW,CAAC,gBAAgB,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM;IAYvE;;;;OAIG;IACU,YAAY,CAAC,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAc5D;;;;;;OAMG;IACU,kBAAkB,CAC7B,qBAAqB,EAAE,YAAY,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,EAAE,EACZ,iBAAiB,EAAE,MAAM,EACzB,YAAY,EAAE,OAAO,EACrB,cAAc,EAAE,OAAO;IA+DZ,6BAA6B,CACxC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAOrC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAYnF"}
1
+ {"version":3,"file":"public_execution_context.d.ts","sourceRoot":"","sources":["../../src/public/public_execution_context.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
1
+ import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
2
2
  import { CallContext, FunctionData, } from '@aztec/circuits.js';
3
3
  import { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import { Fr } from '@aztec/foundation/fields';
@@ -15,12 +15,12 @@ export class PublicExecutionContext extends TypedOracle {
15
15
  /**
16
16
  * Data for this execution.
17
17
  */
18
- execution, header, globalVariables, packedArgsCache, sideEffectCounter, stateDb, contractsDb, commitmentsDb, log = createDebugLogger('aztec:simulator:public_execution_context')) {
18
+ execution, header, globalVariables, packedValuesCache, sideEffectCounter, stateDb, contractsDb, commitmentsDb, log = createDebugLogger('aztec:simulator:public_execution_context')) {
19
19
  super();
20
20
  this.execution = execution;
21
21
  this.header = header;
22
22
  this.globalVariables = globalVariables;
23
- this.packedArgsCache = packedArgsCache;
23
+ this.packedValuesCache = packedValuesCache;
24
24
  this.sideEffectCounter = sideEffectCounter;
25
25
  this.stateDb = stateDb;
26
26
  this.contractsDb = contractsDb;
@@ -74,7 +74,21 @@ export class PublicExecutionContext extends TypedOracle {
74
74
  * @param args - Arguments to pack
75
75
  */
76
76
  packArguments(args) {
77
- return Promise.resolve(this.packedArgsCache.pack(args));
77
+ return Promise.resolve(this.packedValuesCache.pack(args));
78
+ }
79
+ /**
80
+ * Pack the given returns.
81
+ * @param returns - Returns to pack
82
+ */
83
+ packReturns(returns) {
84
+ return Promise.resolve(this.packedValuesCache.pack(returns));
85
+ }
86
+ /**
87
+ * Unpack the given returns.
88
+ * @param returnsHash - Returns hash to unpack
89
+ */
90
+ unpackReturns(returnsHash) {
91
+ return Promise.resolve(this.packedValuesCache.unpack(returnsHash));
78
92
  }
79
93
  /**
80
94
  * Fetches a message from the db, given its key.
@@ -94,7 +108,7 @@ export class PublicExecutionContext extends TypedOracle {
94
108
  emitUnencryptedLog(log) {
95
109
  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/885)
96
110
  this.unencryptedLogs.push(log);
97
- this.log(`Emitted unencrypted log: "${log.toHumanReadable()}"`);
111
+ this.log.verbose(`Emitted unencrypted log: "${log.toHumanReadable()}"`);
98
112
  }
99
113
  /**
100
114
  * Retrieves the portal contract address associated with the given contract address.
@@ -116,7 +130,7 @@ export class PublicExecutionContext extends TypedOracle {
116
130
  const storageSlot = new Fr(startStorageSlot.value + BigInt(i));
117
131
  const sideEffectCounter = this.sideEffectCounter.count();
118
132
  const value = await this.storageActions.read(storageSlot, sideEffectCounter);
119
- this.log(`Oracle storage read: slot=${storageSlot.toString()} value=${value.toString()}`);
133
+ this.log.debug(`Oracle storage read: slot=${storageSlot.toString()} value=${value.toString()}`);
120
134
  values.push(value);
121
135
  }
122
136
  return values;
@@ -134,7 +148,7 @@ export class PublicExecutionContext extends TypedOracle {
134
148
  const sideEffectCounter = this.sideEffectCounter.count();
135
149
  this.storageActions.write(storageSlot, newValue, sideEffectCounter);
136
150
  await this.stateDb.storageWrite(this.execution.callContext.storageContractAddress, storageSlot, newValue);
137
- this.log(`Oracle storage write: slot=${storageSlot.toString()} value=${newValue.toString()}`);
151
+ this.log.debug(`Oracle storage write: slot=${storageSlot.toString()} value=${newValue.toString()}`);
138
152
  newValues.push(newValue);
139
153
  }
140
154
  return newValues;
@@ -148,22 +162,22 @@ export class PublicExecutionContext extends TypedOracle {
148
162
  */
149
163
  async callPublicFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
150
164
  isStaticCall = isStaticCall || this.execution.callContext.isStaticCall;
151
- const args = this.packedArgsCache.unpack(argsHash);
152
- this.log(`Public function call: addr=${targetContractAddress} selector=${functionSelector} args=${args.join(',')}`);
165
+ const args = this.packedValuesCache.unpack(argsHash);
166
+ this.log.verbose(`Public function call: addr=${targetContractAddress} selector=${functionSelector} args=${args.join(',')}`);
153
167
  const portalAddress = (await this.contractsDb.getPortalContractAddress(targetContractAddress)) ?? EthAddress.ZERO;
154
- const acir = await this.contractsDb.getBytecode(targetContractAddress, functionSelector);
155
- if (!acir) {
156
- throw new Error(`Bytecode not found for ${targetContractAddress}:${functionSelector}`);
157
- }
158
- const functionData = new FunctionData(functionSelector, false);
168
+ const functionData = new FunctionData(functionSelector, /*isPrivate=*/ false);
169
+ const { transactionFee, gasSettings, gasLeft } = this.execution.callContext;
159
170
  const callContext = CallContext.from({
160
171
  msgSender: isDelegateCall ? this.execution.callContext.msgSender : this.execution.contractAddress,
161
172
  storageContractAddress: isDelegateCall ? this.execution.contractAddress : targetContractAddress,
162
173
  portalContractAddress: portalAddress,
163
174
  functionSelector,
175
+ gasLeft, // Propagate the same gas left as when we started since ACVM public functions don't have any metering
164
176
  isDelegateCall,
165
177
  isStaticCall,
166
178
  sideEffectCounter,
179
+ gasSettings,
180
+ transactionFee,
167
181
  });
168
182
  const nestedExecution = {
169
183
  args,
@@ -171,20 +185,18 @@ export class PublicExecutionContext extends TypedOracle {
171
185
  functionData,
172
186
  callContext,
173
187
  };
174
- const context = new PublicExecutionContext(nestedExecution, this.header, this.globalVariables, this.packedArgsCache, this.sideEffectCounter, this.stateDb, this.contractsDb, this.commitmentsDb, this.log);
175
- const childExecutionResult = await executePublicFunction(context, acir, true /** nested */);
188
+ const context = new PublicExecutionContext(nestedExecution, this.header, this.globalVariables, this.packedValuesCache, this.sideEffectCounter, this.stateDb, this.contractsDb, this.commitmentsDb, this.log);
189
+ const childExecutionResult = await executePublicFunction(context, /*nested=*/ true);
176
190
  if (isStaticCall) {
177
191
  checkValidStaticCall(childExecutionResult.newNoteHashes, childExecutionResult.newNullifiers, childExecutionResult.contractStorageUpdateRequests, childExecutionResult.newL2ToL1Messages, childExecutionResult.unencryptedLogs);
178
192
  }
179
193
  this.nestedExecutions.push(childExecutionResult);
180
- this.log(`Returning from nested call: ret=${childExecutionResult.returnValues.join(', ')}`);
194
+ this.log.debug(`Returning from nested call: ret=${childExecutionResult.returnValues.join(', ')}`);
181
195
  return childExecutionResult.returnValues;
182
196
  }
183
- async getNullifierMembershipWitness(blockNumber, nullifier) {
184
- if (!this.header.globalVariables.blockNumber.equals(new Fr(blockNumber))) {
185
- throw new Error(`Public execution oracle can only access nullifier membership witnesses for the current block`);
186
- }
187
- return await this.commitmentsDb.getNullifierMembershipWitnessAtLatestBlock(nullifier);
197
+ async checkNullifierExists(nullifier) {
198
+ const witness = await this.commitmentsDb.getNullifierMembershipWitnessAtLatestBlock(nullifier);
199
+ return !!witness;
188
200
  }
189
201
  async getContractInstance(address) {
190
202
  // Note to AVM implementor: The wrapper of the oracle call get_contract_instance in aztec-nr
@@ -199,4 +211,4 @@ export class PublicExecutionContext extends TypedOracle {
199
211
  return instance;
200
212
  }
201
213
  }
202
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_execution_context.js","sourceRoot":"","sources":["../../src/public/public_execution_context.ts"],"names":[],"mappings":"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"}
214
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_execution_context.js","sourceRoot":"","sources":["../../src/public/public_execution_context.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,79 @@
1
+ /// <reference types="node" resolution-mode="require"/>
2
+ import { NullifierMembershipWitness, type Tx } from '@aztec/circuit-types';
3
+ import { type AztecAddress, type EthAddress, Fr, type FunctionSelector, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
4
+ import { type CommitmentsDB, MessageLoadOracleInputs, type PublicContractsDB, type PublicStateDB } from '@aztec/simulator';
5
+ import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress } from '@aztec/types/contracts';
6
+ import { type MerkleTreeOperations } from '@aztec/world-state';
7
+ /**
8
+ * Implements the PublicContractsDB using a ContractDataSource.
9
+ * Progressively records contracts in transaction as they are processed in a block.
10
+ */
11
+ export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
12
+ private db;
13
+ private instanceCache;
14
+ private classCache;
15
+ private log;
16
+ constructor(db: ContractDataSource);
17
+ /**
18
+ * Add new contracts from a transaction
19
+ * @param tx - The transaction to add contracts from.
20
+ */
21
+ addNewContracts(tx: Tx): Promise<void>;
22
+ /**
23
+ * Removes new contracts added from transactions
24
+ * @param tx - The tx's contracts to be removed
25
+ */
26
+ removeNewContracts(tx: Tx): Promise<void>;
27
+ getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
28
+ getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined>;
29
+ getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined>;
30
+ getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined>;
31
+ }
32
+ /**
33
+ * Implements the PublicStateDB using a world-state database.
34
+ */
35
+ export declare class WorldStatePublicDB implements PublicStateDB {
36
+ private db;
37
+ private committedWriteCache;
38
+ private checkpointedWriteCache;
39
+ private uncommittedWriteCache;
40
+ constructor(db: MerkleTreeOperations);
41
+ /**
42
+ * Reads a value from public storage, returning zero if none.
43
+ * @param contract - Owner of the storage.
44
+ * @param slot - Slot to read in the contract storage.
45
+ * @returns The current value in the storage slot.
46
+ */
47
+ storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
48
+ /**
49
+ * Records a write to public storage.
50
+ * @param contract - Owner of the storage.
51
+ * @param slot - Slot to read in the contract storage.
52
+ * @param newValue - The new value to store.
53
+ */
54
+ storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
55
+ /**
56
+ * Commit the pending changes to the DB.
57
+ * @returns Nothing.
58
+ */
59
+ commit(): Promise<void>;
60
+ /**
61
+ * Rollback the pending changes.
62
+ * @returns Nothing.
63
+ */
64
+ rollbackToCommit(): Promise<void>;
65
+ checkpoint(): Promise<void>;
66
+ rollbackToCheckpoint(): Promise<void>;
67
+ }
68
+ /**
69
+ * Implements WorldState db using a world state database.
70
+ */
71
+ export declare class WorldStateDB implements CommitmentsDB {
72
+ private db;
73
+ constructor(db: MerkleTreeOperations);
74
+ getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
75
+ getL1ToL2MembershipWitness(contractAddress: AztecAddress, messageHash: Fr, secret: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
76
+ getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;
77
+ getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
78
+ }
79
+ //# sourceMappingURL=public_executor.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/public/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,0BAA0B,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EACL,KAAK,YAAY,EAGjB,KAAK,UAAU,EACf,EAAE,EACF,KAAK,gBAAgB,EACrB,KAAK,wBAAwB,EAI9B,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EACL,KAAK,aAAa,EAClB,uBAAuB,EACvB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;IAMvD,OAAO,CAAC,EAAE;IALtB,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,UAAU,CAA0C;IAE5D,OAAO,CAAC,GAAG,CAA8D;gBAErD,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI5F,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAItF,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY3F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAIvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,qBAAqB,CAA8B;gBAEvC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IA4BvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvB;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAE/B,0CAA0C,CACrD,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAqBrC,0BAA0B,CACrC,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC;IA2BvD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG3E"}
@@ -0,0 +1,198 @@
1
+ import { MerkleTreeId, NullifierMembershipWitness } from '@aztec/circuit-types';
2
+ import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent, Fr, } from '@aztec/circuits.js';
3
+ import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
4
+ import { createDebugLogger } from '@aztec/foundation/log';
5
+ import { getCanonicalClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
6
+ import { MessageLoadOracleInputs, } from '@aztec/simulator';
7
+ /**
8
+ * Implements the PublicContractsDB using a ContractDataSource.
9
+ * Progressively records contracts in transaction as they are processed in a block.
10
+ */
11
+ export class ContractsDataSourcePublicDB {
12
+ constructor(db) {
13
+ this.db = db;
14
+ this.instanceCache = new Map();
15
+ this.classCache = new Map();
16
+ this.log = createDebugLogger('aztec:sequencer:contracts-data-source');
17
+ }
18
+ /**
19
+ * Add new contracts from a transaction
20
+ * @param tx - The transaction to add contracts from.
21
+ */
22
+ addNewContracts(tx) {
23
+ // Extract contract class and instance data from logs and add to cache for this block
24
+ const logs = tx.unencryptedLogs.unrollLogs();
25
+ ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e => {
26
+ this.log.debug(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
27
+ this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
28
+ });
29
+ ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => {
30
+ this.log.debug(`Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`);
31
+ this.instanceCache.set(e.address.toString(), e.toContractInstance());
32
+ });
33
+ return Promise.resolve();
34
+ }
35
+ /**
36
+ * Removes new contracts added from transactions
37
+ * @param tx - The tx's contracts to be removed
38
+ */
39
+ removeNewContracts(tx) {
40
+ // TODO(@spalladino): Can this inadvertently delete a valid contract added by another tx?
41
+ // Let's say we have two txs adding the same contract on the same block. If the 2nd one reverts,
42
+ // wouldn't that accidentally remove the contract added on the first one?
43
+ const logs = tx.unencryptedLogs.unrollLogs();
44
+ ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e => this.classCache.delete(e.contractClassId.toString()));
45
+ ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => this.instanceCache.delete(e.address.toString()));
46
+ return Promise.resolve();
47
+ }
48
+ async getContractInstance(address) {
49
+ return this.instanceCache.get(address.toString()) ?? (await this.db.getContract(address));
50
+ }
51
+ async getContractClass(contractClassId) {
52
+ return this.classCache.get(contractClassId.toString()) ?? (await this.db.getContractClass(contractClassId));
53
+ }
54
+ async getBytecode(address, selector) {
55
+ const instance = await this.getContractInstance(address);
56
+ if (!instance) {
57
+ throw new Error(`Contract ${address.toString()} not found`);
58
+ }
59
+ const contractClass = await this.getContractClass(instance.contractClassId);
60
+ if (!contractClass) {
61
+ throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
62
+ }
63
+ return contractClass.publicFunctions.find(f => f.selector.equals(selector))?.bytecode;
64
+ }
65
+ async getPortalContractAddress(address) {
66
+ const contract = await this.getContractInstance(address);
67
+ return contract?.portalContractAddress;
68
+ }
69
+ }
70
+ /**
71
+ * Implements the PublicStateDB using a world-state database.
72
+ */
73
+ export class WorldStatePublicDB {
74
+ constructor(db) {
75
+ this.db = db;
76
+ this.committedWriteCache = new Map();
77
+ this.checkpointedWriteCache = new Map();
78
+ this.uncommittedWriteCache = new Map();
79
+ }
80
+ /**
81
+ * Reads a value from public storage, returning zero if none.
82
+ * @param contract - Owner of the storage.
83
+ * @param slot - Slot to read in the contract storage.
84
+ * @returns The current value in the storage slot.
85
+ */
86
+ async storageRead(contract, slot) {
87
+ const leafSlot = computePublicDataTreeLeafSlot(contract, slot).value;
88
+ const uncommitted = this.uncommittedWriteCache.get(leafSlot);
89
+ if (uncommitted !== undefined) {
90
+ return uncommitted;
91
+ }
92
+ const checkpointed = this.checkpointedWriteCache.get(leafSlot);
93
+ if (checkpointed !== undefined) {
94
+ return checkpointed;
95
+ }
96
+ const committed = this.committedWriteCache.get(leafSlot);
97
+ if (committed !== undefined) {
98
+ return committed;
99
+ }
100
+ const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
101
+ if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
102
+ return Fr.ZERO;
103
+ }
104
+ const preimage = (await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
105
+ return preimage.value;
106
+ }
107
+ /**
108
+ * Records a write to public storage.
109
+ * @param contract - Owner of the storage.
110
+ * @param slot - Slot to read in the contract storage.
111
+ * @param newValue - The new value to store.
112
+ */
113
+ storageWrite(contract, slot, newValue) {
114
+ const index = computePublicDataTreeLeafSlot(contract, slot).value;
115
+ this.uncommittedWriteCache.set(index, newValue);
116
+ return Promise.resolve();
117
+ }
118
+ /**
119
+ * Commit the pending changes to the DB.
120
+ * @returns Nothing.
121
+ */
122
+ commit() {
123
+ for (const [k, v] of this.checkpointedWriteCache) {
124
+ this.committedWriteCache.set(k, v);
125
+ }
126
+ // uncommitted writes take precedence over checkpointed writes
127
+ // since they are the most recent
128
+ for (const [k, v] of this.uncommittedWriteCache) {
129
+ this.committedWriteCache.set(k, v);
130
+ }
131
+ return this.rollbackToCommit();
132
+ }
133
+ /**
134
+ * Rollback the pending changes.
135
+ * @returns Nothing.
136
+ */
137
+ async rollbackToCommit() {
138
+ await this.rollbackToCheckpoint();
139
+ this.checkpointedWriteCache = new Map();
140
+ return Promise.resolve();
141
+ }
142
+ checkpoint() {
143
+ for (const [k, v] of this.uncommittedWriteCache) {
144
+ this.checkpointedWriteCache.set(k, v);
145
+ }
146
+ return this.rollbackToCheckpoint();
147
+ }
148
+ rollbackToCheckpoint() {
149
+ this.uncommittedWriteCache = new Map();
150
+ return Promise.resolve();
151
+ }
152
+ }
153
+ /**
154
+ * Implements WorldState db using a world state database.
155
+ */
156
+ export class WorldStateDB {
157
+ constructor(db) {
158
+ this.db = db;
159
+ }
160
+ async getNullifierMembershipWitnessAtLatestBlock(nullifier) {
161
+ const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
162
+ if (!index) {
163
+ return undefined;
164
+ }
165
+ const leafPreimagePromise = this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
166
+ const siblingPathPromise = this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
167
+ const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
168
+ if (!leafPreimage) {
169
+ return undefined;
170
+ }
171
+ return new NullifierMembershipWitness(BigInt(index), leafPreimage, siblingPath);
172
+ }
173
+ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
174
+ let nullifierIndex;
175
+ let messageIndex;
176
+ let startIndex = 0n;
177
+ // We iterate over messages until we find one whose nullifier is not in the nullifier tree --> we need to check
178
+ // for nullifiers because messages can have duplicates.
179
+ do {
180
+ messageIndex = (await this.db.findLeafIndexAfter(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageHash, startIndex));
181
+ if (messageIndex === undefined) {
182
+ throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
183
+ }
184
+ const messageNullifier = computeL1ToL2MessageNullifier(contractAddress, messageHash, secret, messageIndex);
185
+ nullifierIndex = await this.getNullifierIndex(messageNullifier);
186
+ startIndex = messageIndex + 1n;
187
+ } while (nullifierIndex !== undefined);
188
+ const siblingPath = await this.db.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageIndex);
189
+ return new MessageLoadOracleInputs(messageIndex, siblingPath);
190
+ }
191
+ async getCommitmentIndex(commitment) {
192
+ return await this.db.findLeafIndex(MerkleTreeId.NOTE_HASH_TREE, commitment);
193
+ }
194
+ async getNullifierIndex(nullifier) {
195
+ return await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
196
+ }
197
+ }
198
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_executor.js","sourceRoot":"","sources":["../../src/public/public_executor.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,37 @@
1
+ import { type KernelCircuitPublicInputs, type PublicKernelCircuitPrivateInputs, type PublicKernelCircuitPublicInputs, type PublicKernelTailCircuitPrivateInputs } from '@aztec/circuits.js';
2
+ import { type SimulationProvider } from '@aztec/simulator';
3
+ import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
4
+ /**
5
+ * Implements the PublicKernelCircuitSimulator.
6
+ */
7
+ export declare class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
8
+ private simulator;
9
+ private log;
10
+ private wasmSimulator;
11
+ constructor(simulator: SimulationProvider);
12
+ /**
13
+ * Simulates the public kernel setup circuit from its inputs.
14
+ * @param input - Inputs to the circuit.
15
+ * @returns The public inputs as outputs of the simulation.
16
+ */
17
+ publicKernelCircuitSetup(input: PublicKernelCircuitPrivateInputs): Promise<PublicKernelCircuitPublicInputs>;
18
+ /**
19
+ * Simulates the public kernel app logic circuit from its inputs.
20
+ * @param input - Inputs to the circuit.
21
+ * @returns The public inputs as outputs of the simulation.
22
+ */
23
+ publicKernelCircuitAppLogic(input: PublicKernelCircuitPrivateInputs): Promise<PublicKernelCircuitPublicInputs>;
24
+ /**
25
+ * Simulates the public kernel teardown circuit from its inputs.
26
+ * @param input - Inputs to the circuit.
27
+ * @returns The public inputs as outputs of the simulation.
28
+ */
29
+ publicKernelCircuitTeardown(input: PublicKernelCircuitPrivateInputs): Promise<PublicKernelCircuitPublicInputs>;
30
+ /**
31
+ * Simulates the public kernel tail circuit from its inputs.
32
+ * @param input - Inputs to the circuit.
33
+ * @returns The public inputs as outputs of the simulation.
34
+ */
35
+ publicKernelCircuitTail(input: PublicKernelTailCircuitPrivateInputs): Promise<KernelCircuitPublicInputs>;
36
+ }
37
+ //# sourceMappingURL=public_kernel.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public_kernel.d.ts","sourceRoot":"","sources":["../../src/public/public_kernel.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,EAC1C,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAAE,KAAK,kBAAkB,EAAiB,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,gCAAiC,YAAW,4BAA4B;IAMvE,OAAO,CAAC,SAAS;IAL7B,OAAO,CAAC,GAAG,CAAsD;IAGjE,OAAO,CAAC,aAAa,CAAsC;gBAEvC,SAAS,EAAE,kBAAkB;IAEjD;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,oCAAoC,GAC1C,OAAO,CAAC,yBAAyB,CAAC;CAetC"}
@@ -0,0 +1,97 @@
1
+ import { createDebugLogger } from '@aztec/foundation/log';
2
+ import { elapsed } from '@aztec/foundation/timer';
3
+ import { PublicKernelAppLogicArtifact, PublicKernelSetupArtifact, PublicKernelTailArtifact, PublicKernelTeardownArtifact, convertPublicInnerRollupInputsToWitnessMap, convertPublicInnerRollupOutputFromWitnessMap, convertPublicSetupRollupInputsToWitnessMap, convertPublicSetupRollupOutputFromWitnessMap, convertPublicTailInputsToWitnessMap, convertPublicTailOutputFromWitnessMap, convertPublicTeardownRollupInputsToWitnessMap, convertPublicTeardownRollupOutputFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
4
+ import { WASMSimulator } from '@aztec/simulator';
5
+ /**
6
+ * Implements the PublicKernelCircuitSimulator.
7
+ */
8
+ export class RealPublicKernelCircuitSimulator {
9
+ constructor(simulator) {
10
+ this.simulator = simulator;
11
+ this.log = createDebugLogger('aztec:public-kernel-simulator');
12
+ // Some circuits are so small it is faster to use WASM
13
+ this.wasmSimulator = new WASMSimulator();
14
+ }
15
+ /**
16
+ * Simulates the public kernel setup circuit from its inputs.
17
+ * @param input - Inputs to the circuit.
18
+ * @returns The public inputs as outputs of the simulation.
19
+ */
20
+ async publicKernelCircuitSetup(input) {
21
+ if (!input.previousKernel.publicInputs.needsSetup) {
22
+ throw new Error(`Expected previous kernel inputs to need setup`);
23
+ }
24
+ const inputWitness = convertPublicSetupRollupInputsToWitnessMap(input);
25
+ const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelSetupArtifact));
26
+ const result = convertPublicSetupRollupOutputFromWitnessMap(witness);
27
+ this.log.debug(`Simulated public kernel setup circuit`, {
28
+ eventName: 'circuit-simulation',
29
+ circuitName: 'public-kernel-setup',
30
+ duration,
31
+ inputSize: input.toBuffer().length,
32
+ outputSize: result.toBuffer().length,
33
+ });
34
+ return result;
35
+ }
36
+ /**
37
+ * Simulates the public kernel app logic circuit from its inputs.
38
+ * @param input - Inputs to the circuit.
39
+ * @returns The public inputs as outputs of the simulation.
40
+ */
41
+ async publicKernelCircuitAppLogic(input) {
42
+ if (!input.previousKernel.publicInputs.needsAppLogic) {
43
+ throw new Error(`Expected previous kernel inputs to need app logic`);
44
+ }
45
+ const inputWitness = convertPublicInnerRollupInputsToWitnessMap(input);
46
+ const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelAppLogicArtifact));
47
+ const result = convertPublicInnerRollupOutputFromWitnessMap(witness);
48
+ this.log.debug(`Simulated public kernel app logic circuit`, {
49
+ eventName: 'circuit-simulation',
50
+ circuitName: 'public-kernel-app-logic',
51
+ duration,
52
+ inputSize: input.toBuffer().length,
53
+ outputSize: result.toBuffer().length,
54
+ });
55
+ return result;
56
+ }
57
+ /**
58
+ * Simulates the public kernel teardown circuit from its inputs.
59
+ * @param input - Inputs to the circuit.
60
+ * @returns The public inputs as outputs of the simulation.
61
+ */
62
+ async publicKernelCircuitTeardown(input) {
63
+ if (!input.previousKernel.publicInputs.needsTeardown) {
64
+ throw new Error(`Expected previous kernel inputs to need teardown`);
65
+ }
66
+ const inputWitness = convertPublicTeardownRollupInputsToWitnessMap(input);
67
+ const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelTeardownArtifact));
68
+ const result = convertPublicTeardownRollupOutputFromWitnessMap(witness);
69
+ this.log.debug(`Simulated public kernel teardown circuit`, {
70
+ eventName: 'circuit-simulation',
71
+ circuitName: 'public-kernel-teardown',
72
+ duration,
73
+ inputSize: input.toBuffer().length,
74
+ outputSize: result.toBuffer().length,
75
+ });
76
+ return result;
77
+ }
78
+ /**
79
+ * Simulates the public kernel tail circuit from its inputs.
80
+ * @param input - Inputs to the circuit.
81
+ * @returns The public inputs as outputs of the simulation.
82
+ */
83
+ async publicKernelCircuitTail(input) {
84
+ const inputWitness = convertPublicTailInputsToWitnessMap(input);
85
+ const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelTailArtifact));
86
+ const result = convertPublicTailOutputFromWitnessMap(witness);
87
+ this.log.debug(`Simulated public kernel tail circuit`, {
88
+ eventName: 'circuit-simulation',
89
+ circuitName: 'public-kernel-tail',
90
+ duration,
91
+ inputSize: input.toBuffer().length,
92
+ outputSize: result.toBuffer().length,
93
+ });
94
+ return result;
95
+ }
96
+ }
97
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tlcm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX2tlcm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUNMLDRCQUE0QixFQUM1Qix5QkFBeUIsRUFDekIsd0JBQXdCLEVBQ3hCLDRCQUE0QixFQUM1QiwwQ0FBMEMsRUFDMUMsNENBQTRDLEVBQzVDLDBDQUEwQyxFQUMxQyw0Q0FBNEMsRUFDNUMsbUNBQW1DLEVBQ25DLHFDQUFxQyxFQUNyQyw2Q0FBNkMsRUFDN0MsK0NBQStDLEdBQ2hELE1BQU0scUNBQXFDLENBQUM7QUFDN0MsT0FBTyxFQUEyQixhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUkxRTs7R0FFRztBQUNILE1BQU0sT0FBTyxnQ0FBZ0M7SUFNM0MsWUFBb0IsU0FBNkI7UUFBN0IsY0FBUyxHQUFULFNBQVMsQ0FBb0I7UUFMekMsUUFBRyxHQUFHLGlCQUFpQixDQUFDLCtCQUErQixDQUFDLENBQUM7UUFFakUsc0RBQXNEO1FBQzlDLGtCQUFhLEdBQWtCLElBQUksYUFBYSxFQUFFLENBQUM7SUFFUCxDQUFDO0lBRXJEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsd0JBQXdCLENBQ25DLEtBQXVDO1FBRXZDLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNsRCxNQUFNLElBQUksS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7UUFDbkUsQ0FBQztRQUNELE1BQU0sWUFBWSxHQUFHLDBDQUEwQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FB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