@aztec/simulator 0.41.0 → 0.43.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.
- package/dest/acvm/acvm.d.ts +2 -2
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/acvm.js +3 -3
- package/dest/acvm/oracle/oracle.d.ts +7 -4
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +32 -12
- package/dest/acvm/oracle/typed_oracle.d.ts +6 -3
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +15 -6
- package/dest/acvm/serialize.js +2 -2
- package/dest/avm/avm_gas.d.ts +1 -5
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +69 -73
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +2 -4
- package/dest/avm/avm_simulator.d.ts +5 -0
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +8 -1
- package/dest/avm/fixtures/index.d.ts +6 -0
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +18 -1
- package/dest/avm/index.d.ts +2 -0
- package/dest/avm/index.d.ts.map +1 -0
- package/dest/avm/index.js +2 -0
- package/dest/avm/journal/host_storage.d.ts +1 -1
- package/dest/avm/journal/host_storage.d.ts.map +1 -1
- package/dest/avm/journal/journal.d.ts +5 -3
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +23 -14
- package/dest/avm/journal/trace.d.ts +3 -1
- package/dest/avm/journal/trace.d.ts.map +1 -1
- package/dest/avm/journal/trace.js +8 -1
- package/dest/avm/journal/trace_types.d.ts +5 -0
- package/dest/avm/journal/trace_types.d.ts.map +1 -1
- package/dest/avm/journal/trace_types.js +1 -5
- package/dest/avm/opcodes/accrued_substate.d.ts +2 -2
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +36 -21
- package/dest/avm/opcodes/arithmetic.d.ts +1 -7
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +12 -20
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +11 -8
- package/dest/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/avm/opcodes/comparators.js +7 -5
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +20 -24
- package/dest/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/avm/opcodes/control_flow.js +4 -2
- package/dest/avm/opcodes/conversion.js +2 -2
- package/dest/avm/opcodes/ec_add.d.ts +19 -0
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -0
- package/dest/avm/opcodes/ec_add.js +78 -0
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +11 -5
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +10 -2
- package/dest/avm/opcodes/instruction.d.ts +1 -1
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +6 -4
- package/dest/avm/opcodes/instruction_impl.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction_impl.js +4 -2
- package/dest/avm/opcodes/memory.d.ts +1 -5
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +14 -18
- package/dest/avm/opcodes/multi_scalar_mul.d.ts +16 -0
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -0
- package/dest/avm/opcodes/multi_scalar_mul.js +95 -0
- package/dest/avm/opcodes/storage.d.ts +1 -6
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +11 -14
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +6 -2
- package/dest/avm/serialization/instruction_serialization.d.ts +3 -1
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +4 -2
- package/dest/client/client_execution_context.d.ts +24 -20
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +52 -55
- package/dest/client/db_oracle.d.ts +7 -1
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/execution_note_cache.d.ts +0 -17
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +1 -24
- package/dest/client/execution_result.d.ts +8 -4
- package/dest/client/execution_result.d.ts.map +1 -1
- package/dest/client/execution_result.js +16 -6
- package/dest/client/private_execution.d.ts +2 -3
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +20 -9
- package/dest/client/simulator.d.ts +2 -17
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +24 -33
- package/dest/client/unconstrained_execution.d.ts +2 -3
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +5 -7
- package/dest/client/view_data_oracle.d.ts +2 -0
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +7 -1
- package/dest/index.d.ts +3 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +4 -2
- package/dest/mocks/fixtures.d.ts +14 -10
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +22 -16
- package/dest/{simulator → providers}/acvm_native.d.ts.map +1 -1
- package/dest/{simulator → providers}/acvm_native.js +13 -14
- package/dest/providers/acvm_wasm.d.ts.map +1 -0
- package/dest/providers/acvm_wasm.js +15 -0
- package/dest/providers/index.d.ts.map +1 -0
- package/dest/{simulator → providers}/index.js +1 -1
- package/dest/{simulator → providers}/simulation_provider.d.ts.map +1 -1
- package/dest/{simulator → providers}/simulation_provider.js +1 -1
- package/dest/public/abstract_phase_manager.d.ts +53 -53
- package/dest/public/abstract_phase_manager.d.ts.map +1 -1
- package/dest/public/abstract_phase_manager.js +146 -153
- package/dest/public/app_logic_phase_manager.d.ts +8 -9
- package/dest/public/app_logic_phase_manager.d.ts.map +1 -1
- package/dest/public/app_logic_phase_manager.js +15 -15
- package/dest/public/{db.d.ts → db_interfaces.d.ts} +4 -3
- package/dest/public/db_interfaces.d.ts.map +1 -0
- package/dest/public/db_interfaces.js +2 -0
- package/dest/public/execution.d.ts +16 -23
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -51
- package/dest/public/executor.d.ts +4 -31
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +40 -283
- package/dest/public/fee_payment.d.ts +11 -0
- package/dest/public/fee_payment.d.ts.map +1 -0
- package/dest/public/fee_payment.js +24 -0
- package/dest/public/hints_builder.d.ts +2 -1
- package/dest/public/hints_builder.d.ts.map +1 -1
- package/dest/public/hints_builder.js +6 -2
- package/dest/public/index.d.ts +8 -6
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +9 -7
- package/dest/public/phase_manager_factory.d.ts +4 -4
- package/dest/public/phase_manager_factory.d.ts.map +1 -1
- package/dest/public/phase_manager_factory.js +5 -5
- package/dest/public/{public_executor.d.ts → public_db_sources.d.ts} +6 -3
- package/dest/public/public_db_sources.d.ts.map +1 -0
- package/dest/public/public_db_sources.js +244 -0
- package/dest/public/public_kernel.js +14 -14
- package/dest/public/public_processor.d.ts +6 -4
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +48 -30
- package/dest/public/setup_phase_manager.d.ts +8 -10
- package/dest/public/setup_phase_manager.d.ts.map +1 -1
- package/dest/public/setup_phase_manager.js +12 -21
- package/dest/public/tail_phase_manager.d.ts +7 -13
- package/dest/public/tail_phase_manager.d.ts.map +1 -1
- package/dest/public/tail_phase_manager.js +17 -37
- package/dest/public/teardown_phase_manager.d.ts +8 -10
- package/dest/public/teardown_phase_manager.d.ts.map +1 -1
- package/dest/public/teardown_phase_manager.js +16 -22
- package/dest/public/transitional_adaptors.d.ts +2 -2
- package/dest/public/transitional_adaptors.d.ts.map +1 -1
- package/dest/public/transitional_adaptors.js +14 -6
- package/package.json +12 -9
- package/src/acvm/acvm.ts +0 -3
- package/src/acvm/oracle/oracle.ts +68 -16
- package/src/acvm/oracle/typed_oracle.ts +31 -6
- package/src/acvm/serialize.ts +1 -1
- package/src/avm/avm_gas.ts +68 -73
- package/src/avm/avm_memory_types.ts +1 -3
- package/src/avm/avm_simulator.ts +9 -0
- package/src/avm/fixtures/index.ts +24 -0
- package/src/avm/index.ts +1 -0
- package/src/avm/journal/host_storage.ts +1 -1
- package/src/avm/journal/journal.ts +32 -22
- package/src/avm/journal/trace.ts +9 -0
- package/src/avm/journal/trace_types.ts +4 -0
- package/src/avm/opcodes/accrued_substate.ts +53 -20
- package/src/avm/opcodes/arithmetic.ts +18 -22
- package/src/avm/opcodes/bitwise.ts +13 -8
- package/src/avm/opcodes/comparators.ts +9 -4
- package/src/avm/opcodes/contract.ts +22 -26
- package/src/avm/opcodes/control_flow.ts +3 -1
- package/src/avm/opcodes/conversion.ts +1 -1
- package/src/avm/opcodes/ec_add.ts +92 -0
- package/src/avm/opcodes/external_calls.ts +11 -3
- package/src/avm/opcodes/hashing.ts +11 -1
- package/src/avm/opcodes/instruction.ts +5 -3
- package/src/avm/opcodes/instruction_impl.ts +4 -1
- package/src/avm/opcodes/memory.ts +19 -19
- package/src/avm/opcodes/multi_scalar_mul.ts +114 -0
- package/src/avm/opcodes/storage.ts +10 -17
- package/src/avm/serialization/bytecode_serialization.ts +5 -1
- package/src/avm/serialization/instruction_serialization.ts +2 -0
- package/src/client/client_execution_context.ts +76 -60
- package/src/client/db_oracle.ts +8 -1
- package/src/client/execution_note_cache.ts +0 -28
- package/src/client/execution_result.ts +21 -7
- package/src/client/private_execution.ts +36 -21
- package/src/client/simulator.ts +25 -35
- package/src/client/unconstrained_execution.ts +9 -12
- package/src/client/view_data_oracle.ts +8 -0
- package/src/index.ts +3 -1
- package/src/mocks/fixtures.ts +30 -32
- package/src/{simulator → providers}/acvm_native.ts +21 -19
- package/src/{simulator → providers}/acvm_wasm.ts +2 -16
- package/src/public/abstract_phase_manager.ts +209 -258
- package/src/public/app_logic_phase_manager.ts +24 -40
- package/src/public/{db.ts → db_interfaces.ts} +4 -2
- package/src/public/execution.ts +15 -77
- package/src/public/executor.ts +61 -399
- package/src/public/fee_payment.ts +26 -0
- package/src/public/hints_builder.ts +6 -0
- package/src/public/index.ts +8 -12
- package/src/public/phase_manager_factory.ts +7 -7
- package/src/public/{public_executor.ts → public_db_sources.ts} +65 -9
- package/src/public/public_kernel.ts +24 -24
- package/src/public/public_processor.ts +81 -40
- package/src/public/setup_phase_manager.ts +21 -46
- package/src/public/tail_phase_manager.ts +19 -67
- package/src/public/teardown_phase_manager.ts +23 -42
- package/src/public/transitional_adaptors.ts +41 -5
- package/dest/public/db.d.ts.map +0 -1
- package/dest/public/db.js +0 -2
- package/dest/public/public_execution_context.d.ts +0 -121
- package/dest/public/public_execution_context.d.ts.map +0 -1
- package/dest/public/public_execution_context.js +0 -214
- package/dest/public/public_executor.d.ts.map +0 -1
- package/dest/public/public_executor.js +0 -197
- package/dest/public/state_actions.d.ts +0 -39
- package/dest/public/state_actions.d.ts.map +0 -1
- package/dest/public/state_actions.js +0 -80
- package/dest/public/utils.d.ts +0 -8
- package/dest/public/utils.d.ts.map +0 -1
- package/dest/public/utils.js +0 -31
- package/dest/simulator/acvm_wasm.d.ts.map +0 -1
- package/dest/simulator/acvm_wasm.js +0 -22
- package/dest/simulator/index.d.ts.map +0 -1
- package/src/public/public_execution_context.ts +0 -289
- package/src/public/state_actions.ts +0 -102
- package/src/public/utils.ts +0 -33
- /package/dest/{simulator → providers}/acvm_native.d.ts +0 -0
- /package/dest/{simulator → providers}/acvm_wasm.d.ts +0 -0
- /package/dest/{simulator → providers}/index.d.ts +0 -0
- /package/dest/{simulator → providers}/simulation_provider.d.ts +0 -0
- /package/src/{simulator → providers}/index.ts +0 -0
- /package/src/{simulator → providers}/simulation_provider.ts +0 -0
|
@@ -1,36 +1,28 @@
|
|
|
1
|
-
import { MerkleTreeId, PublicKernelType, } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, Gas, L2ToL1Message, LogHash, 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,
|
|
1
|
+
import { AVM_REQUEST, MerkleTreeId, PublicKernelType, } from '@aztec/circuit-types';
|
|
2
|
+
import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, FunctionData, Gas, L2ToL1Message, LogHash, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_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_UPDATE_REQUESTS_PER_CALL, MAX_UNENCRYPTED_LOGS_PER_CALL, MembershipWitness, NESTED_RECURSIVE_PROOF_LENGTH, NoteHash, Nullifier, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicKernelCircuitPrivateInputs, PublicKernelData, ReadRequest, RevertCode, VK_TREE_HEIGHT, VerificationKeyData, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
3
3
|
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
4
|
-
import {
|
|
4
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { accumulateReturnValues,
|
|
6
|
+
import { accumulateReturnValues, isPublicExecutionResult, } from '@aztec/simulator';
|
|
7
7
|
import { HintsBuilder } from './hints_builder.js';
|
|
8
|
-
import { lastSideEffectCounter } from './utils.js';
|
|
9
|
-
export var PublicKernelPhase;
|
|
10
|
-
(function (PublicKernelPhase) {
|
|
11
|
-
PublicKernelPhase["SETUP"] = "setup";
|
|
12
|
-
PublicKernelPhase["APP_LOGIC"] = "app-logic";
|
|
13
|
-
PublicKernelPhase["TEARDOWN"] = "teardown";
|
|
14
|
-
PublicKernelPhase["TAIL"] = "tail";
|
|
15
|
-
})(PublicKernelPhase || (PublicKernelPhase = {}));
|
|
16
8
|
export const PhaseIsRevertible = {
|
|
17
|
-
[
|
|
18
|
-
[
|
|
19
|
-
[
|
|
20
|
-
[
|
|
9
|
+
[PublicKernelType.NON_PUBLIC]: false,
|
|
10
|
+
[PublicKernelType.SETUP]: false,
|
|
11
|
+
[PublicKernelType.APP_LOGIC]: true,
|
|
12
|
+
[PublicKernelType.TEARDOWN]: true,
|
|
13
|
+
[PublicKernelType.TAIL]: false,
|
|
21
14
|
};
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
15
|
+
export function makeAvmProvingRequest(info, kernelType) {
|
|
16
|
+
return {
|
|
17
|
+
type: AVM_REQUEST,
|
|
18
|
+
bytecode: info.bytecode,
|
|
19
|
+
calldata: info.calldata,
|
|
20
|
+
avmHints: info.avmHints,
|
|
21
|
+
kernelRequest: {
|
|
22
|
+
type: kernelType,
|
|
23
|
+
inputs: info.inputs,
|
|
24
|
+
},
|
|
25
|
+
};
|
|
34
26
|
}
|
|
35
27
|
export class AbstractPhaseManager {
|
|
36
28
|
constructor(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase) {
|
|
@@ -47,10 +39,11 @@ export class AbstractPhaseManager {
|
|
|
47
39
|
const data = tx.data.forPublic;
|
|
48
40
|
if (!data) {
|
|
49
41
|
return {
|
|
50
|
-
[
|
|
51
|
-
[
|
|
52
|
-
[
|
|
53
|
-
[
|
|
42
|
+
[PublicKernelType.NON_PUBLIC]: [],
|
|
43
|
+
[PublicKernelType.SETUP]: [],
|
|
44
|
+
[PublicKernelType.APP_LOGIC]: [],
|
|
45
|
+
[PublicKernelType.TEARDOWN]: [],
|
|
46
|
+
[PublicKernelType.TAIL]: [],
|
|
54
47
|
};
|
|
55
48
|
}
|
|
56
49
|
const publicCallsStack = tx.enqueuedPublicFunctionCalls.slice().reverse();
|
|
@@ -65,10 +58,11 @@ export class AbstractPhaseManager {
|
|
|
65
58
|
call => revertibleCallStack.find(p => p.equals(call)) || nonRevertibleCallStack.find(p => p.equals(call)));
|
|
66
59
|
if (callRequestsStack.length === 0) {
|
|
67
60
|
return {
|
|
68
|
-
[
|
|
69
|
-
[
|
|
70
|
-
[
|
|
71
|
-
[
|
|
61
|
+
[PublicKernelType.NON_PUBLIC]: [],
|
|
62
|
+
[PublicKernelType.SETUP]: [],
|
|
63
|
+
[PublicKernelType.APP_LOGIC]: [],
|
|
64
|
+
[PublicKernelType.TEARDOWN]: [],
|
|
65
|
+
[PublicKernelType.TAIL]: [],
|
|
72
66
|
};
|
|
73
67
|
}
|
|
74
68
|
// find the first call that is revertible
|
|
@@ -76,27 +70,30 @@ export class AbstractPhaseManager {
|
|
|
76
70
|
const teardownCallStack = tx.publicTeardownFunctionCall.isEmpty() ? [] : [tx.publicTeardownFunctionCall];
|
|
77
71
|
if (firstRevertibleCallIndex === 0) {
|
|
78
72
|
return {
|
|
79
|
-
[
|
|
80
|
-
[
|
|
81
|
-
[
|
|
82
|
-
[
|
|
73
|
+
[PublicKernelType.NON_PUBLIC]: [],
|
|
74
|
+
[PublicKernelType.SETUP]: [],
|
|
75
|
+
[PublicKernelType.APP_LOGIC]: publicCallsStack,
|
|
76
|
+
[PublicKernelType.TEARDOWN]: teardownCallStack,
|
|
77
|
+
[PublicKernelType.TAIL]: [],
|
|
83
78
|
};
|
|
84
79
|
}
|
|
85
80
|
else if (firstRevertibleCallIndex === -1) {
|
|
86
81
|
// there's no app logic, split the functions between setup (many) and teardown (just one function call)
|
|
87
82
|
return {
|
|
88
|
-
[
|
|
89
|
-
[
|
|
90
|
-
[
|
|
91
|
-
[
|
|
83
|
+
[PublicKernelType.NON_PUBLIC]: [],
|
|
84
|
+
[PublicKernelType.SETUP]: publicCallsStack,
|
|
85
|
+
[PublicKernelType.APP_LOGIC]: [],
|
|
86
|
+
[PublicKernelType.TEARDOWN]: teardownCallStack,
|
|
87
|
+
[PublicKernelType.TAIL]: [],
|
|
92
88
|
};
|
|
93
89
|
}
|
|
94
90
|
else {
|
|
95
91
|
return {
|
|
96
|
-
[
|
|
97
|
-
[
|
|
98
|
-
[
|
|
99
|
-
[
|
|
92
|
+
[PublicKernelType.NON_PUBLIC]: [],
|
|
93
|
+
[PublicKernelType.SETUP]: publicCallsStack.slice(0, firstRevertibleCallIndex),
|
|
94
|
+
[PublicKernelType.APP_LOGIC]: publicCallsStack.slice(firstRevertibleCallIndex),
|
|
95
|
+
[PublicKernelType.TEARDOWN]: teardownCallStack,
|
|
96
|
+
[PublicKernelType.TAIL]: [],
|
|
100
97
|
};
|
|
101
98
|
}
|
|
102
99
|
}
|
|
@@ -104,22 +101,26 @@ export class AbstractPhaseManager {
|
|
|
104
101
|
const calls = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx)[this.phase];
|
|
105
102
|
return calls;
|
|
106
103
|
}
|
|
107
|
-
|
|
108
|
-
async processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof) {
|
|
109
|
-
let kernelOutput = previousPublicKernelOutput;
|
|
110
|
-
const kernelProof = previousPublicKernelProof;
|
|
111
|
-
const publicKernelInputs = [];
|
|
104
|
+
async processEnqueuedPublicCalls(tx, previousPublicKernelOutput) {
|
|
112
105
|
const enqueuedCalls = this.extractEnqueuedPublicCalls(tx);
|
|
113
106
|
if (!enqueuedCalls || !enqueuedCalls.length) {
|
|
114
|
-
return
|
|
107
|
+
return {
|
|
108
|
+
publicProvingInformation: [],
|
|
109
|
+
kernelOutput: previousPublicKernelOutput,
|
|
110
|
+
newUnencryptedLogs: [],
|
|
111
|
+
returnValues: [],
|
|
112
|
+
gasUsed: Gas.empty(),
|
|
113
|
+
};
|
|
115
114
|
}
|
|
116
|
-
const newUnencryptedFunctionLogs = [];
|
|
117
|
-
// Transaction fee is zero for all phases except teardown
|
|
118
|
-
const transactionFee = this.getTransactionFee(tx, previousPublicKernelOutput);
|
|
119
115
|
// TODO(#1684): Should multiple separately enqueued public calls be treated as
|
|
120
116
|
// separate public callstacks to be proven by separate public kernel sequences
|
|
121
117
|
// and submitted separately to the base rollup?
|
|
118
|
+
const provingInformationList = [];
|
|
119
|
+
const newUnencryptedFunctionLogs = [];
|
|
120
|
+
// Transaction fee is zero for all phases except teardown
|
|
121
|
+
const transactionFee = this.getTransactionFee(tx, previousPublicKernelOutput);
|
|
122
122
|
let gasUsed = Gas.empty();
|
|
123
|
+
let kernelPublicOutput = previousPublicKernelOutput;
|
|
123
124
|
const enqueuedCallResults = [];
|
|
124
125
|
for (const enqueuedCall of enqueuedCalls) {
|
|
125
126
|
const executionStack = [enqueuedCall];
|
|
@@ -128,21 +129,20 @@ export class AbstractPhaseManager {
|
|
|
128
129
|
while (executionStack.length) {
|
|
129
130
|
const current = executionStack.pop();
|
|
130
131
|
const isExecutionRequest = !isPublicExecutionResult(current);
|
|
131
|
-
// TODO(6052): Extract correct new counter from nested calls
|
|
132
|
-
const sideEffectCounter = lastSideEffectCounter(tx) + 1;
|
|
133
|
-
const availableGas = this.getAvailableGas(tx, kernelOutput);
|
|
134
|
-
const pendingNullifiers = this.getSiloedPendingNullifiers(kernelOutput);
|
|
135
132
|
const result = isExecutionRequest
|
|
136
|
-
? await this.publicExecutor.simulate(current, this.globalVariables,
|
|
133
|
+
? await this.publicExecutor.simulate(current, this.globalVariables,
|
|
134
|
+
/*availableGas=*/ this.getAvailableGas(tx, kernelPublicOutput), tx.data.constants.txContext,
|
|
135
|
+
/*pendingNullifiers=*/ this.getSiloedPendingNullifiers(kernelPublicOutput), transactionFee,
|
|
136
|
+
/*startSideEffectCounter=*/ AbstractPhaseManager.getMaxSideEffectCounter(kernelPublicOutput) + 1)
|
|
137
137
|
: current;
|
|
138
|
+
// Accumulate gas used in this execution
|
|
139
|
+
gasUsed = gasUsed.add(Gas.from(result.startGasLeft).sub(Gas.from(result.endGasLeft)));
|
|
138
140
|
// Sanity check for a current upstream assumption.
|
|
139
141
|
// Consumers of the result seem to expect "reverted <=> revertReason !== undefined".
|
|
140
|
-
const functionSelector = result.execution.
|
|
142
|
+
const functionSelector = result.execution.functionSelector.toString();
|
|
141
143
|
if (result.reverted && !result.revertReason) {
|
|
142
144
|
throw new Error(`Simulation of ${result.execution.contractAddress.toString()}:${functionSelector} reverted with no reason.`);
|
|
143
145
|
}
|
|
144
|
-
// Accumulate gas used in this execution
|
|
145
|
-
gasUsed = gasUsed.add(Gas.from(result.startGasLeft).sub(Gas.from(result.endGasLeft)));
|
|
146
146
|
if (result.reverted && !PhaseIsRevertible[this.phase]) {
|
|
147
147
|
this.log.debug(`Simulation error on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${result.revertReason}`);
|
|
148
148
|
throw result.revertReason;
|
|
@@ -150,17 +150,24 @@ export class AbstractPhaseManager {
|
|
|
150
150
|
if (isExecutionRequest) {
|
|
151
151
|
newUnencryptedFunctionLogs.push(result.allUnencryptedLogs);
|
|
152
152
|
}
|
|
153
|
-
this.log.debug(`Running public kernel circuit for ${result.execution.contractAddress.toString()}:${functionSelector}`);
|
|
154
153
|
executionStack.push(...result.nestedExecutions);
|
|
154
|
+
// Simulate the public kernel circuit.
|
|
155
|
+
this.log.debug(`Running public kernel circuit for ${result.execution.contractAddress.toString()}:${functionSelector}`);
|
|
155
156
|
const callData = await this.getPublicCallData(result, isExecutionRequest);
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
// Capture the inputs
|
|
159
|
-
|
|
160
|
-
|
|
157
|
+
const [privateInputs, publicInputs] = await this.runKernelCircuit(kernelPublicOutput, callData);
|
|
158
|
+
kernelPublicOutput = publicInputs;
|
|
159
|
+
// Capture the inputs for later proving in the AVM and kernel.
|
|
160
|
+
const publicProvingInformation = {
|
|
161
|
+
calldata: result.calldata,
|
|
162
|
+
bytecode: result.bytecode,
|
|
163
|
+
inputs: privateInputs,
|
|
164
|
+
avmHints: result.avmHints,
|
|
165
|
+
};
|
|
166
|
+
provingInformationList.push(publicProvingInformation);
|
|
167
|
+
// Sanity check: Note we can't expect them to just be equal, because e.g.
|
|
161
168
|
// if the simulator reverts in app logic, it "resets" and result.reverted will be false when we run teardown,
|
|
162
169
|
// but the kernel carries the reverted flag forward. But if the simulator reverts, so should the kernel.
|
|
163
|
-
if (result.reverted &&
|
|
170
|
+
if (result.reverted && kernelPublicOutput.revertCode.isOK()) {
|
|
164
171
|
throw new Error(`Public kernel circuit did not revert on ${result.execution.contractAddress.toString()}:${functionSelector}, but simulator did.`);
|
|
165
172
|
}
|
|
166
173
|
// We know the phase is revertible due to the above check.
|
|
@@ -168,30 +175,30 @@ export class AbstractPhaseManager {
|
|
|
168
175
|
if (result.reverted) {
|
|
169
176
|
this.log.debug(`Reverting on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${result.revertReason}`);
|
|
170
177
|
// TODO(@spalladino): Check gasUsed is correct. The AVM should take care of setting gasLeft to zero upon a revert.
|
|
171
|
-
return
|
|
178
|
+
return {
|
|
179
|
+
publicProvingInformation: [],
|
|
180
|
+
kernelOutput: kernelPublicOutput,
|
|
181
|
+
newUnencryptedLogs: [],
|
|
182
|
+
revertReason: result.revertReason,
|
|
183
|
+
returnValues: [],
|
|
184
|
+
gasUsed,
|
|
185
|
+
};
|
|
172
186
|
}
|
|
173
187
|
if (!enqueuedExecutionResult) {
|
|
174
188
|
enqueuedExecutionResult = result;
|
|
175
189
|
}
|
|
176
190
|
enqueuedCallResults.push(accumulateReturnValues(enqueuedExecutionResult));
|
|
177
191
|
}
|
|
178
|
-
// HACK(#1622): Manually patches the ordering of public state actions
|
|
179
|
-
// TODO(#757): Enforce proper ordering of public state actions
|
|
180
|
-
patchPublicStorageActionOrdering(kernelOutput, enqueuedExecutionResult, this.phase);
|
|
181
192
|
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
kernelProof,
|
|
188
|
-
newUnencryptedFunctionLogs,
|
|
189
|
-
undefined,
|
|
190
|
-
enqueuedCallResults,
|
|
193
|
+
return {
|
|
194
|
+
publicProvingInformation: provingInformationList,
|
|
195
|
+
kernelOutput: kernelPublicOutput,
|
|
196
|
+
newUnencryptedLogs: newUnencryptedFunctionLogs,
|
|
197
|
+
returnValues: enqueuedCallResults,
|
|
191
198
|
gasUsed,
|
|
192
|
-
|
|
199
|
+
};
|
|
193
200
|
}
|
|
194
|
-
/** Returns all pending private and public nullifiers.
|
|
201
|
+
/** Returns all pending private and public nullifiers. */
|
|
195
202
|
getSiloedPendingNullifiers(ko) {
|
|
196
203
|
return [...ko.end.newNullifiers, ...ko.endNonRevertibleData.newNullifiers].filter(n => !n.isEmpty());
|
|
197
204
|
}
|
|
@@ -204,30 +211,28 @@ export class AbstractPhaseManager {
|
|
|
204
211
|
getTransactionFee(_tx, _previousPublicKernelOutput) {
|
|
205
212
|
return Fr.ZERO;
|
|
206
213
|
}
|
|
207
|
-
async runKernelCircuit(previousOutput,
|
|
208
|
-
|
|
209
|
-
}
|
|
210
|
-
async getKernelCircuitOutput(previousOutput, previousProof, callData) {
|
|
211
|
-
const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
|
|
214
|
+
async runKernelCircuit(previousOutput, callData) {
|
|
215
|
+
const previousKernel = this.getPreviousKernelData(previousOutput);
|
|
212
216
|
// We take a deep copy (clone) of these inputs to be passed to the prover
|
|
213
217
|
const inputs = new PublicKernelCircuitPrivateInputs(previousKernel, callData);
|
|
214
218
|
switch (this.phase) {
|
|
215
|
-
case
|
|
219
|
+
case PublicKernelType.SETUP:
|
|
216
220
|
return [inputs.clone(), await this.publicKernel.publicKernelCircuitSetup(inputs)];
|
|
217
|
-
case
|
|
221
|
+
case PublicKernelType.APP_LOGIC:
|
|
218
222
|
return [inputs.clone(), await this.publicKernel.publicKernelCircuitAppLogic(inputs)];
|
|
219
|
-
case
|
|
223
|
+
case PublicKernelType.TEARDOWN:
|
|
220
224
|
return [inputs.clone(), await this.publicKernel.publicKernelCircuitTeardown(inputs)];
|
|
221
225
|
default:
|
|
222
226
|
throw new Error(`No public kernel circuit for inputs`);
|
|
223
227
|
}
|
|
224
228
|
}
|
|
225
|
-
getPreviousKernelData(previousOutput
|
|
226
|
-
//
|
|
227
|
-
const vk =
|
|
229
|
+
getPreviousKernelData(previousOutput) {
|
|
230
|
+
// The proof and verification key are not used in simulation
|
|
231
|
+
const vk = VerificationKeyData.makeFake();
|
|
232
|
+
const proof = makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH);
|
|
228
233
|
const vkIndex = 0;
|
|
229
234
|
const vkSiblingPath = MembershipWitness.random(VK_TREE_HEIGHT).siblingPath;
|
|
230
|
-
return new PublicKernelData(previousOutput,
|
|
235
|
+
return new PublicKernelData(previousOutput, proof, vk, vkIndex, vkSiblingPath);
|
|
231
236
|
}
|
|
232
237
|
async getPublicCallStackItem(result, isExecutionRequest = false) {
|
|
233
238
|
const publicDataTreeInfo = await this.db.getTreeInfo(MerkleTreeId.PUBLIC_DATA_TREE);
|
|
@@ -244,8 +249,10 @@ export class AbstractPhaseManager {
|
|
|
244
249
|
startSideEffectCounter: result.startSideEffectCounter,
|
|
245
250
|
endSideEffectCounter: result.endSideEffectCounter,
|
|
246
251
|
returnsHash: computeVarArgsHash(result.returnValues),
|
|
252
|
+
noteHashReadRequests: padArrayEnd(result.noteHashReadRequests, ReadRequest.empty(), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL),
|
|
247
253
|
nullifierReadRequests: padArrayEnd(result.nullifierReadRequests, ReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
|
|
248
254
|
nullifierNonExistentReadRequests: padArrayEnd(result.nullifierNonExistentReadRequests, ReadRequest.empty(), MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL),
|
|
255
|
+
l1ToL2MsgReadRequests: padArrayEnd(result.l1ToL2MsgReadRequests, ReadRequest.empty(), MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL),
|
|
249
256
|
contractStorageReads: padArrayEnd(result.contractStorageReads, ContractStorageRead.empty(), MAX_PUBLIC_DATA_READS_PER_CALL),
|
|
250
257
|
contractStorageUpdateRequests: padArrayEnd(result.contractStorageUpdateRequests, ContractStorageUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL),
|
|
251
258
|
publicCallStackHashes,
|
|
@@ -256,9 +263,9 @@ export class AbstractPhaseManager {
|
|
|
256
263
|
endGasLeft: Gas.from(result.endGasLeft),
|
|
257
264
|
transactionFee: result.transactionFee,
|
|
258
265
|
// TODO(@just-mitch): need better mapping from simulator to revert code.
|
|
259
|
-
revertCode: result.reverted ? RevertCode.
|
|
266
|
+
revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
|
|
260
267
|
});
|
|
261
|
-
return new PublicCallStackItem(result.execution.contractAddress, result.execution.
|
|
268
|
+
return new PublicCallStackItem(result.execution.contractAddress, new FunctionData(result.execution.functionSelector, false), publicCircuitPublicInputs, isExecutionRequest);
|
|
262
269
|
}
|
|
263
270
|
async getPublicCallStackPreimages(result) {
|
|
264
271
|
const nested = result.nestedExecutions;
|
|
@@ -267,6 +274,43 @@ export class AbstractPhaseManager {
|
|
|
267
274
|
}
|
|
268
275
|
return await Promise.all(nested.map(n => this.getPublicCallStackItem(n)));
|
|
269
276
|
}
|
|
277
|
+
/**
|
|
278
|
+
* Looks at the side effects of a transaction and returns the highest counter
|
|
279
|
+
* @param tx - A transaction
|
|
280
|
+
* @returns The highest side effect counter in the transaction so far
|
|
281
|
+
*/
|
|
282
|
+
static getMaxSideEffectCounter(inputs) {
|
|
283
|
+
const sideEffectCounters = [
|
|
284
|
+
...inputs.endNonRevertibleData.newNoteHashes,
|
|
285
|
+
...inputs.endNonRevertibleData.newNullifiers,
|
|
286
|
+
...inputs.endNonRevertibleData.noteEncryptedLogsHashes,
|
|
287
|
+
...inputs.endNonRevertibleData.encryptedLogsHashes,
|
|
288
|
+
...inputs.endNonRevertibleData.unencryptedLogsHashes,
|
|
289
|
+
...inputs.endNonRevertibleData.publicCallStack,
|
|
290
|
+
...inputs.endNonRevertibleData.publicDataUpdateRequests,
|
|
291
|
+
...inputs.end.newNoteHashes,
|
|
292
|
+
...inputs.end.newNullifiers,
|
|
293
|
+
...inputs.end.noteEncryptedLogsHashes,
|
|
294
|
+
...inputs.end.encryptedLogsHashes,
|
|
295
|
+
...inputs.end.unencryptedLogsHashes,
|
|
296
|
+
...inputs.end.publicCallStack,
|
|
297
|
+
...inputs.end.publicDataUpdateRequests,
|
|
298
|
+
];
|
|
299
|
+
let max = 0;
|
|
300
|
+
for (const sideEffect of sideEffectCounters) {
|
|
301
|
+
if ('startSideEffectCounter' in sideEffect) {
|
|
302
|
+
// look at both start and end counters because for enqueued public calls start > 0 while end === 0
|
|
303
|
+
max = Math.max(max, sideEffect.startSideEffectCounter.toNumber(), sideEffect.endSideEffectCounter.toNumber());
|
|
304
|
+
}
|
|
305
|
+
else if ('counter' in sideEffect) {
|
|
306
|
+
max = Math.max(max, sideEffect.counter);
|
|
307
|
+
}
|
|
308
|
+
else {
|
|
309
|
+
throw new Error('Unknown side effect type');
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
return max;
|
|
313
|
+
}
|
|
270
314
|
getBytecodeHash(_result) {
|
|
271
315
|
// TODO: Determine how to calculate bytecode hash. Circuits just check it isn't zero for now.
|
|
272
316
|
// See https://github.com/AztecProtocol/aztec3-packages/issues/378
|
|
@@ -289,55 +333,4 @@ export class AbstractPhaseManager {
|
|
|
289
333
|
return new PublicCallData(callStackItem, publicCallStack, makeEmptyProof(), bytecodeHash);
|
|
290
334
|
}
|
|
291
335
|
}
|
|
292
|
-
function removeRedundantPublicDataWrites(publicInputs, phase) {
|
|
293
|
-
const lastWritesMap = new Map();
|
|
294
|
-
const patch = (requests) => requests.filter(write => {
|
|
295
|
-
const leafSlot = write.leafSlot.toString();
|
|
296
|
-
const exists = lastWritesMap.get(leafSlot);
|
|
297
|
-
lastWritesMap.set(leafSlot, true);
|
|
298
|
-
return !exists;
|
|
299
|
-
});
|
|
300
|
-
const [prev, curr] = PhaseIsRevertible[phase]
|
|
301
|
-
? [publicInputs.endNonRevertibleData, publicInputs.end]
|
|
302
|
-
: [publicInputs.end, publicInputs.endNonRevertibleData];
|
|
303
|
-
curr.publicDataUpdateRequests = padArrayEnd(patch(curr.publicDataUpdateRequests.reverse()).reverse(), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
304
|
-
prev.publicDataUpdateRequests = padArrayEnd(patch(prev.publicDataUpdateRequests.reverse()), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
305
|
-
}
|
|
306
|
-
// HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel
|
|
307
|
-
// cannot keep track of side effects that happen after or before a nested call, we override the public
|
|
308
|
-
// state actions it emits with whatever we got from the simulator. As a sanity check, we at least verify
|
|
309
|
-
// that the elements are the same, so we are only tweaking their ordering.
|
|
310
|
-
// See yarn-project/end-to-end/src/e2e_ordering.test.ts
|
|
311
|
-
// See https://github.com/AztecProtocol/aztec-packages/issues/1616
|
|
312
|
-
// TODO(#757): Enforce proper ordering of public state actions
|
|
313
|
-
/**
|
|
314
|
-
* Patch the ordering of storage actions output from the public kernel.
|
|
315
|
-
* @param publicInputs - to be patched here: public inputs to the kernel iteration up to this point
|
|
316
|
-
* @param execResult - result of the top/first execution for this enqueued public call
|
|
317
|
-
*/
|
|
318
|
-
function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
|
|
319
|
-
const { publicDataUpdateRequests } = PhaseIsRevertible[phase] ? publicInputs.end : publicInputs.endNonRevertibleData;
|
|
320
|
-
const { publicDataReads } = publicInputs.validationRequests;
|
|
321
|
-
// Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
|
|
322
|
-
// Note, this only pulls simulated reads/writes from the current phase,
|
|
323
|
-
// so the returned result will be a subset of the public kernel output.
|
|
324
|
-
const simPublicDataReads = collectPublicDataReads(execResult);
|
|
325
|
-
const simPublicDataUpdateRequests = collectPublicDataUpdateRequests(execResult);
|
|
326
|
-
// We only want to reorder the items from the public inputs of the
|
|
327
|
-
// most recently processed top/enqueued call.
|
|
328
|
-
const effectSet = PhaseIsRevertible[phase] ? 'end' : 'endNonRevertibleData';
|
|
329
|
-
const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
|
|
330
|
-
const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
|
|
331
|
-
publicInputs.validationRequests.publicDataReads = padArrayEnd([
|
|
332
|
-
// do not mess with items from previous top/enqueued calls in kernel output
|
|
333
|
-
...publicInputs.validationRequests.publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
|
|
334
|
-
...simPublicDataReads,
|
|
335
|
-
], PublicDataRead.empty(), MAX_PUBLIC_DATA_READS_PER_TX);
|
|
336
|
-
const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());
|
|
337
|
-
const numUpdatesBeforeThisEnqueuedCall = numUpdatesInKernel - simPublicDataUpdateRequests.length;
|
|
338
|
-
publicInputs[effectSet].publicDataUpdateRequests = padArrayEnd([
|
|
339
|
-
...publicInputs[effectSet].publicDataUpdateRequests.slice(0, numUpdatesBeforeThisEnqueuedCall),
|
|
340
|
-
...simPublicDataUpdateRequests,
|
|
341
|
-
], PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
342
|
-
}
|
|
343
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/public/abstract_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,gBAAgB,GAIjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,4BAA4B,EAC5B,EAAE,EACF,GAAG,EAIH,aAAa,EACb,OAAO,EACP,8BAA8B,EAC9B,4BAA4B,EAC5B,2BAA2B,EAC3B,iDAAiD,EACjD,oCAAoC,EACpC,qCAAqC,EACrC,8BAA8B,EAC9B,4BAA4B,EAC5B,wCAAwC,EACxC,sCAAsC,EACtC,6BAA6B,EAC7B,iBAAiB,EACjB,QAAQ,EACR,SAAS,EAET,cAAc,EAEd,mBAAmB,EACnB,yBAAyB,EACzB,cAAc,EACd,uBAAuB,EACvB,gCAAgC,EAEhC,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAoB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAIL,sBAAsB,EACtB,sBAAsB,EACtB,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAN,IAAY,iBAKX;AALD,WAAY,iBAAiB;IAC3B,oCAAe,CAAA;IACf,4CAAuB,CAAA;IACvB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;AACf,CAAC,EALW,iBAAiB,KAAjB,iBAAiB,QAK5B;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAuC;IACnE,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK;IAChC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,IAAI;IACnC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,KAAK;IACnC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,KAAK;CAChC,CAAC;AAEF,iEAAiE;AACjE,MAAM,UAAU,6BAA6B,CAAC,KAAwB;IACpE,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,iBAAiB,CAAC,KAAK;YAC1B,OAAO,gBAAgB,CAAC,KAAK,CAAC;QAChC,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,gBAAgB,CAAC,SAAS,CAAC;QACpC,KAAK,iBAAiB,CAAC,QAAQ;YAC7B,OAAO,gBAAgB,CAAC,QAAQ,CAAC;QACnC,KAAK,iBAAiB,CAAC,IAAI;YACzB,OAAO,gBAAgB,CAAC,IAAI,CAAC;IACjC,CAAC;AACH,CAAC;AAED,MAAM,OAAgB,oBAAoB;IAGxC,YACY,EAAwB,EACxB,cAA8B,EAC9B,YAA0C,EAC1C,eAAgC,EAChC,gBAAwB,EAC3B,KAAwB;QALrB,OAAE,GAAF,EAAE,CAAsB;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAQ;QAC3B,UAAK,GAAL,KAAK,CAAmB;QAE/B,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;IAqCM,MAAM,CAAC,iCAAiC,CAAC,EAAM;QACpD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE;gBAC7B,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE;gBACjC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE;aAC7B,CAAC;QACJ,CAAC;QACD,MAAM,gBAAgB,GAAG,EAAE,CAAC,2BAA2B,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAC1E,MAAM,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnG,MAAM,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/E,MAAM,iBAAiB,GAAG,gBAAgB;aACvC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;aACjC,MAAM;QACL,kEAAkE;QAClE,iFAAiF;QACjF,iBAAiB;QACjB,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC1G,CAAC;QAEJ,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO;gBACL,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE;gBAC7B,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE;gBACjC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE;aAC7B,CAAC;QACJ,CAAC;QAED,yCAAyC;QACzC,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,SAAS,CAC1D,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAC5D,CAAC;QAEF,MAAM,iBAAiB,GAAG,EAAE,CAAC,0BAA0B,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC;QAEzG,IAAI,wBAAwB,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO;gBACL,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE;gBAC7B,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,gBAAgB;gBAC/C,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,iBAAiB;gBAC/C,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE;aAC7B,CAAC;QACJ,CAAC;aAAM,IAAI,wBAAwB,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3C,uGAAuG;YACvG,OAAO;gBACL,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,gBAAgB;gBAC3C,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE;gBACjC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,iBAAiB;gBAC/C,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE;aAC7B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,wBAAwB,CAAC;gBAC9E,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,wBAAwB,CAAC;gBAC/E,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,iBAAiB;gBAC/C,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE;aAC7B,CAAC;QACJ,CAAC;IACH,CAAC;IAES,0BAA0B,CAAC,EAAM;QACzC,MAAM,KAAK,GAAG,oBAAoB,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,+GAA+G;IACrG,KAAK,CAAC,0BAA0B,CACxC,EAAM,EACN,0BAA2D,EAC3D,yBAAgC;QAYhC,IAAI,YAAY,GAAG,0BAA0B,CAAC;QAC9C,MAAM,WAAW,GAAG,yBAAyB,CAAC;QAC9C,MAAM,kBAAkB,GAAuC,EAAE,CAAC;QAElE,MAAM,aAAa,GAAG,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC5C,OAAO,CAAC,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,0BAA0B,GAAgC,EAAE,CAAC;QAEnE,yDAAyD;QACzD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,0BAA0B,CAAC,CAAC;QAE9E,8EAA8E;QAC9E,8EAA8E;QAC9E,+CAA+C;QAE/C,IAAI,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QAE1B,MAAM,mBAAmB,GAAG,EAAE,CAAC;QAE/B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,cAAc,GAAgD,CAAC,YAAY,CAAC,CAAC;YAEnF,0DAA0D;YAC1D,IAAI,uBAA0D,CAAC;YAE/D,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,EAAG,CAAC;gBACtC,MAAM,kBAAkB,GAAG,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBAC7D,4DAA4D;gBAC5D,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACxD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;gBAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,YAAY,CAAC,CAAC;gBAExE,MAAM,MAAM,GAAG,kBAAkB;oBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAChC,OAAO,EACP,IAAI,CAAC,eAAe,EACpB,YAAY,EACZ,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAC3B,iBAAiB,EACjB,cAAc,EACd,iBAAiB,CAClB;oBACH,CAAC,CAAC,OAAO,CAAC;gBAEZ,kDAAkD;gBAClD,oFAAoF;gBACpF,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAC3E,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,iBAAiB,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,gBAAgB,2BAA2B,CAC5G,CAAC;gBACJ,CAAC;gBAED,wCAAwC;gBACxC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAEtF,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,uBAAuB,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,gBAAgB,iBACpF,MAAM,CAAC,YACT,EAAE,CACH,CAAC;oBACF,MAAM,MAAM,CAAC,YAAY,CAAC;gBAC5B,CAAC;gBAED,IAAI,kBAAkB,EAAE,CAAC;oBACvB,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBAC7D,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qCAAqC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE,CACvG,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;gBAE1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;gBACvF,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAEhC,6DAA6D;gBAC7D,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE1C,yEAAyE;gBACzE,6GAA6G;gBAC7G,wGAAwG;gBACxG,IAAI,MAAM,CAAC,QAAQ,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;oBACtD,MAAM,IAAI,KAAK,CACb,2CAA2C,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,gBAAgB,sBAAsB,CACjI,CAAC;gBACJ,CAAC;gBAED,0DAA0D;gBAC1D,+GAA+G;gBAC/G,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gBAAgB,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,gBAAgB,iBAC7E,MAAM,CAAC,YACT,EAAE,CACH,CAAC;oBACF,kHAAkH;oBAClH,OAAO,CAAC,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC/E,CAAC;gBAED,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,uBAAuB,GAAG,MAAM,CAAC;gBACnC,CAAC;gBAED,mBAAmB,CAAC,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAC5E,CAAC;YACD,qEAAqE;YACrE,8DAA8D;YAC9D,gCAAgC,CAAC,YAAY,EAAE,uBAAwB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvF,CAAC;QAED,8DAA8D;QAC9D,+BAA+B,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1D,OAAO;YACL,kBAAkB;YAClB,YAAY;YACZ,WAAW;YACX,0BAA0B;YAC1B,SAAS;YACT,mBAAmB;YACnB,OAAO;SACR,CAAC;IACJ,CAAC;IAED,0DAA0D;IAClD,0BAA0B,CAAC,EAAmC;QACpE,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACvG,CAAC;IAES,eAAe,CAAC,EAAM,EAAE,0BAA2D;QAC3F,OAAO,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW;aAC3C,SAAS,EAAE,CAAC,qFAAqF;aACjG,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC;aAC3C,GAAG,CAAC,0BAA0B,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAES,iBAAiB,CAAC,GAAO,EAAE,2BAA4D;QAC/F,OAAO,EAAE,CAAC,IAAI,CAAC;IACjB,CAAC;IAES,KAAK,CAAC,gBAAgB,CAC9B,cAA+C,EAC/C,aAAoB,EACpB,QAAwB;QAExB,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IACpF,CAAC;IAES,KAAK,CAAC,sBAAsB,CACpC,cAA+C,EAC/C,aAAoB,EACpB,QAAwB;QAExB,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAEjF,yEAAyE;QACzE,MAAM,MAAM,GAAG,IAAI,gCAAgC,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC9E,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,KAAK,iBAAiB,CAAC,KAAK;gBAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;YACpF,KAAK,iBAAiB,CAAC,SAAS;gBAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;YACvF,KAAK,iBAAiB,CAAC,QAAQ;gBAC7B,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;YACvF;gBACE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAES,qBAAqB,CAC7B,cAA+C,EAC/C,aAAoB;QAEpB,2DAA2D;QAC3D,MAAM,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC;QAC3E,OAAO,IAAI,gBAAgB,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACzF,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,MAA6B,EAAE,kBAAkB,GAAG,KAAK;QAC9F,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEjG,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAC1E,MAAM,qBAAqB,GAAG,WAAW,CACvC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EACrC,EAAE,CAAC,IAAI,EACP,qCAAqC,CACtC,CAAC;QAEF,MAAM,yBAAyB,GAAG,yBAAyB,CAAC,IAAI,CAAC;YAC/D,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW;YACzC,aAAa,EAAE,YAAY,CAAC,IAAI;YAChC,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACnD,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,4BAA4B,CAAC;YAChG,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,2BAA2B,CAAC;YAChG,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,8BAA8B,CAAC;YAC3G,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,WAAW,EAAE,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC;YACpD,qBAAqB,EAAE,WAAW,CAChC,MAAM,CAAC,qBAAqB,EAC5B,WAAW,CAAC,KAAK,EAAE,EACnB,oCAAoC,CACrC;YACD,gCAAgC,EAAE,WAAW,CAC3C,MAAM,CAAC,gCAAgC,EACvC,WAAW,CAAC,KAAK,EAAE,EACnB,iDAAiD,CAClD;YACD,oBAAoB,EAAE,WAAW,CAC/B,MAAM,CAAC,oBAAoB,EAC3B,mBAAmB,CAAC,KAAK,EAAE,EAC3B,8BAA8B,CAC/B;YACD,6BAA6B,EAAE,WAAW,CACxC,MAAM,CAAC,6BAA6B,EACpC,4BAA4B,CAAC,KAAK,EAAE,EACpC,wCAAwC,CACzC;YACD,qBAAqB;YACrB,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,6BAA6B,CAAC;YAChH,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC3C,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YACvC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,wEAAwE;YACxE,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;SAClE,CAAC,CAAC;QAEH,OAAO,IAAI,mBAAmB,CAC5B,MAAM,CAAC,SAAS,CAAC,eAAe,EAChC,MAAM,CAAC,SAAS,CAAC,YAAY,EAC7B,yBAAyB,EACzB,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,2BAA2B,CAAC,MAA6B;QACvE,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACvC,IAAI,MAAM,CAAC,MAAM,GAAG,qCAAqC,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CACb,wCAAwC,qCAAqC,SAAS,MAAM,CAAC,MAAM,GAAG,CACvG,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAES,eAAe,CAAC,OAA8B;QACtD,6FAA6F;QAC7F,kEAAkE;QAClE,MAAM,YAAY,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,iBAAiB,CAAC,MAA6B,EAAE,kBAAkB,GAAG,KAAK;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACpF,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAClF,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,CACxD,CAAC;QACF,MAAM,eAAe,GAAG,WAAW,CAAC,kBAAkB,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,qCAAqC,CAAC,CAAC;QACpH,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;IAC5F,CAAC;CACF;AAED,SAAS,+BAA+B,CAAC,YAA6C,EAAE,KAAwB;IAC9G,MAAM,aAAa,GAAG,IAAI,GAAG,EAAmB,CAAC;IACjD,MAAM,KAAK,GAAG,CAAmB,QAA2C,EAAE,EAAE,CAC9E,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC;QAC3C,CAAC,CAAC,CAAC,YAAY,CAAC,oBAAoB,EAAE,YAAY,CAAC,GAAG,CAAC;QACvD,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAE1D,IAAI,CAAC,wBAAwB,GAAG,WAAW,CACzC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,EACxD,uBAAuB,CAAC,KAAK,EAAE,EAC/B,sCAAsC,CACvC,CAAC;IAEF,IAAI,CAAC,wBAAwB,GAAG,WAAW,CACzC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,EAC9C,uBAAuB,CAAC,KAAK,EAAE,EAC/B,sCAAsC,CACvC,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,sGAAsG;AACtG,wGAAwG;AACxG,0EAA0E;AAC1E,uDAAuD;AACvD,kEAAkE;AAClE,8DAA8D;AAC9D;;;;GAIG;AACH,SAAS,gCAAgC,CACvC,YAA6C,EAC7C,UAAiC,EACjC,KAAwB;IAExB,MAAM,EAAE,wBAAwB,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,oBAAoB,CAAC;IACrH,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC,kBAAkB,CAAC;IAE5D,4FAA4F;IAC5F,uEAAuE;IACvE,uEAAuE;IAEvE,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,2BAA2B,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;IAEhF,kEAAkE;IAClE,6CAA6C;IAE7C,MAAM,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAE5E,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAChF,MAAM,8BAA8B,GAAG,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CAAC;IACpF,YAAY,CAAC,kBAAkB,CAAC,eAAe,GAAG,WAAW,CAC3D;QACE,2EAA2E;QAC3E,GAAG,YAAY,CAAC,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC;QAC3F,GAAG,kBAAkB;KACtB,EACD,cAAc,CAAC,KAAK,EAAE,EACtB,4BAA4B,CAC7B,CAAC;IAEF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3F,MAAM,gCAAgC,GAAG,kBAAkB,GAAG,2BAA2B,CAAC,MAAM,CAAC;IACjG,YAAY,CAAC,SAAS,CAAC,CAAC,wBAAwB,GAAG,WAAW,CAC5D;QACE,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,gCAAgC,CAAC;QAC9F,GAAG,2BAA2B;KAC/B,EACD,uBAAuB,CAAC,KAAK,EAAE,EAC/B,sCAAsC,CACvC,CAAC;AACJ,CAAC"}
|
|
336
|
+
//# 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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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { type Tx } from '@aztec/circuit-types';
|
|
2
|
-
import { type GlobalVariables, type Header, type
|
|
1
|
+
import { PublicKernelType, type PublicProvingRequest, type Tx } from '@aztec/circuit-types';
|
|
2
|
+
import { type GlobalVariables, type Header, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
|
|
3
3
|
import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator';
|
|
4
4
|
import { type MerkleTreeOperations } from '@aztec/world-state';
|
|
5
|
-
import { AbstractPhaseManager
|
|
6
|
-
import { type ContractsDataSourcePublicDB } from './
|
|
5
|
+
import { AbstractPhaseManager } from './abstract_phase_manager.js';
|
|
6
|
+
import { type ContractsDataSourcePublicDB } from './public_db_sources.js';
|
|
7
7
|
import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
|
|
8
8
|
/**
|
|
9
9
|
* The phase manager responsible for performing the fee preparation phase.
|
|
@@ -11,14 +11,13 @@ import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simul
|
|
|
11
11
|
export declare class AppLogicPhaseManager extends AbstractPhaseManager {
|
|
12
12
|
protected publicContractsDB: ContractsDataSourcePublicDB;
|
|
13
13
|
protected publicStateDB: PublicStateDB;
|
|
14
|
-
constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header, publicContractsDB: ContractsDataSourcePublicDB, publicStateDB: PublicStateDB, phase?:
|
|
15
|
-
handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs
|
|
16
|
-
|
|
14
|
+
constructor(db: MerkleTreeOperations, publicExecutor: PublicExecutor, publicKernel: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header, publicContractsDB: ContractsDataSourcePublicDB, publicStateDB: PublicStateDB, phase?: PublicKernelType);
|
|
15
|
+
handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs): Promise<{
|
|
16
|
+
publicProvingRequests: PublicProvingRequest[];
|
|
17
17
|
publicKernelOutput: PublicKernelCircuitPublicInputs;
|
|
18
|
-
publicKernelProof: Proof;
|
|
19
18
|
revertReason: import("@aztec/circuit-types").SimulationError | undefined;
|
|
20
19
|
returnValues: import("@aztec/circuit-types").NestedProcessReturnValues[];
|
|
21
|
-
gasUsed: import("@aztec/circuits.js").Gas;
|
|
20
|
+
gasUsed: import("@aztec/circuits.js").Gas | undefined;
|
|
22
21
|
}>;
|
|
23
22
|
}
|
|
24
23
|
//# sourceMappingURL=app_logic_phase_manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app_logic_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/app_logic_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"app_logic_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/app_logic_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAC7G,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,EAAyB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB;IAO1D,SAAS,CAAC,iBAAiB,EAAE,2BAA2B;IACxD,SAAS,CAAC,aAAa,EAAE,aAAa;gBANtC,EAAE,EAAE,oBAAoB,EACxB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,4BAA4B,EAC1C,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACd,iBAAiB,EAAE,2BAA2B,EAC9C,aAAa,EAAE,aAAa,EACtC,KAAK,GAAE,gBAA6C;IAKvC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,+BAA+B;;;;;;;CAkC1F"}
|