@aztec/simulator 0.34.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 (168) 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 +2 -0
  8. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  9. package/dest/acvm/oracle/oracle.js +12 -4
  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 +4 -2
  14. package/dest/avm/avm_execution_environment.d.ts.map +1 -1
  15. package/dest/avm/avm_execution_environment.js +7 -5
  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 +2 -2
  21. package/dest/avm/avm_simulator.js +2 -2
  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 +1 -0
  26. package/dest/avm/journal/journal.d.ts.map +1 -1
  27. package/dest/avm/journal/journal.js +12 -1
  28. package/dest/avm/opcodes/accrued_substate.d.ts +2 -1
  29. package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
  30. package/dest/avm/opcodes/accrued_substate.js +13 -5
  31. package/dest/avm/opcodes/context_getters.js +2 -2
  32. package/dest/avm/opcodes/external_calls.d.ts +2 -2
  33. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  34. package/dest/avm/opcodes/external_calls.js +7 -6
  35. package/dest/avm/opcodes/hashing.d.ts +8 -8
  36. package/dest/avm/opcodes/hashing.d.ts.map +1 -1
  37. package/dest/avm/opcodes/hashing.js +35 -43
  38. package/dest/avm/serialization/instruction_serialization.d.ts +1 -1
  39. package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
  40. package/dest/avm/serialization/instruction_serialization.js +2 -2
  41. package/dest/client/client_execution_context.d.ts +13 -3
  42. package/dest/client/client_execution_context.d.ts.map +1 -1
  43. package/dest/client/client_execution_context.js +23 -8
  44. package/dest/client/private_execution.d.ts.map +1 -1
  45. package/dest/client/private_execution.js +8 -6
  46. package/dest/client/simulator.d.ts.map +1 -1
  47. package/dest/client/simulator.js +6 -5
  48. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  49. package/dest/client/unconstrained_execution.js +5 -4
  50. package/dest/common/index.d.ts +1 -1
  51. package/dest/common/index.d.ts.map +1 -1
  52. package/dest/common/index.js +2 -2
  53. package/dest/common/packed_values_cache.d.ts +28 -0
  54. package/dest/common/packed_values_cache.d.ts.map +1 -0
  55. package/dest/common/packed_values_cache.js +50 -0
  56. package/dest/index.d.ts +1 -0
  57. package/dest/index.d.ts.map +1 -1
  58. package/dest/index.js +2 -1
  59. package/dest/mocks/fixtures.d.ts +42 -0
  60. package/dest/mocks/fixtures.d.ts.map +1 -0
  61. package/dest/mocks/fixtures.js +84 -0
  62. package/dest/mocks/index.d.ts +2 -0
  63. package/dest/mocks/index.d.ts.map +1 -0
  64. package/dest/mocks/index.js +2 -0
  65. package/dest/public/abstract_phase_manager.d.ts +82 -0
  66. package/dest/public/abstract_phase_manager.d.ts.map +1 -0
  67. package/dest/public/abstract_phase_manager.js +320 -0
  68. package/dest/public/app_logic_phase_manager.d.ts +29 -0
  69. package/dest/public/app_logic_phase_manager.d.ts.map +1 -0
  70. package/dest/public/app_logic_phase_manager.js +50 -0
  71. package/dest/public/execution.d.ts +3 -0
  72. package/dest/public/execution.d.ts.map +1 -1
  73. package/dest/public/execution.js +1 -1
  74. package/dest/public/executor.d.ts.map +1 -1
  75. package/dest/public/executor.js +17 -13
  76. package/dest/public/hints_builder.d.ts +23 -0
  77. package/dest/public/hints_builder.d.ts.map +1 -0
  78. package/dest/public/hints_builder.js +62 -0
  79. package/dest/public/index.d.ts +5 -0
  80. package/dest/public/index.d.ts.map +1 -1
  81. package/dest/public/index.js +6 -1
  82. package/dest/public/phase_manager_factory.d.ts +18 -0
  83. package/dest/public/phase_manager_factory.d.ts.map +1 -0
  84. package/dest/public/phase_manager_factory.js +56 -0
  85. package/dest/public/public_execution_context.d.ts +15 -5
  86. package/dest/public/public_execution_context.d.ts.map +1 -1
  87. package/dest/public/public_execution_context.js +28 -12
  88. package/dest/public/public_executor.d.ts +79 -0
  89. package/dest/public/public_executor.d.ts.map +1 -0
  90. package/dest/public/public_executor.js +198 -0
  91. package/dest/public/public_kernel.d.ts +37 -0
  92. package/dest/public/public_kernel.d.ts.map +1 -0
  93. package/dest/public/public_kernel.js +97 -0
  94. package/dest/public/public_kernel_circuit_simulator.d.ts +31 -0
  95. package/dest/public/public_kernel_circuit_simulator.d.ts.map +1 -0
  96. package/dest/public/public_kernel_circuit_simulator.js +2 -0
  97. package/dest/public/public_processor.d.ts +53 -0
  98. package/dest/public/public_processor.d.ts.map +1 -0
  99. package/dest/public/public_processor.js +144 -0
  100. package/dest/public/setup_phase_manager.d.ts +30 -0
  101. package/dest/public/setup_phase_manager.d.ts.map +1 -0
  102. package/dest/public/setup_phase_manager.js +46 -0
  103. package/dest/public/tail_phase_manager.d.ts +30 -0
  104. package/dest/public/tail_phase_manager.d.ts.map +1 -0
  105. package/dest/public/tail_phase_manager.js +60 -0
  106. package/dest/public/teardown_phase_manager.d.ts +30 -0
  107. package/dest/public/teardown_phase_manager.d.ts.map +1 -0
  108. package/dest/public/teardown_phase_manager.js +46 -0
  109. package/dest/public/transitional_adaptors.d.ts +2 -1
  110. package/dest/public/transitional_adaptors.d.ts.map +1 -1
  111. package/dest/public/transitional_adaptors.js +11 -10
  112. package/dest/public/utils.d.ts +8 -0
  113. package/dest/public/utils.d.ts.map +1 -0
  114. package/dest/public/utils.js +29 -0
  115. package/dest/simulator/acvm_native.d.ts +19 -3
  116. package/dest/simulator/acvm_native.d.ts.map +1 -1
  117. package/dest/simulator/acvm_native.js +75 -48
  118. package/dest/simulator/acvm_wasm.d.ts.map +1 -1
  119. package/dest/simulator/acvm_wasm.js +3 -4
  120. package/package.json +8 -5
  121. package/src/acvm/acvm.ts +8 -5
  122. package/src/acvm/deserialize.ts +5 -9
  123. package/src/acvm/oracle/oracle.ts +13 -3
  124. package/src/acvm/oracle/typed_oracle.ts +8 -0
  125. package/src/avm/avm_execution_environment.ts +9 -1
  126. package/src/avm/avm_gas.ts +1 -1
  127. package/src/avm/avm_machine_state.ts +26 -5
  128. package/src/avm/avm_memory_types.ts +1 -1
  129. package/src/avm/avm_simulator.ts +1 -1
  130. package/src/avm/fixtures/index.ts +13 -1
  131. package/src/avm/journal/journal.ts +13 -0
  132. package/src/avm/opcodes/accrued_substate.ts +16 -4
  133. package/src/avm/opcodes/context_getters.ts +1 -1
  134. package/src/avm/opcodes/external_calls.ts +8 -5
  135. package/src/avm/opcodes/hashing.ts +38 -54
  136. package/src/avm/serialization/instruction_serialization.ts +1 -1
  137. package/src/client/client_execution_context.ts +25 -6
  138. package/src/client/private_execution.ts +7 -6
  139. package/src/client/simulator.ts +7 -3
  140. package/src/client/unconstrained_execution.ts +4 -3
  141. package/src/common/index.ts +1 -1
  142. package/src/common/packed_values_cache.ts +55 -0
  143. package/src/index.ts +1 -0
  144. package/src/mocks/fixtures.ts +169 -0
  145. package/src/mocks/index.ts +1 -0
  146. package/src/public/abstract_phase_manager.ts +571 -0
  147. package/src/public/app_logic_phase_manager.ts +76 -0
  148. package/src/public/execution.ts +4 -0
  149. package/src/public/executor.ts +18 -13
  150. package/src/public/hints_builder.ts +119 -0
  151. package/src/public/index.ts +5 -0
  152. package/src/public/phase_manager_factory.ts +126 -0
  153. package/src/public/public_execution_context.ts +29 -18
  154. package/src/public/public_executor.ts +267 -0
  155. package/src/public/public_kernel.ts +139 -0
  156. package/src/public/public_kernel_circuit_simulator.ts +36 -0
  157. package/src/public/public_processor.ts +212 -0
  158. package/src/public/setup_phase_manager.ts +66 -0
  159. package/src/public/tail_phase_manager.ts +120 -0
  160. package/src/public/teardown_phase_manager.ts +66 -0
  161. package/src/public/transitional_adaptors.ts +14 -5
  162. package/src/public/utils.ts +31 -0
  163. package/src/simulator/acvm_native.ts +94 -47
  164. package/src/simulator/acvm_wasm.ts +7 -3
  165. package/dest/common/packed_args_cache.d.ts +0 -28
  166. package/dest/common/packed_args_cache.d.ts.map +0 -1
  167. package/dest/common/packed_args_cache.js +0 -50
  168. package/src/common/packed_args_cache.ts +0 -55
@@ -0,0 +1,320 @@
1
+ import { MerkleTreeId, } from '@aztec/circuit-types';
2
+ import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, Gas, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelCircuitPrivateInputs, PublicKernelData, ReadRequest, RevertCode, SideEffect, SideEffectLinkedToNoteHash, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, } from '@aztec/circuits.js';
3
+ import { computeVarArgsHash } from '@aztec/circuits.js/hash';
4
+ import { decodeReturnValues, } from '@aztec/foundation/abi';
5
+ import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
6
+ import { createDebugLogger } from '@aztec/foundation/log';
7
+ import { collectPublicDataReads, collectPublicDataUpdateRequests, isPublicExecutionResult, } from '@aztec/simulator';
8
+ import { HintsBuilder } from './hints_builder.js';
9
+ import { lastSideEffectCounter } from './utils.js';
10
+ export var PublicKernelPhase;
11
+ (function (PublicKernelPhase) {
12
+ PublicKernelPhase["SETUP"] = "setup";
13
+ PublicKernelPhase["APP_LOGIC"] = "app-logic";
14
+ PublicKernelPhase["TEARDOWN"] = "teardown";
15
+ PublicKernelPhase["TAIL"] = "tail";
16
+ })(PublicKernelPhase || (PublicKernelPhase = {}));
17
+ export const PhaseIsRevertible = {
18
+ [PublicKernelPhase.SETUP]: false,
19
+ [PublicKernelPhase.APP_LOGIC]: true,
20
+ [PublicKernelPhase.TEARDOWN]: false,
21
+ [PublicKernelPhase.TAIL]: false,
22
+ };
23
+ export class AbstractPhaseManager {
24
+ constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase) {
25
+ this.db = db;
26
+ this.publicExecutor = publicExecutor;
27
+ this.publicKernel = publicKernel;
28
+ this.globalVariables = globalVariables;
29
+ this.historicalHeader = historicalHeader;
30
+ this.phase = phase;
31
+ this.hintsBuilder = new HintsBuilder(db);
32
+ this.log = createDebugLogger(`aztec:sequencer:${phase}`);
33
+ }
34
+ static extractEnqueuedPublicCallsByPhase(publicInputs, enqueuedPublicFunctionCalls) {
35
+ const data = publicInputs.forPublic;
36
+ if (!data) {
37
+ return {
38
+ [PublicKernelPhase.SETUP]: [],
39
+ [PublicKernelPhase.APP_LOGIC]: [],
40
+ [PublicKernelPhase.TEARDOWN]: [],
41
+ [PublicKernelPhase.TAIL]: [],
42
+ };
43
+ }
44
+ const publicCallsStack = enqueuedPublicFunctionCalls.slice().reverse();
45
+ const nonRevertibleCallStack = data.endNonRevertibleData.publicCallStack.filter(i => !i.isEmpty());
46
+ const revertibleCallStack = data.end.publicCallStack.filter(i => !i.isEmpty());
47
+ const callRequestsStack = publicCallsStack
48
+ .map(call => call.toCallRequest())
49
+ .filter(
50
+ // filter out enqueued calls that are not in the public call stack
51
+ // TODO mitch left a question about whether this is only needed when unit testing
52
+ // with mock data
53
+ call => revertibleCallStack.find(p => p.equals(call)) || nonRevertibleCallStack.find(p => p.equals(call)));
54
+ if (callRequestsStack.length === 0) {
55
+ return {
56
+ [PublicKernelPhase.SETUP]: [],
57
+ [PublicKernelPhase.APP_LOGIC]: [],
58
+ [PublicKernelPhase.TEARDOWN]: [],
59
+ [PublicKernelPhase.TAIL]: [],
60
+ };
61
+ }
62
+ // find the first call that is revertible
63
+ const firstRevertibleCallIndex = callRequestsStack.findIndex(c => revertibleCallStack.findIndex(p => p.equals(c)) !== -1);
64
+ if (firstRevertibleCallIndex === 0) {
65
+ return {
66
+ [PublicKernelPhase.SETUP]: [],
67
+ [PublicKernelPhase.APP_LOGIC]: publicCallsStack,
68
+ [PublicKernelPhase.TEARDOWN]: [],
69
+ [PublicKernelPhase.TAIL]: [],
70
+ };
71
+ }
72
+ else if (firstRevertibleCallIndex === -1) {
73
+ // there's no app logic, split the functions between setup (many) and teardown (just one function call)
74
+ return {
75
+ [PublicKernelPhase.SETUP]: publicCallsStack.slice(0, -1),
76
+ [PublicKernelPhase.APP_LOGIC]: [],
77
+ [PublicKernelPhase.TEARDOWN]: [publicCallsStack[publicCallsStack.length - 1]],
78
+ [PublicKernelPhase.TAIL]: [],
79
+ };
80
+ }
81
+ else {
82
+ return {
83
+ [PublicKernelPhase.SETUP]: publicCallsStack.slice(0, firstRevertibleCallIndex - 1),
84
+ [PublicKernelPhase.APP_LOGIC]: publicCallsStack.slice(firstRevertibleCallIndex),
85
+ [PublicKernelPhase.TEARDOWN]: [publicCallsStack[firstRevertibleCallIndex - 1]],
86
+ [PublicKernelPhase.TAIL]: [],
87
+ };
88
+ }
89
+ }
90
+ extractEnqueuedPublicCalls(tx) {
91
+ const calls = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls)[this.phase];
92
+ return calls;
93
+ }
94
+ async processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof) {
95
+ let kernelOutput = previousPublicKernelOutput;
96
+ const kernelProof = previousPublicKernelProof;
97
+ const publicKernelInputs = [];
98
+ const enqueuedCalls = this.extractEnqueuedPublicCalls(tx);
99
+ if (!enqueuedCalls || !enqueuedCalls.length) {
100
+ return [[], kernelOutput, kernelProof, [], undefined, undefined];
101
+ }
102
+ const newUnencryptedFunctionLogs = [];
103
+ // TODO(#1684): Should multiple separately enqueued public calls be treated as
104
+ // separate public callstacks to be proven by separate public kernel sequences
105
+ // and submitted separately to the base rollup?
106
+ const returns = [];
107
+ for (const enqueuedCall of enqueuedCalls) {
108
+ const executionStack = [enqueuedCall];
109
+ let currentReturn = undefined;
110
+ // Keep track of which result is for the top/enqueued call
111
+ let enqueuedExecutionResult;
112
+ while (executionStack.length) {
113
+ const current = executionStack.pop();
114
+ const isExecutionRequest = !isPublicExecutionResult(current);
115
+ const sideEffectCounter = lastSideEffectCounter(tx) + 1;
116
+ const result = isExecutionRequest
117
+ ? await this.publicExecutor.simulate(current, this.globalVariables, sideEffectCounter)
118
+ : current;
119
+ const functionSelector = result.execution.functionData.selector.toString();
120
+ if (result.reverted && !PhaseIsRevertible[this.phase]) {
121
+ this.log.debug(`Simulation error on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${result.revertReason}`);
122
+ throw result.revertReason;
123
+ }
124
+ newUnencryptedFunctionLogs.push(result.unencryptedLogs);
125
+ this.log.debug(`Running public kernel circuit for ${result.execution.contractAddress.toString()}:${functionSelector}`);
126
+ executionStack.push(...result.nestedExecutions);
127
+ const callData = await this.getPublicCallData(result, isExecutionRequest);
128
+ const circuitResult = await this.runKernelCircuit(kernelOutput, kernelProof, callData);
129
+ kernelOutput = circuitResult[1];
130
+ // Capture the inputs to the kernel circuit for later proving
131
+ publicKernelInputs.push(circuitResult[0]);
132
+ // sanity check. Note we can't expect them to just be equal, because e.g.
133
+ // if the simulator reverts in app logic, it "resets" and result.reverted will be false when we run teardown,
134
+ // but the kernel carries the reverted flag forward. But if the simulator reverts, so should the kernel.
135
+ if (result.reverted && kernelOutput.revertCode.isOK()) {
136
+ throw new Error(`Public kernel circuit did not revert on ${result.execution.contractAddress.toString()}:${functionSelector}, but simulator did.`);
137
+ }
138
+ // We know the phase is revertible due to the above check.
139
+ // So safely return the revert reason and the kernel output (which has had its revertible side effects dropped)
140
+ if (result.reverted) {
141
+ this.log.debug(`Reverting on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${result.revertReason}`);
142
+ return [[], kernelOutput, kernelProof, [], result.revertReason, undefined];
143
+ }
144
+ if (!enqueuedExecutionResult) {
145
+ enqueuedExecutionResult = result;
146
+ // TODO(#5450) Need to use the proper return values here
147
+ const returnTypes = [
148
+ { kind: 'array', length: result.returnValues.length, type: { kind: 'field' } },
149
+ ];
150
+ const mockArtifact = { returnTypes };
151
+ currentReturn = decodeReturnValues(mockArtifact, result.returnValues);
152
+ }
153
+ }
154
+ // HACK(#1622): Manually patches the ordering of public state actions
155
+ // TODO(#757): Enforce proper ordering of public state actions
156
+ patchPublicStorageActionOrdering(kernelOutput, enqueuedExecutionResult, this.phase);
157
+ returns.push(currentReturn);
158
+ }
159
+ // TODO(#3675): This should be done in a public kernel circuit
160
+ removeRedundantPublicDataWrites(kernelOutput, this.phase);
161
+ return [publicKernelInputs, kernelOutput, kernelProof, newUnencryptedFunctionLogs, undefined, returns];
162
+ }
163
+ async runKernelCircuit(previousOutput, previousProof, callData) {
164
+ return await this.getKernelCircuitOutput(previousOutput, previousProof, callData);
165
+ }
166
+ async getKernelCircuitOutput(previousOutput, previousProof, callData) {
167
+ const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
168
+ // We take a deep copy (clone) of these inputs to be passed to the prover
169
+ const inputs = new PublicKernelCircuitPrivateInputs(previousKernel, callData);
170
+ switch (this.phase) {
171
+ case PublicKernelPhase.SETUP:
172
+ return [inputs.clone(), await this.publicKernel.publicKernelCircuitSetup(inputs)];
173
+ case PublicKernelPhase.APP_LOGIC:
174
+ return [inputs.clone(), await this.publicKernel.publicKernelCircuitAppLogic(inputs)];
175
+ case PublicKernelPhase.TEARDOWN:
176
+ return [inputs.clone(), await this.publicKernel.publicKernelCircuitTeardown(inputs)];
177
+ default:
178
+ throw new Error(`No public kernel circuit for inputs`);
179
+ }
180
+ }
181
+ getPreviousKernelData(previousOutput, previousProof) {
182
+ // TODO(@PhilWindle) Fix once we move this to prover-client
183
+ const vk = VerificationKey.makeFake();
184
+ const vkIndex = 0;
185
+ const vkSiblingPath = MembershipWitness.random(VK_TREE_HEIGHT).siblingPath;
186
+ return new PublicKernelData(previousOutput, previousProof, vk, vkIndex, vkSiblingPath);
187
+ }
188
+ async getPublicCircuitPublicInputs(result) {
189
+ const publicDataTreeInfo = await this.db.getTreeInfo(MerkleTreeId.PUBLIC_DATA_TREE);
190
+ this.historicalHeader.state.partial.publicDataTree.root = Fr.fromBuffer(publicDataTreeInfo.root);
191
+ const callStackPreimages = await this.getPublicCallStackPreimages(result);
192
+ const publicCallStackHashes = padArrayEnd(callStackPreimages.map(c => c.hash()), Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
193
+ // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
194
+ const unencryptedLogsHash = Fr.fromBuffer(result.unencryptedLogs.hash());
195
+ const unencryptedLogPreimagesLength = new Fr(result.unencryptedLogs.getSerializedLength());
196
+ return PublicCircuitPublicInputs.from({
197
+ callContext: result.execution.callContext,
198
+ proverAddress: AztecAddress.ZERO,
199
+ argsHash: computeVarArgsHash(result.execution.args),
200
+ newNoteHashes: padArrayEnd(result.newNoteHashes, SideEffect.empty(), MAX_NEW_NOTE_HASHES_PER_CALL),
201
+ newNullifiers: padArrayEnd(result.newNullifiers, SideEffectLinkedToNoteHash.empty(), MAX_NEW_NULLIFIERS_PER_CALL),
202
+ newL2ToL1Msgs: padArrayEnd(result.newL2ToL1Messages, L2ToL1Message.empty(), MAX_NEW_L2_TO_L1_MSGS_PER_CALL),
203
+ startSideEffectCounter: result.startSideEffectCounter,
204
+ endSideEffectCounter: result.endSideEffectCounter,
205
+ returnsHash: computeVarArgsHash(result.returnValues),
206
+ nullifierReadRequests: padArrayEnd(result.nullifierReadRequests, ReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
207
+ nullifierNonExistentReadRequests: padArrayEnd(result.nullifierNonExistentReadRequests, ReadRequest.empty(), MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL),
208
+ contractStorageReads: padArrayEnd(result.contractStorageReads, ContractStorageRead.empty(), MAX_PUBLIC_DATA_READS_PER_CALL),
209
+ contractStorageUpdateRequests: padArrayEnd(result.contractStorageUpdateRequests, ContractStorageUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL),
210
+ publicCallStackHashes,
211
+ unencryptedLogsHash,
212
+ unencryptedLogPreimagesLength,
213
+ historicalHeader: this.historicalHeader,
214
+ // TODO(@just-mitch): need better mapping from simulator to revert code.
215
+ revertCode: result.reverted ? RevertCode.REVERTED : RevertCode.OK,
216
+ gasLeft: Gas.from(result.gasLeft),
217
+ });
218
+ }
219
+ async getPublicCallStackItem(result, isExecutionRequest = false) {
220
+ return new PublicCallStackItem(result.execution.contractAddress, result.execution.functionData, await this.getPublicCircuitPublicInputs(result), isExecutionRequest);
221
+ }
222
+ async getPublicCallStackPreimages(result) {
223
+ const nested = result.nestedExecutions;
224
+ if (nested.length > MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL) {
225
+ throw new Error(`Public call stack size exceeded (max ${MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL}, got ${nested.length})`);
226
+ }
227
+ return await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
228
+ }
229
+ getBytecodeHash(_result) {
230
+ // TODO: Determine how to calculate bytecode hash. Circuits just check it isn't zero for now.
231
+ // See https://github.com/AztecProtocol/aztec3-packages/issues/378
232
+ const bytecodeHash = new Fr(1n);
233
+ return Promise.resolve(bytecodeHash);
234
+ }
235
+ /**
236
+ * Calculates the PublicCircuitOutput for this execution result along with its proof,
237
+ * and assembles a PublicCallData object from it.
238
+ * @param result - The execution result.
239
+ * @param preimages - The preimages of the callstack items.
240
+ * @param isExecutionRequest - Whether the current callstack item should be considered a public fn execution request.
241
+ * @returns A corresponding PublicCallData object.
242
+ */
243
+ async getPublicCallData(result, isExecutionRequest = false) {
244
+ const bytecodeHash = await this.getBytecodeHash(result);
245
+ const callStackItem = await this.getPublicCallStackItem(result, isExecutionRequest);
246
+ const publicCallRequests = (await this.getPublicCallStackPreimages(result)).map(c => c.toCallRequest(callStackItem.publicInputs.callContext));
247
+ const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
248
+ const portalContractAddress = result.execution.callContext.portalContractAddress.toField();
249
+ return new PublicCallData(callStackItem, publicCallStack, makeEmptyProof(), portalContractAddress, bytecodeHash);
250
+ }
251
+ }
252
+ function removeRedundantPublicDataWrites(publicInputs, phase) {
253
+ const lastWritesMap = new Map();
254
+ const patch = (requests) => requests.filter(write => {
255
+ const leafSlot = write.leafSlot.toString();
256
+ const exists = lastWritesMap.get(leafSlot);
257
+ lastWritesMap.set(leafSlot, true);
258
+ return !exists;
259
+ });
260
+ const [prev, curr] = PhaseIsRevertible[phase]
261
+ ? [publicInputs.endNonRevertibleData, publicInputs.end]
262
+ : [publicInputs.end, publicInputs.endNonRevertibleData];
263
+ curr.publicDataUpdateRequests = padArrayEnd(patch(curr.publicDataUpdateRequests.reverse()).reverse(), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
264
+ prev.publicDataUpdateRequests = padArrayEnd(patch(prev.publicDataUpdateRequests.reverse()), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
265
+ }
266
+ // HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel
267
+ // cannot keep track of side effects that happen after or before a nested call, we override the public
268
+ // state actions it emits with whatever we got from the simulator. As a sanity check, we at least verify
269
+ // that the elements are the same, so we are only tweaking their ordering.
270
+ // See yarn-project/end-to-end/src/e2e_ordering.test.ts
271
+ // See https://github.com/AztecProtocol/aztec-packages/issues/1616
272
+ // TODO(#757): Enforce proper ordering of public state actions
273
+ /**
274
+ * Patch the ordering of storage actions output from the public kernel.
275
+ * @param publicInputs - to be patched here: public inputs to the kernel iteration up to this point
276
+ * @param execResult - result of the top/first execution for this enqueued public call
277
+ */
278
+ function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
279
+ const { publicDataUpdateRequests } = PhaseIsRevertible[phase] ? publicInputs.end : publicInputs.endNonRevertibleData;
280
+ const { publicDataReads } = publicInputs.validationRequests;
281
+ // Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
282
+ // Note, this only pulls simulated reads/writes from the current phase,
283
+ // so the returned result will be a subset of the public kernel output.
284
+ const simPublicDataReads = collectPublicDataReads(execResult);
285
+ // verify that each read is in the kernel output
286
+ for (const read of simPublicDataReads) {
287
+ if (!publicDataReads.find(item => item.equals(read))) {
288
+ throw new Error(`Public data reads from simulator do not match those from public kernel.\nFrom simulator: ${simPublicDataReads
289
+ .map(p => p.toFriendlyJSON())
290
+ .join(', ')}\nFrom public kernel: ${publicDataReads.map(i => i.toFriendlyJSON()).join(', ')}`);
291
+ }
292
+ }
293
+ const simPublicDataUpdateRequests = collectPublicDataUpdateRequests(execResult);
294
+ for (const update of simPublicDataUpdateRequests) {
295
+ if (!publicDataUpdateRequests.find(item => item.equals(update))) {
296
+ throw new Error(`Public data update requests from simulator do not match those from public kernel.\nFrom simulator: ${simPublicDataUpdateRequests
297
+ .map(p => p.toFriendlyJSON())
298
+ .join(', ')}\nFrom public kernel revertible: ${publicDataUpdateRequests
299
+ .map(i => i.toFriendlyJSON())
300
+ .join(', ')}`);
301
+ }
302
+ }
303
+ // We only want to reorder the items from the public inputs of the
304
+ // most recently processed top/enqueued call.
305
+ const effectSet = PhaseIsRevertible[phase] ? 'end' : 'endNonRevertibleData';
306
+ const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
307
+ const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
308
+ publicInputs.validationRequests.publicDataReads = padArrayEnd([
309
+ // do not mess with items from previous top/enqueued calls in kernel output
310
+ ...publicInputs.validationRequests.publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
311
+ ...simPublicDataReads,
312
+ ], PublicDataRead.empty(), MAX_PUBLIC_DATA_READS_PER_TX);
313
+ const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());
314
+ const numUpdatesBeforeThisEnqueuedCall = numUpdatesInKernel - simPublicDataUpdateRequests.length;
315
+ publicInputs[effectSet].publicDataUpdateRequests = padArrayEnd([
316
+ ...publicInputs[effectSet].publicDataUpdateRequests.slice(0, numUpdatesBeforeThisEnqueuedCall),
317
+ ...simPublicDataUpdateRequests,
318
+ ], PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
319
+ }
320
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/public/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,29 @@
1
+ import { type Tx } from '@aztec/circuit-types';
2
+ import { type GlobalVariables, type Header, type Proof, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
3
+ import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
4
+ import { type MerkleTreeOperations } from '@aztec/world-state';
5
+ import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
6
+ import { type ContractsDataSourcePublicDB } from './public_executor.js';
7
+ import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
8
+ /**
9
+ * The phase manager responsible for performing the fee preparation phase.
10
+ */
11
+ export declare class AppLogicPhaseManager extends AbstractPhaseManager {
12
+ protected db: MerkleTreeOperations;
13
+ protected publicExecutor: PublicExecutor;
14
+ protected publicKernel: PublicKernelCircuitSimulator;
15
+ protected globalVariables: GlobalVariables;
16
+ protected historicalHeader: Header;
17
+ protected publicContractsDB: ContractsDataSourcePublicDB;
18
+ protected publicStateDB: PublicStateDB;
19
+ phase: PublicKernelPhase;
20
+ constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header, publicContractsDB: ContractsDataSourcePublicDB, publicStateDB: PublicStateDB, phase?: PublicKernelPhase);
21
+ handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, previousPublicKernelProof: Proof): Promise<{
22
+ kernelRequests: import("@aztec/circuit-types").PublicKernelNonTailRequest[];
23
+ publicKernelOutput: PublicKernelCircuitPublicInputs;
24
+ publicKernelProof: Proof;
25
+ revertReason: import("@aztec/circuit-types").SimulationError | undefined;
26
+ returnValues: import("@aztec/foundation/abi").ProcessReturnValues;
27
+ }>;
28
+ }
29
+ //# sourceMappingURL=app_logic_phase_manager.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"app_logic_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/app_logic_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,+BAA+B,EACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB;IAE1D,SAAS,CAAC,EAAE,EAAE,oBAAoB;IAClC,SAAS,CAAC,cAAc,EAAE,cAAc;IACxC,SAAS,CAAC,YAAY,EAAE,4BAA4B;IACpD,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,gBAAgB,EAAE,MAAM;IAClC,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;IAC/B,KAAK,EAAE,iBAAiB;gBAPrB,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EAC/B,KAAK,GAAE,iBAA+C;IAKhD,MAAM,CACnB,EAAE,EAAE,EAAE,EACN,0BAA0B,EAAE,+BAA+B,EAC3D,yBAAyB,EAAE,KAAK;;;;;;;CAyCnC"}
@@ -0,0 +1,50 @@
1
+ import { PublicKernelType } from '@aztec/circuit-types';
2
+ import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
3
+ /**
4
+ * The phase manager responsible for performing the fee preparation phase.
5
+ */
6
+ export class AppLogicPhaseManager extends AbstractPhaseManager {
7
+ constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, publicContractsDB, publicStateDB, phase = PublicKernelPhase.APP_LOGIC) {
8
+ super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
9
+ this.db = db;
10
+ this.publicExecutor = publicExecutor;
11
+ this.publicKernel = publicKernel;
12
+ this.globalVariables = globalVariables;
13
+ this.historicalHeader = historicalHeader;
14
+ this.publicContractsDB = publicContractsDB;
15
+ this.publicStateDB = publicStateDB;
16
+ this.phase = phase;
17
+ }
18
+ async handle(tx, previousPublicKernelOutput, previousPublicKernelProof) {
19
+ // add new contracts to the contracts db so that their functions may be found and called
20
+ // TODO(#4073): This is catching only private deployments, when we add public ones, we'll
21
+ // have to capture contracts emitted in that phase as well.
22
+ // TODO(@spalladino): Should we allow emitting contracts in the fee preparation phase?
23
+ this.log.verbose(`Processing tx ${tx.getTxHash()}`);
24
+ await this.publicContractsDB.addNewContracts(tx);
25
+ const [kernelInputs, publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs, revertReason, returnValues,] = await this.processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof).catch(
26
+ // if we throw for any reason other than simulation, we need to rollback and drop the TX
27
+ async (err) => {
28
+ await this.publicStateDB.rollbackToCommit();
29
+ throw err;
30
+ });
31
+ if (revertReason) {
32
+ await this.publicContractsDB.removeNewContracts(tx);
33
+ await this.publicStateDB.rollbackToCheckpoint();
34
+ }
35
+ else {
36
+ tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
37
+ await this.publicStateDB.checkpoint();
38
+ }
39
+ // Return a list of app logic proving requests
40
+ const kernelRequests = kernelInputs.map(input => {
41
+ const request = {
42
+ type: PublicKernelType.APP_LOGIC,
43
+ inputs: input,
44
+ };
45
+ return request;
46
+ });
47
+ return { kernelRequests, publicKernelOutput, publicKernelProof, revertReason, returnValues };
48
+ }
49
+ }
50
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwX2xvZ2ljX3BoYXNlX21hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2FwcF9sb2dpY19waGFzZV9tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBNEIsZ0JBQWdCLEVBQVcsTUFBTSxzQkFBc0IsQ0FBQztBQVUzRixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUl0Rjs7R0FFRztBQUNILE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxvQkFBb0I7SUFDNUQsWUFDWSxFQUF3QixFQUN4QixjQUE4QixFQUM5QixZQUEwQyxFQUMxQyxlQUFnQyxFQUNoQyxnQkFBd0IsRUFDeEIsaUJBQThDLEVBQzlDLGFBQTRCLEVBQy9CLFFBQTJCLGlCQUFpQixDQUFDLFNBQVM7UUFFN0QsS0FBSyxDQUFDLEVBQUUsRUFBRSxjQUFjLEVBQUUsWUFBWSxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQVR4RSxPQUFFLEdBQUYsRUFBRSxDQUFzQjtRQUN4QixtQkFBYyxHQUFkLGNBQWMsQ0FBZ0I7UUFDOUIsaUJBQVksR0FBWixZQUFZLENBQThCO1FBQzFDLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQVE7UUFDeEIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUE2QjtRQUM5QyxrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUMvQixVQUFLLEdBQUwsS0FBSyxDQUFpRDtJQUcvRCxDQUFDO0lBRVEsS0FBSyxDQUFDLE1BQU0sQ0FDbkIsRUFBTSxFQUNOLDBCQUEyRCxFQUMzRCx5QkFBZ0M7UUFFaEMsd0ZBQXdGO1FBQ3hGLHlGQUF5RjtRQUN6RiwyREFBMkQ7UUFDM0Qsc0ZBQXNGO1FBQ3RGLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLGlCQUFpQixFQUFFLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNqRCxNQUFNLENBQ0osWUFBWSxFQUNaLGtCQUFrQixFQUNsQixpQkFBaUIsRUFDakIsMEJBQTBCLEVBQzFCLFlBQVksRUFDWixZQUFZLEVBQ2IsR0FBRyxNQUFNLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLEVBQUUsMEJBQTBCLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxLQUFLO1FBQ3hHLHdGQUF3RjtRQUN4RixLQUFLLEVBQUMsR0FBRyxFQUFDLEVBQUU7WUFDVixNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUM1QyxNQUFNLEdBQUcsQ0FBQztRQUNaLENBQUMsQ0FDRixDQUFDO1FBRUYsSUFBSSxZQUFZLEVBQUUsQ0FBQztZQUNqQixNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNwRCxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUNsRCxDQUFDO2FBQU0sQ0FBQztZQUNOLEVBQUUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLDBCQUEwQixDQUFDLENBQUM7WUFDL0QsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hDLENBQUM7UUFFRCw4Q0FBOEM7UUFDOUMsTUFBTSxjQUFjLEdBQUcsWUFBWSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUM5QyxNQUFNLE9BQU8sR0FBd0I7Z0JBQ25DLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTO2dCQUNoQyxNQUFNLEVBQUUsS0FBSzthQUNkLENBQUM7WUFDRixPQUFPLE9BQU8sQ0FBQztRQUNqQixDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUUsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQy9GLENBQUM7Q0FDRiJ9
@@ -1,5 +1,6 @@
1
1
  import { type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
2
2
  import { type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, type L2ToL1Message, type PublicCallRequest, PublicDataRead, PublicDataUpdateRequest, type ReadRequest, type SideEffect, type SideEffectLinkedToNoteHash } from '@aztec/circuits.js';
3
+ import { type Gas } from '../avm/avm_gas.js';
3
4
  /**
4
5
  * The public function execution result.
5
6
  */
@@ -41,6 +42,8 @@ export interface PublicExecutionResult {
41
42
  * The revert reason if the execution reverted.
42
43
  */
43
44
  revertReason: SimulationError | undefined;
45
+ /** How much gas was left after this public execution. */
46
+ gasLeft: Gas;
44
47
  }
45
48
  /**
46
49
  * The execution of a public function.
@@ -1 +1 @@
1
- {"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,cAAc,EACd,uBAAuB,EACvB,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAChC,MAAM,oBAAoB,CAAC;AAG5B;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,SAAS,EAAE,eAAe,CAAC;IAC3B,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,oEAAoE;IACpE,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,iEAAiE;IACjE,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACzB;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;CAC3C;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;AAEnH;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,eAAe,GAAG,qBAAqB,GAC7C,KAAK,IAAI,qBAAqB,CAEhC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,qBAAqB,GAAG,cAAc,EAAE,CAY1F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,qBAAqB,GAAG,uBAAuB,EAAE,CAY5G;AAiCD;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,EAAE,0BAA0B,EAAE,EAC3C,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,iBAAiB,EAAE,aAAa,EAAE,EAClC,eAAe,EAAE,yBAAyB,QAW3C"}
1
+ {"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,cAAc,EACd,uBAAuB,EACvB,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAChC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,SAAS,EAAE,eAAe,CAAC;IAC3B,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,oEAAoE;IACpE,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,iEAAiE;IACjE,aAAa,EAAE,0BAA0B,EAAE,CAAC;IAC5C,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACzB;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;IAC1C,yDAAyD;IACzD,OAAO,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;AAEnH;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,eAAe,GAAG,qBAAqB,GAC7C,KAAK,IAAI,qBAAqB,CAEhC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,qBAAqB,GAAG,cAAc,EAAE,CAY1F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,qBAAqB,GAAG,uBAAuB,EAAE,CAY5G;AAiCD;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,EAAE,0BAA0B,EAAE,EAC3C,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,iBAAiB,EAAE,aAAa,EAAE,EAClC,eAAe,EAAE,yBAAyB,QAW3C"}
@@ -71,4 +71,4 @@ export function checkValidStaticCall(newNoteHashes, newNullifiers, contractStora
71
71
  throw new Error('Static call cannot update the state, emit L2->L1 messages or generate logs');
72
72
  }
73
73
  }
74
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQU9MLGNBQWMsRUFDZCx1QkFBdUIsR0FJeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQWtEcEc7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FDckMsS0FBOEM7SUFFOUMsT0FBTyxXQUFXLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssU0FBUyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUFpQztJQUN0RSxpSEFBaUg7SUFDakgsTUFBTSxlQUFlLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsc0JBQXNCLENBQUM7SUFFaEYsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ3pFLG1DQUFtQyxDQUFDLElBQUksRUFBRSxlQUFlLENBQUMsQ0FDM0QsQ0FBQztJQUNGLE1BQU0sUUFBUSxHQUFHO1FBQ2YsR0FBRyx1QkFBdUI7UUFDMUIsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLENBQUM7S0FDdEYsQ0FBQztJQUNGLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxpQkFBa0IsR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUMsQ0FBQztBQUM5RSxDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsK0JBQStCLENBQUMsVUFBaUM7SUFDL0UsaUhBQWlIO0lBQ2pILE1BQU0sZUFBZSxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLHNCQUFzQixDQUFDO0lBRWhGLE1BQU0sZ0NBQWdDLEdBQUcsVUFBVSxDQUFDLDZCQUE2QixDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUM3RixxREFBcUQsQ0FBQyxNQUFNLEVBQUUsZUFBZSxDQUFDLENBQy9FLENBQUM7SUFDRixNQUFNLFFBQVEsR0FBRztRQUNmLEdBQUcsZ0NBQWdDO1FBQ25DLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLCtCQUErQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQy9GLENBQUM7SUFDRixPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsaUJBQWtCLEdBQUcsQ0FBQyxDQUFDLGlCQUFrQixDQUFDLENBQUM7QUFDOUUsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxtQ0FBbUMsQ0FBQyxJQUF5QixFQUFFLGVBQTZCO0lBQ25HLE9BQU8sSUFBSSxjQUFjLENBQ3ZCLDZCQUE2QixDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLEVBQ2hFLDBCQUEwQixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFDN0MsSUFBSSxDQUFDLGlCQUFrQixDQUN4QixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxxREFBcUQsQ0FDNUQsTUFBb0MsRUFDcEMsZUFBNkI7SUFFN0IsT0FBTyxJQUFJLHVCQUF1QixDQUNoQyw2QkFBNkIsQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUNsRSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQzNDLE1BQU0sQ0FBQyxpQkFBa0IsQ0FDMUIsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGFBQTJCLEVBQzNCLGFBQTJDLEVBQzNDLDZCQUE2RCxFQUM3RCxpQkFBa0MsRUFDbEMsZUFBMEM7SUFFMUMsSUFDRSw2QkFBNkIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGlCQUFpQixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQzVCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQyJ9
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQU9MLGNBQWMsRUFDZCx1QkFBdUIsR0FJeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQXNEcEc7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FDckMsS0FBOEM7SUFFOUMsT0FBTyxXQUFXLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssU0FBUyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUFpQztJQUN0RSxpSEFBaUg7SUFDakgsTUFBTSxlQUFlLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsc0JBQXNCLENBQUM7SUFFaEYsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ3pFLG1DQUFtQyxDQUFDLElBQUksRUFBRSxlQUFlLENBQUMsQ0FDM0QsQ0FBQztJQUNGLE1BQU0sUUFBUSxHQUFHO1FBQ2YsR0FBRyx1QkFBdUI7UUFDMUIsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLENBQUM7S0FDdEYsQ0FBQztJQUNGLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxpQkFBa0IsR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUMsQ0FBQztBQUM5RSxDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsK0JBQStCLENBQUMsVUFBaUM7SUFDL0UsaUhBQWlIO0lBQ2pILE1BQU0sZUFBZSxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLHNCQUFzQixDQUFDO0lBRWhGLE1BQU0sZ0NBQWdDLEdBQUcsVUFBVSxDQUFDLDZCQUE2QixDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUM3RixxREFBcUQsQ0FBQyxNQUFNLEVBQUUsZUFBZSxDQUFDLENBQy9FLENBQUM7SUFDRixNQUFNLFFBQVEsR0FBRztRQUNmLEdBQUcsZ0NBQWdDO1FBQ25DLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLCtCQUErQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0tBQy9GLENBQUM7SUFDRixPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsaUJBQWtCLEdBQUcsQ0FBQyxDQUFDLGlCQUFrQixDQUFDLENBQUM7QUFDOUUsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxtQ0FBbUMsQ0FBQyxJQUF5QixFQUFFLGVBQTZCO0lBQ25HLE9BQU8sSUFBSSxjQUFjLENBQ3ZCLDZCQUE2QixDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLEVBQ2hFLDBCQUEwQixDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFDN0MsSUFBSSxDQUFDLGlCQUFrQixDQUN4QixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxxREFBcUQsQ0FDNUQsTUFBb0MsRUFDcEMsZUFBNkI7SUFFN0IsT0FBTyxJQUFJLHVCQUF1QixDQUNoQyw2QkFBNkIsQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUNsRSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQzNDLE1BQU0sQ0FBQyxpQkFBa0IsQ0FDMUIsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGFBQTJCLEVBQzNCLGFBQTJDLEVBQzNDLDZCQUE2RCxFQUM3RCxpQkFBa0MsRUFDbEMsZUFBMEM7SUFFMUMsSUFDRSw2QkFBNkIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGlCQUFpQixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQzVCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":";AACA,OAAO,EAAM,KAAK,eAAe,EAAE,KAAK,MAAM,EAA6B,MAAM,oBAAoB,CAAC;AAiBtG,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;AACxG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAGvE;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,qBAAqB,CAAC,CAgBhC;AAuKD;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwD;IAC5E;;;;;OAKG;IACU,QAAQ,CACnB,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,eAAe,EAChC,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IA+BjC;;;;;OAKG;IAEH;;;;;OAKG;IACU,WAAW,CAAC,YAAY,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgE1E;;;;;;OAMG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgClE"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":";AACA,OAAO,EAAW,KAAK,eAAe,EAAE,KAAK,MAAM,EAA6B,MAAM,oBAAoB,CAAC;AAiB3G,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;AACxG,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAGvE;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,qBAAqB,CAAC,CAgBhC;AA4KD;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwD;IAC5E;;;;;OAKG;IACU,QAAQ,CACnB,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,eAAe,EAChC,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IA+BjC;;;;;OAKG;IAEH;;;;;OAKG;IACU,WAAW,CAAC,YAAY,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgE1E;;;;;;OAMG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgClE"}