@aztec/simulator 0.62.0 → 0.63.1
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 -16
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/acvm.js +2 -70
- package/dest/acvm/oracle/oracle.d.ts +4 -4
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +10 -11
- package/dest/acvm/oracle/typed_oracle.d.ts +5 -5
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +8 -8
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +2 -1
- package/dest/avm/avm_machine_state.d.ts +27 -8
- package/dest/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/avm/avm_machine_state.js +6 -10
- package/dest/avm/avm_memory_types.d.ts +8 -0
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +5 -1
- package/dest/avm/avm_simulator.d.ts +2 -19
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +12 -14
- package/dest/avm/avm_tree.d.ts +249 -0
- package/dest/avm/avm_tree.d.ts.map +1 -0
- package/dest/avm/avm_tree.js +637 -0
- package/dest/avm/errors.d.ts +4 -17
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +21 -50
- package/dest/avm/fixtures/index.d.ts +7 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +12 -12
- package/dest/avm/index.d.ts +1 -0
- package/dest/avm/index.d.ts.map +1 -1
- package/dest/avm/index.js +2 -1
- package/dest/avm/journal/journal.d.ts +43 -24
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +172 -39
- package/dest/avm/journal/nullifiers.d.ts +5 -4
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +2 -3
- package/dest/avm/journal/public_storage.d.ts +6 -5
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +1 -1
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +4 -10
- package/dest/avm/opcodes/arithmetic.d.ts +4 -1
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +18 -4
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +1 -3
- package/dest/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/avm/opcodes/comparators.js +1 -2
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +2 -3
- package/dest/avm/opcodes/control_flow.d.ts +4 -0
- package/dest/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/avm/opcodes/control_flow.js +21 -6
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +1 -2
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +5 -11
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +1 -2
- package/dest/avm/opcodes/external_calls.d.ts +4 -2
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +38 -22
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +1 -4
- package/dest/avm/opcodes/instruction.d.ts +4 -0
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +7 -1
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +1 -7
- package/dest/avm/opcodes/misc.js +3 -3
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +6 -5
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +2 -4
- package/dest/avm/serialization/bytecode_serialization.d.ts +1 -6
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +24 -20
- package/dest/client/client_execution_context.d.ts +7 -11
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +18 -20
- package/dest/client/db_oracle.d.ts +17 -10
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +5 -4
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +3 -2
- package/dest/client/view_data_oracle.d.ts +6 -12
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +10 -12
- package/dest/common/errors.d.ts +15 -2
- package/dest/common/errors.d.ts.map +1 -1
- package/dest/common/errors.js +85 -4
- package/dest/mocks/fixtures.d.ts +9 -28
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +12 -57
- package/dest/public/dual_side_effect_trace.d.ts +34 -26
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.js +48 -36
- package/dest/public/enqueued_call_side_effect_trace.d.ts +96 -33
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +212 -138
- package/dest/public/execution.d.ts +50 -17
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -29
- package/dest/public/executor.d.ts +28 -11
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +33 -33
- package/dest/public/index.d.ts +4 -5
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +4 -5
- package/dest/public/public_db_sources.d.ts +1 -0
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +12 -5
- package/dest/public/public_processor.d.ts +7 -11
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +60 -42
- package/dest/public/public_processor_metrics.d.ts +3 -3
- package/dest/public/public_processor_metrics.d.ts.map +1 -1
- package/dest/public/public_processor_metrics.js +1 -1
- package/dest/public/public_tx_context.d.ts +130 -0
- package/dest/public/public_tx_context.d.ts.map +1 -0
- package/dest/public/public_tx_context.js +293 -0
- package/dest/public/public_tx_simulator.d.ts +36 -0
- package/dest/public/public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator.js +148 -0
- package/dest/public/side_effect_trace.d.ts +30 -15
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +70 -16
- package/dest/public/side_effect_trace_interface.d.ts +43 -12
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/transitional_adapters.d.ts +9 -0
- package/dest/public/transitional_adapters.d.ts.map +1 -0
- package/dest/public/transitional_adapters.js +127 -0
- package/dest/public/utils.d.ts +5 -0
- package/dest/public/utils.d.ts.map +1 -0
- package/dest/public/utils.js +30 -0
- package/package.json +12 -9
- package/src/acvm/acvm.ts +3 -94
- package/src/acvm/oracle/oracle.ts +9 -14
- package/src/acvm/oracle/typed_oracle.ts +8 -8
- package/src/avm/avm_gas.ts +1 -0
- package/src/avm/avm_machine_state.ts +28 -12
- package/src/avm/avm_memory_types.ts +5 -0
- package/src/avm/avm_simulator.ts +13 -16
- package/src/avm/avm_tree.ts +785 -0
- package/src/avm/errors.ts +25 -48
- package/src/avm/fixtures/index.ts +16 -12
- package/src/avm/index.ts +1 -0
- package/src/avm/journal/journal.ts +291 -52
- package/src/avm/journal/nullifiers.ts +7 -7
- package/src/avm/journal/public_storage.ts +5 -5
- package/src/avm/opcodes/accrued_substate.ts +3 -9
- package/src/avm/opcodes/arithmetic.ts +26 -4
- package/src/avm/opcodes/bitwise.ts +0 -2
- package/src/avm/opcodes/comparators.ts +0 -1
- package/src/avm/opcodes/contract.ts +1 -2
- package/src/avm/opcodes/control_flow.ts +24 -5
- package/src/avm/opcodes/conversion.ts +0 -1
- package/src/avm/opcodes/ec_add.ts +6 -9
- package/src/avm/opcodes/environment_getters.ts +0 -1
- package/src/avm/opcodes/external_calls.ts +39 -21
- package/src/avm/opcodes/hashing.ts +0 -3
- package/src/avm/opcodes/instruction.ts +7 -0
- package/src/avm/opcodes/memory.ts +0 -6
- package/src/avm/opcodes/misc.ts +2 -2
- package/src/avm/opcodes/multi_scalar_mul.ts +5 -4
- package/src/avm/opcodes/storage.ts +1 -3
- package/src/avm/serialization/bytecode_serialization.ts +31 -22
- package/src/client/client_execution_context.ts +22 -23
- package/src/client/db_oracle.ts +22 -11
- package/src/client/private_execution.ts +5 -4
- package/src/client/unconstrained_execution.ts +2 -1
- package/src/client/view_data_oracle.ts +14 -13
- package/src/common/errors.ts +119 -3
- package/src/mocks/fixtures.ts +15 -106
- package/src/public/dual_side_effect_trace.ts +138 -50
- package/src/public/enqueued_call_side_effect_trace.ts +352 -212
- package/src/public/execution.ts +58 -42
- package/src/public/executor.ts +52 -67
- package/src/public/index.ts +7 -5
- package/src/public/public_db_sources.ts +12 -4
- package/src/public/public_processor.ts +111 -73
- package/src/public/public_processor_metrics.ts +3 -3
- package/src/public/public_tx_context.ts +411 -0
- package/src/public/public_tx_simulator.ts +232 -0
- package/src/public/side_effect_trace.ts +154 -28
- package/src/public/side_effect_trace_interface.ts +92 -14
- package/src/public/transitional_adapters.ts +347 -0
- package/src/public/utils.ts +32 -0
- package/dest/public/enqueued_call_simulator.d.ts +0 -43
- package/dest/public/enqueued_call_simulator.d.ts.map +0 -1
- package/dest/public/enqueued_call_simulator.js +0 -156
- package/dest/public/enqueued_calls_processor.d.ts +0 -43
- package/dest/public/enqueued_calls_processor.d.ts.map +0 -1
- package/dest/public/enqueued_calls_processor.js +0 -209
- package/dest/public/hints_builder.d.ts +0 -29
- package/dest/public/hints_builder.d.ts.map +0 -1
- package/dest/public/hints_builder.js +0 -75
- package/dest/public/public_kernel.d.ts +0 -30
- package/dest/public/public_kernel.d.ts.map +0 -1
- package/dest/public/public_kernel.js +0 -67
- package/dest/public/public_kernel_circuit_simulator.d.ts +0 -25
- package/dest/public/public_kernel_circuit_simulator.d.ts.map +0 -1
- package/dest/public/public_kernel_circuit_simulator.js +0 -2
- package/dest/public/public_kernel_tail_simulator.d.ts +0 -15
- package/dest/public/public_kernel_tail_simulator.d.ts.map +0 -1
- package/dest/public/public_kernel_tail_simulator.js +0 -39
- package/src/public/enqueued_call_simulator.ts +0 -360
- package/src/public/enqueued_calls_processor.ts +0 -372
- package/src/public/hints_builder.ts +0 -168
- package/src/public/public_kernel.ts +0 -100
- package/src/public/public_kernel_circuit_simulator.ts +0 -32
- package/src/public/public_kernel_tail_simulator.ts +0 -97
|
@@ -1,11 +1,33 @@
|
|
|
1
|
-
import { UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { AvmContractBytecodeHints, AvmContractInstanceHint, AvmExecutionHints, AvmExternalCallHint, AvmKeyValueHint,
|
|
3
|
-
import {
|
|
4
|
-
import { makeTuple } from '@aztec/foundation/array';
|
|
1
|
+
import { UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmAccumulatedData, AvmAppendTreeHint, AvmCircuitPublicInputs, AvmContractBytecodeHints, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmExternalCallHint, AvmKeyValueHint, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, EthAddress, Gas, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, LogHash, MAX_ENQUEUED_CALLS_PER_TX, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NoteHash, Nullifier, NullifierLeafPreimage, PUBLIC_DATA_TREE_HEIGHT, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataRead, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, PublicDataWrite, ReadRequest, ScopedL2ToL1Message, ScopedLogHash, SerializableContractInstance, TreeLeafReadRequest, } from '@aztec/circuits.js';
|
|
3
|
+
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
|
|
5
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
6
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
|
+
import { assert } from 'console';
|
|
8
|
+
import { createSimulationError } from '../common/errors.js';
|
|
8
9
|
import { SideEffectLimitReachedError } from './side_effect_errors.js';
|
|
10
|
+
const emptyPublicDataPath = () => new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero());
|
|
11
|
+
const emptyNoteHashPath = () => new Array(NOTE_HASH_TREE_HEIGHT).fill(Fr.zero());
|
|
12
|
+
const emptyNullifierPath = () => new Array(NULLIFIER_TREE_HEIGHT).fill(Fr.zero());
|
|
13
|
+
const emptyL1ToL2MessagePath = () => new Array(L1_TO_L2_MSG_TREE_HEIGHT).fill(Fr.zero());
|
|
14
|
+
export class SideEffectArrayLengths {
|
|
15
|
+
constructor(publicDataReads, publicDataWrites, noteHashReadRequests, noteHashes, nullifierReadRequests, nullifierNonExistentReadRequests, nullifiers, l1ToL2MsgReadRequests, l2ToL1Msgs, unencryptedLogs) {
|
|
16
|
+
this.publicDataReads = publicDataReads;
|
|
17
|
+
this.publicDataWrites = publicDataWrites;
|
|
18
|
+
this.noteHashReadRequests = noteHashReadRequests;
|
|
19
|
+
this.noteHashes = noteHashes;
|
|
20
|
+
this.nullifierReadRequests = nullifierReadRequests;
|
|
21
|
+
this.nullifierNonExistentReadRequests = nullifierNonExistentReadRequests;
|
|
22
|
+
this.nullifiers = nullifiers;
|
|
23
|
+
this.l1ToL2MsgReadRequests = l1ToL2MsgReadRequests;
|
|
24
|
+
this.l2ToL1Msgs = l2ToL1Msgs;
|
|
25
|
+
this.unencryptedLogs = unencryptedLogs;
|
|
26
|
+
}
|
|
27
|
+
static empty() {
|
|
28
|
+
return new this(0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
9
31
|
/**
|
|
10
32
|
* Trace side effects for an entire enqueued call.
|
|
11
33
|
*/
|
|
@@ -16,30 +38,52 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
16
38
|
/** Track parent's (or previous kernel's) lengths so the AVM can properly enforce TX-wide limits,
|
|
17
39
|
* otherwise the public kernel can fail to prove because TX limits are breached.
|
|
18
40
|
*/
|
|
19
|
-
|
|
41
|
+
previousSideEffectArrayLengths = SideEffectArrayLengths.empty()) {
|
|
20
42
|
this.startSideEffectCounter = startSideEffectCounter;
|
|
21
|
-
this.
|
|
22
|
-
this.previousAccumulatedDataArrayLengths = previousAccumulatedDataArrayLengths;
|
|
43
|
+
this.previousSideEffectArrayLengths = previousSideEffectArrayLengths;
|
|
23
44
|
this.log = createDebugLogger('aztec:public_enqueued_call_side_effect_trace');
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
this.
|
|
27
|
-
this.contractStorageUpdateRequests = [];
|
|
45
|
+
this.enqueuedCalls = [];
|
|
46
|
+
this.publicDataReads = [];
|
|
47
|
+
this.publicDataWrites = [];
|
|
28
48
|
this.noteHashReadRequests = [];
|
|
29
49
|
this.noteHashes = [];
|
|
30
50
|
this.nullifierReadRequests = [];
|
|
31
51
|
this.nullifierNonExistentReadRequests = [];
|
|
32
52
|
this.nullifiers = [];
|
|
33
53
|
this.l1ToL2MsgReadRequests = [];
|
|
34
|
-
this.
|
|
54
|
+
this.l2ToL1Messages = [];
|
|
35
55
|
this.unencryptedLogs = [];
|
|
36
56
|
this.unencryptedLogsHashes = [];
|
|
57
|
+
/** Make sure a forked trace is never merged twice. */
|
|
58
|
+
this.alreadyMergedIntoParent = false;
|
|
59
|
+
this.log.debug(`Creating trace instance with startSideEffectCounter: ${startSideEffectCounter}`);
|
|
37
60
|
this.sideEffectCounter = startSideEffectCounter;
|
|
38
61
|
this.avmCircuitHints = AvmExecutionHints.empty();
|
|
39
62
|
}
|
|
40
63
|
fork() {
|
|
41
|
-
return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new
|
|
42
|
-
this.nullifierNonExistentReadRequests.length, this.
|
|
64
|
+
return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new SideEffectArrayLengths(this.previousSideEffectArrayLengths.publicDataReads + this.publicDataReads.length, this.previousSideEffectArrayLengths.publicDataWrites + this.publicDataWrites.length, this.previousSideEffectArrayLengths.noteHashReadRequests + this.noteHashReadRequests.length, this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length, this.previousSideEffectArrayLengths.nullifierReadRequests + this.nullifierReadRequests.length, this.previousSideEffectArrayLengths.nullifierNonExistentReadRequests +
|
|
65
|
+
this.nullifierNonExistentReadRequests.length, this.previousSideEffectArrayLengths.nullifiers + this.nullifiers.length, this.previousSideEffectArrayLengths.l1ToL2MsgReadRequests + this.l1ToL2MsgReadRequests.length, this.previousSideEffectArrayLengths.l2ToL1Msgs + this.l2ToL1Messages.length, this.previousSideEffectArrayLengths.unencryptedLogs + this.unencryptedLogs.length));
|
|
66
|
+
}
|
|
67
|
+
merge(forkedTrace, reverted = false) {
|
|
68
|
+
// sanity check to avoid merging the same forked trace twice
|
|
69
|
+
assert(!this.alreadyMergedIntoParent, 'Cannot merge a forked trace that has already been merged into its parent!');
|
|
70
|
+
forkedTrace.alreadyMergedIntoParent = true;
|
|
71
|
+
// TODO(dbanks12): accept & merge forked trace's hints!
|
|
72
|
+
this.sideEffectCounter = forkedTrace.sideEffectCounter;
|
|
73
|
+
this.enqueuedCalls.push(...forkedTrace.enqueuedCalls);
|
|
74
|
+
if (!reverted) {
|
|
75
|
+
this.publicDataReads.push(...forkedTrace.publicDataReads);
|
|
76
|
+
this.publicDataWrites.push(...forkedTrace.publicDataWrites);
|
|
77
|
+
this.noteHashReadRequests.push(...forkedTrace.noteHashReadRequests);
|
|
78
|
+
this.noteHashes.push(...forkedTrace.noteHashes);
|
|
79
|
+
this.nullifierReadRequests.push(...forkedTrace.nullifierReadRequests);
|
|
80
|
+
this.nullifierNonExistentReadRequests.push(...forkedTrace.nullifierNonExistentReadRequests);
|
|
81
|
+
this.nullifiers.push(...forkedTrace.nullifiers);
|
|
82
|
+
this.l1ToL2MsgReadRequests.push(...forkedTrace.l1ToL2MsgReadRequests);
|
|
83
|
+
this.l2ToL1Messages.push(...forkedTrace.l2ToL1Messages);
|
|
84
|
+
this.unencryptedLogs.push(...forkedTrace.unencryptedLogs);
|
|
85
|
+
this.unencryptedLogsHashes.push(...forkedTrace.unencryptedLogsHashes);
|
|
86
|
+
}
|
|
43
87
|
}
|
|
44
88
|
getCounter() {
|
|
45
89
|
return this.sideEffectCounter;
|
|
@@ -47,49 +91,72 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
47
91
|
incrementSideEffectCounter() {
|
|
48
92
|
this.sideEffectCounter++;
|
|
49
93
|
}
|
|
50
|
-
tracePublicStorageRead(contractAddress, slot, value,
|
|
94
|
+
tracePublicStorageRead(contractAddress, slot, value, leafPreimage = PublicDataTreeLeafPreimage.empty(), leafIndex = Fr.zero(), path = emptyPublicDataPath()) {
|
|
95
|
+
if (!leafIndex.equals(Fr.zero())) {
|
|
96
|
+
// if we have real merkle hint content, make sure the value matches the the provided preimage
|
|
97
|
+
assert(leafPreimage.value.equals(value), 'Value mismatch when tracing in public data write');
|
|
98
|
+
}
|
|
51
99
|
// NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
|
|
52
|
-
if (this.
|
|
100
|
+
if (this.publicDataReads.length + this.previousSideEffectArrayLengths.publicDataReads >=
|
|
53
101
|
MAX_PUBLIC_DATA_READS_PER_TX) {
|
|
54
|
-
throw new SideEffectLimitReachedError('contract storage read', MAX_PUBLIC_DATA_READS_PER_TX);
|
|
102
|
+
throw new SideEffectLimitReachedError('public data (contract storage) read', MAX_PUBLIC_DATA_READS_PER_TX);
|
|
55
103
|
}
|
|
56
|
-
|
|
104
|
+
const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
105
|
+
this.publicDataReads.push(new PublicDataRead(leafSlot, value, this.sideEffectCounter));
|
|
57
106
|
this.avmCircuitHints.storageValues.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value));
|
|
107
|
+
this.avmCircuitHints.storageReadRequest.items.push(new AvmPublicDataReadTreeHint(leafPreimage, leafIndex, path));
|
|
58
108
|
this.log.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
59
109
|
this.incrementSideEffectCounter();
|
|
60
110
|
}
|
|
61
|
-
tracePublicStorageWrite(contractAddress, slot, value) {
|
|
62
|
-
if (
|
|
111
|
+
tracePublicStorageWrite(contractAddress, slot, value, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
|
|
112
|
+
if (!lowLeafIndex.equals(Fr.zero())) {
|
|
113
|
+
// if we have real merkle hint content, make sure the value matches the the provided preimage
|
|
114
|
+
assert(newLeafPreimage.value.equals(value), 'Value mismatch when tracing in public data read');
|
|
115
|
+
}
|
|
116
|
+
if (this.publicDataWrites.length + this.previousSideEffectArrayLengths.publicDataWrites >=
|
|
63
117
|
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
64
|
-
throw new SideEffectLimitReachedError('contract storage write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
118
|
+
throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
65
119
|
}
|
|
66
|
-
|
|
67
|
-
this.
|
|
120
|
+
const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
121
|
+
this.publicDataWrites.push(new PublicDataUpdateRequest(leafSlot, value, this.sideEffectCounter));
|
|
122
|
+
// New hinting
|
|
123
|
+
const readHint = new AvmPublicDataReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
|
|
124
|
+
this.avmCircuitHints.storageUpdateRequest.items.push(new AvmPublicDataWriteTreeHint(readHint, newLeafPreimage, insertionPath));
|
|
125
|
+
this.log.debug(`Traced public data write (address=${contractAddress}, slot=${slot}, leafSlot=${leafSlot}): value=${value} (counter=${this.sideEffectCounter})`);
|
|
68
126
|
this.incrementSideEffectCounter();
|
|
69
127
|
}
|
|
70
128
|
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
71
|
-
traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists) {
|
|
129
|
+
traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists, path = emptyNoteHashPath()) {
|
|
72
130
|
// NOTE: contractAddress is unused because noteHash is an already-siloed leaf
|
|
73
|
-
if (this.noteHashReadRequests.length + this.
|
|
131
|
+
if (this.noteHashReadRequests.length + this.previousSideEffectArrayLengths.noteHashReadRequests >=
|
|
74
132
|
MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
|
|
75
133
|
throw new SideEffectLimitReachedError('note hash read request', MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
76
134
|
}
|
|
135
|
+
// note hash is already siloed here
|
|
77
136
|
this.noteHashReadRequests.push(new TreeLeafReadRequest(noteHash, leafIndex));
|
|
78
137
|
this.avmCircuitHints.noteHashExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(leafIndex), /*value=*/ exists ? Fr.ONE : Fr.ZERO));
|
|
138
|
+
// New Hinting
|
|
139
|
+
this.avmCircuitHints.noteHashReadRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
79
140
|
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
80
141
|
}
|
|
81
|
-
traceNewNoteHash(contractAddress, noteHash) {
|
|
82
|
-
if (this.noteHashes.length + this.
|
|
142
|
+
traceNewNoteHash(contractAddress, noteHash, leafIndex, path = emptyNoteHashPath()) {
|
|
143
|
+
if (this.noteHashes.length + this.previousSideEffectArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
83
144
|
throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
|
|
84
145
|
}
|
|
85
|
-
|
|
146
|
+
// TODO(dbanks12): make unique and silo instead of scoping
|
|
147
|
+
//const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
|
|
148
|
+
this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(contractAddress));
|
|
86
149
|
this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
|
|
150
|
+
this.avmCircuitHints.noteHashWriteRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
87
151
|
this.incrementSideEffectCounter();
|
|
88
152
|
}
|
|
89
|
-
traceNullifierCheck(contractAddress, nullifier,
|
|
153
|
+
traceNullifierCheck(contractAddress, nullifier, exists, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
|
|
90
154
|
// NOTE: isPending and leafIndex are unused for now but may be used for optimizations or kernel hints later
|
|
91
155
|
this.enforceLimitOnNullifierChecks();
|
|
92
|
-
|
|
156
|
+
// TODO(dbanks12): use siloed nullifier instead of scoped once public kernel stops siloing
|
|
157
|
+
// and once VM public inputs are meant to contain siloed nullifiers.
|
|
158
|
+
//const siloedNullifier = siloNullifier(contractAddress, nullifier);
|
|
159
|
+
const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(contractAddress);
|
|
93
160
|
if (exists) {
|
|
94
161
|
this.nullifierReadRequests.push(readRequest);
|
|
95
162
|
}
|
|
@@ -97,47 +164,55 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
97
164
|
this.nullifierNonExistentReadRequests.push(readRequest);
|
|
98
165
|
}
|
|
99
166
|
this.avmCircuitHints.nullifierExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)));
|
|
167
|
+
// New Hints
|
|
168
|
+
this.avmCircuitHints.nullifierReadRequest.items.push(new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath));
|
|
100
169
|
this.log.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
|
|
101
170
|
this.incrementSideEffectCounter();
|
|
102
171
|
}
|
|
103
|
-
traceNewNullifier(contractAddress, nullifier) {
|
|
104
|
-
if (this.nullifiers.length + this.
|
|
172
|
+
traceNewNullifier(contractAddress, nullifier, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath(), insertionPath = emptyNullifierPath()) {
|
|
173
|
+
if (this.nullifiers.length + this.previousSideEffectArrayLengths.nullifiers >= MAX_NULLIFIERS_PER_TX) {
|
|
105
174
|
throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
|
|
106
175
|
}
|
|
107
|
-
|
|
176
|
+
const siloedNullifier = siloNullifier(contractAddress, nullifier);
|
|
177
|
+
this.nullifiers.push(new Nullifier(siloedNullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO));
|
|
178
|
+
// New hinting
|
|
179
|
+
const lowLeafReadHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
|
|
180
|
+
this.avmCircuitHints.nullifierWriteHints.items.push(new AvmNullifierWriteTreeHint(lowLeafReadHint, insertionPath));
|
|
108
181
|
this.log.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
|
|
109
182
|
this.incrementSideEffectCounter();
|
|
110
183
|
}
|
|
111
184
|
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
112
|
-
traceL1ToL2MessageCheck(_contractAddress, msgHash, msgLeafIndex, exists) {
|
|
185
|
+
traceL1ToL2MessageCheck(_contractAddress, msgHash, msgLeafIndex, exists, path = emptyL1ToL2MessagePath()) {
|
|
113
186
|
// NOTE: contractAddress is unused because msgHash is an already-siloed leaf
|
|
114
|
-
if (this.l1ToL2MsgReadRequests.length + this.
|
|
187
|
+
if (this.l1ToL2MsgReadRequests.length + this.previousSideEffectArrayLengths.l1ToL2MsgReadRequests >=
|
|
115
188
|
MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX) {
|
|
116
189
|
throw new SideEffectLimitReachedError('l1 to l2 message read request', MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX);
|
|
117
190
|
}
|
|
118
191
|
this.l1ToL2MsgReadRequests.push(new TreeLeafReadRequest(msgHash, msgLeafIndex));
|
|
119
192
|
this.avmCircuitHints.l1ToL2MessageExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(msgLeafIndex), /*value=*/ exists ? Fr.ONE : Fr.ZERO));
|
|
193
|
+
// New Hinting
|
|
194
|
+
this.avmCircuitHints.l1ToL2MessageReadRequest.items.push(new AvmAppendTreeHint(msgLeafIndex, msgHash, path));
|
|
120
195
|
}
|
|
121
196
|
traceNewL2ToL1Message(contractAddress, recipient, content) {
|
|
122
|
-
if (this.
|
|
197
|
+
if (this.l2ToL1Messages.length + this.previousSideEffectArrayLengths.l2ToL1Msgs >= MAX_L2_TO_L1_MSGS_PER_TX) {
|
|
123
198
|
throw new SideEffectLimitReachedError('l2 to l1 message', MAX_L2_TO_L1_MSGS_PER_TX);
|
|
124
199
|
}
|
|
125
200
|
const recipientAddress = EthAddress.fromField(recipient);
|
|
126
|
-
this.
|
|
201
|
+
this.l2ToL1Messages.push(new L2ToL1Message(recipientAddress, content, this.sideEffectCounter).scope(contractAddress));
|
|
127
202
|
this.log.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
|
|
128
203
|
this.incrementSideEffectCounter();
|
|
129
204
|
}
|
|
130
205
|
traceUnencryptedLog(contractAddress, log) {
|
|
131
|
-
if (this.unencryptedLogs.length + this.
|
|
206
|
+
if (this.unencryptedLogs.length + this.previousSideEffectArrayLengths.unencryptedLogs >=
|
|
132
207
|
MAX_UNENCRYPTED_LOGS_PER_TX) {
|
|
133
208
|
throw new SideEffectLimitReachedError('unencrypted log', MAX_UNENCRYPTED_LOGS_PER_TX);
|
|
134
209
|
}
|
|
135
|
-
const ulog = new UnencryptedL2Log(
|
|
210
|
+
const ulog = new UnencryptedL2Log(contractAddress, Buffer.concat(log.map(f => f.toBuffer())));
|
|
136
211
|
const basicLogHash = Fr.fromBuffer(ulog.hash());
|
|
137
212
|
this.unencryptedLogs.push(ulog);
|
|
138
213
|
// This length is for charging DA and is checked on-chain - has to be length of log preimage + 4 bytes.
|
|
139
214
|
// The .length call also has a +4 but that is unrelated
|
|
140
|
-
this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)).scope(
|
|
215
|
+
this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)).scope(contractAddress));
|
|
141
216
|
this.log.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
|
|
142
217
|
this.incrementSideEffectCounter();
|
|
143
218
|
}
|
|
@@ -148,7 +223,7 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
148
223
|
this.incrementSideEffectCounter();
|
|
149
224
|
}
|
|
150
225
|
// This tracing function gets called everytime we start simulation/execution.
|
|
151
|
-
// This happens both when starting a new top-level trace and the start of every
|
|
226
|
+
// This happens both when starting a new top-level trace and the start of every forked trace
|
|
152
227
|
// We use this to collect the AvmContractBytecodeHints
|
|
153
228
|
traceGetBytecode(contractAddress, exists, bytecode = Buffer.alloc(0), contractInstance = SerializableContractInstance.default(), contractClass = {
|
|
154
229
|
artifactHash: Fr.zero(),
|
|
@@ -166,7 +241,7 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
166
241
|
*/
|
|
167
242
|
traceNestedCall(
|
|
168
243
|
/** The trace of the nested call. */
|
|
169
|
-
|
|
244
|
+
_nestedCallTrace,
|
|
170
245
|
/** The execution environment of the nested call. */
|
|
171
246
|
nestedEnvironment,
|
|
172
247
|
/** How much gas was available for this public execution. */
|
|
@@ -179,94 +254,119 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
179
254
|
avmCallResults,
|
|
180
255
|
/** Function name for logging */
|
|
181
256
|
_functionName = 'unknown') {
|
|
257
|
+
// TODO(4805): check if some threshold is reached for max nested calls (to unique contracts?)
|
|
258
|
+
//
|
|
182
259
|
// Store end side effect counter before it gets updated by absorbing nested call trace
|
|
183
260
|
const endSideEffectCounter = new Fr(this.sideEffectCounter);
|
|
184
|
-
// TODO(4805): check if some threshold is reached for max nested calls (to unique contracts?)
|
|
185
|
-
// TODO(dbanks12): should emit a nullifier read request. There should be two thresholds.
|
|
186
|
-
// one for max unique contract calls, and another based on max nullifier reads.
|
|
187
|
-
// Since this trace function happens _after_ a nested call, such threshold limits must take
|
|
188
|
-
// place in another trace function that occurs _before_ a nested call.
|
|
189
|
-
if (avmCallResults.reverted) {
|
|
190
|
-
this.absorbRevertedNestedTrace(nestedCallTrace);
|
|
191
|
-
}
|
|
192
|
-
else {
|
|
193
|
-
this.absorbSuccessfulNestedTrace(nestedCallTrace);
|
|
194
|
-
}
|
|
195
261
|
const gasUsed = new Gas(startGasLeft.daGas - endGasLeft.daGas, startGasLeft.l2Gas - endGasLeft.l2Gas);
|
|
196
262
|
this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
|
|
197
263
|
/*success=*/ new Fr(avmCallResults.reverted ? 0 : 1), avmCallResults.output, gasUsed, endSideEffectCounter, nestedEnvironment.address));
|
|
198
264
|
}
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
this.
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
// All read requests, and any writes (storage & nullifiers) that
|
|
215
|
-
// require complex validation in public kernel (with end lifetimes)
|
|
216
|
-
// must be absorbed even on revert.
|
|
217
|
-
// TODO(dbanks12): What should happen to side effect counter on revert?
|
|
218
|
-
this.sideEffectCounter = nestedTrace.sideEffectCounter;
|
|
219
|
-
this.contractStorageReads.push(...nestedTrace.contractStorageReads);
|
|
220
|
-
this.contractStorageUpdateRequests.push(...nestedTrace.contractStorageUpdateRequests);
|
|
221
|
-
this.noteHashReadRequests.push(...nestedTrace.noteHashReadRequests);
|
|
222
|
-
// new noteHashes are tossed on revert
|
|
223
|
-
this.nullifierReadRequests.push(...nestedTrace.nullifierReadRequests);
|
|
224
|
-
this.nullifierNonExistentReadRequests.push(...nestedTrace.nullifierNonExistentReadRequests);
|
|
225
|
-
this.nullifiers.push(...nestedTrace.nullifiers);
|
|
226
|
-
this.l1ToL2MsgReadRequests.push(...nestedTrace.l1ToL2MsgReadRequests);
|
|
227
|
-
// new l2-to-l1 messages are tossed on revert
|
|
228
|
-
// new unencrypted logs are tossed on revert
|
|
265
|
+
/**
|
|
266
|
+
* Trace an enqueued call.
|
|
267
|
+
* Accept some results from a finished call's trace into this one.
|
|
268
|
+
*/
|
|
269
|
+
traceEnqueuedCall(
|
|
270
|
+
/** The call request from private that enqueued this call. */
|
|
271
|
+
publicCallRequest,
|
|
272
|
+
/** The call's calldata */
|
|
273
|
+
calldata,
|
|
274
|
+
/** Did the call revert? */
|
|
275
|
+
_reverted) {
|
|
276
|
+
this.log.debug(`Tracing enqueued call`);
|
|
277
|
+
// TODO(4805): check if some threshold is reached for max enqueued or nested calls (to unique contracts?)
|
|
278
|
+
this.enqueuedCalls.push(publicCallRequest);
|
|
279
|
+
this.avmCircuitHints.enqueuedCalls.items.push(new AvmEnqueuedCallHint(publicCallRequest.contractAddress, calldata));
|
|
229
280
|
}
|
|
230
281
|
getSideEffects() {
|
|
231
282
|
return {
|
|
232
|
-
|
|
233
|
-
|
|
283
|
+
enqueuedCalls: this.enqueuedCalls,
|
|
284
|
+
publicDataReads: this.publicDataReads,
|
|
285
|
+
publicDataWrites: this.publicDataWrites,
|
|
234
286
|
noteHashReadRequests: this.noteHashReadRequests,
|
|
235
287
|
noteHashes: this.noteHashes,
|
|
236
288
|
nullifierReadRequests: this.nullifierReadRequests,
|
|
237
289
|
nullifierNonExistentReadRequests: this.nullifierNonExistentReadRequests,
|
|
238
290
|
nullifiers: this.nullifiers,
|
|
239
291
|
l1ToL2MsgReadRequests: this.l1ToL2MsgReadRequests,
|
|
240
|
-
l2ToL1Msgs: this.
|
|
292
|
+
l2ToL1Msgs: this.l2ToL1Messages,
|
|
241
293
|
unencryptedLogs: this.unencryptedLogs,
|
|
242
294
|
unencryptedLogsHashes: this.unencryptedLogsHashes,
|
|
243
295
|
};
|
|
244
296
|
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
avmEnvironment,
|
|
250
|
-
/** How much gas was available for this public execution. */
|
|
251
|
-
startGasLeft,
|
|
297
|
+
/**
|
|
298
|
+
* Get the results of public execution.
|
|
299
|
+
*/
|
|
300
|
+
toPublicEnqueuedCallExecutionResult(
|
|
252
301
|
/** How much gas was left after this public execution. */
|
|
253
302
|
endGasLeft,
|
|
254
303
|
/** The call's results */
|
|
255
304
|
avmCallResults) {
|
|
256
|
-
return
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
305
|
+
return {
|
|
306
|
+
endGasLeft,
|
|
307
|
+
endSideEffectCounter: new Fr(this.sideEffectCounter),
|
|
308
|
+
returnValues: avmCallResults.output,
|
|
309
|
+
reverted: avmCallResults.reverted,
|
|
310
|
+
revertReason: avmCallResults.revertReason
|
|
311
|
+
? createSimulationError(avmCallResults.revertReason, avmCallResults.output)
|
|
312
|
+
: undefined,
|
|
313
|
+
sideEffects: {
|
|
314
|
+
publicDataWrites: this.publicDataWrites,
|
|
315
|
+
noteHashes: this.noteHashes,
|
|
316
|
+
nullifiers: this.nullifiers,
|
|
317
|
+
l2ToL1Messages: this.l2ToL1Messages,
|
|
318
|
+
unencryptedLogsHashes: this.unencryptedLogsHashes, // Scoped?
|
|
319
|
+
unencryptedLogs: new UnencryptedFunctionL2Logs(this.unencryptedLogs),
|
|
320
|
+
},
|
|
321
|
+
};
|
|
322
|
+
}
|
|
323
|
+
toAvmCircuitPublicInputs(
|
|
324
|
+
/** Globals. */
|
|
325
|
+
globalVariables,
|
|
326
|
+
/** Start tree snapshots. */
|
|
327
|
+
startTreeSnapshots,
|
|
328
|
+
/** Gas used at start of TX. */
|
|
329
|
+
startGasUsed,
|
|
330
|
+
/** How much gas was available for this public execution. */
|
|
331
|
+
gasLimits,
|
|
332
|
+
/** Call requests for setup phase. */
|
|
333
|
+
publicSetupCallRequests,
|
|
334
|
+
/** Call requests for app logic phase. */
|
|
335
|
+
publicAppLogicCallRequests,
|
|
336
|
+
/** Call request for teardown phase. */
|
|
337
|
+
publicTeardownCallRequest,
|
|
338
|
+
/** End tree snapshots. */
|
|
339
|
+
endTreeSnapshots,
|
|
340
|
+
/**
|
|
341
|
+
* Gas used by the whole transaction, assuming entire teardown limit is used.
|
|
342
|
+
* This is the gas used when computing transaction fee.
|
|
343
|
+
*/
|
|
344
|
+
endGasUsed,
|
|
345
|
+
/** Transaction fee. */
|
|
346
|
+
transactionFee,
|
|
347
|
+
/** The call's results */
|
|
348
|
+
reverted) {
|
|
349
|
+
return new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasLimits, padArrayEnd(publicSetupCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), padArrayEnd(publicAppLogicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest,
|
|
350
|
+
/*previousNonRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
|
|
351
|
+
/*previousRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
|
|
352
|
+
/*previousNonRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(),
|
|
353
|
+
/*previousRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(), endTreeSnapshots, endGasUsed,
|
|
354
|
+
/*accumulatedData=*/ this.getAvmAccumulatedData(), transactionFee, reverted);
|
|
355
|
+
}
|
|
356
|
+
toPublicFunctionCallResult(
|
|
357
|
+
/** The execution environment of the nested call. */
|
|
358
|
+
_avmEnvironment,
|
|
359
|
+
/** How much gas was available for this public execution. */
|
|
360
|
+
_startGasLeft,
|
|
361
|
+
/** How much gas was left after this public execution. */
|
|
362
|
+
_endGasLeft,
|
|
363
|
+
/** Bytecode used for this execution. */
|
|
364
|
+
_bytecode,
|
|
365
|
+
/** The call's results */
|
|
366
|
+
_avmCallResults,
|
|
367
|
+
/** Function name for logging */
|
|
368
|
+
_functionName = 'unknown') {
|
|
369
|
+
throw new Error('Not implemented');
|
|
270
370
|
}
|
|
271
371
|
getUnencryptedLogs() {
|
|
272
372
|
return this.unencryptedLogs;
|
|
@@ -274,22 +374,8 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
274
374
|
getAvmCircuitHints() {
|
|
275
375
|
return this.avmCircuitHints;
|
|
276
376
|
}
|
|
277
|
-
|
|
278
|
-
return new
|
|
279
|
-
padArrayEnd(this.noteHashReadRequests, TreeLeafReadRequest.empty(), MAX_NOTE_HASH_READ_REQUESTS_PER_TX), padArrayEnd(this.nullifierReadRequests, ScopedReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_TX), padArrayEnd(this.nullifierNonExistentReadRequests, ScopedReadRequest.empty(), MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX), padArrayEnd(this.l1ToL2MsgReadRequests, TreeLeafReadRequest.empty(), MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX),
|
|
280
|
-
// TODO(dbanks12): this is only necessary until VMCircuitPublicInputs uses unsiloed storage slots and pairs storage accesses with contract address
|
|
281
|
-
padArrayEnd(this.contractStorageReads.map(r => new PublicDataRead(r.storageSlot, r.currentValue, r.counter)), PublicDataRead.empty(), MAX_PUBLIC_DATA_READS_PER_TX));
|
|
282
|
-
}
|
|
283
|
-
getAccumulatedData(gasUsed) {
|
|
284
|
-
return new PublicAccumulatedData(padArrayEnd(this.noteHashes, ScopedNoteHash.empty(), MAX_NOTE_HASHES_PER_TX),
|
|
285
|
-
// TODO(dbanks12): should be able to use ScopedNullifier here
|
|
286
|
-
padArrayEnd(this.nullifiers.map(n => new Nullifier(n.nullifier.value, n.nullifier.counter, n.nullifier.noteHash)), Nullifier.empty(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Msgs, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX),
|
|
287
|
-
/*noteEncryptedLogsHashes=*/ makeTuple(MAX_NOTE_ENCRYPTED_LOGS_PER_TX, LogHash.empty),
|
|
288
|
-
/*encryptedLogsHashes=*/ makeTuple(MAX_ENCRYPTED_LOGS_PER_TX, ScopedLogHash.empty), padArrayEnd(this.unencryptedLogsHashes, ScopedLogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_TX),
|
|
289
|
-
// TODO(dbanks12): this is only necessary until VMCircuitPublicInputs uses unsiloed storage slots and pairs storage accesses with contract address
|
|
290
|
-
padArrayEnd(this.contractStorageUpdateRequests.map(w => new PublicDataUpdateRequest(w.storageSlot, w.newValue, w.counter)), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
|
|
291
|
-
/*publicCallStack=*/ makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicCallRequest.empty),
|
|
292
|
-
/*gasUsed=*/ gasUsed);
|
|
377
|
+
getAvmAccumulatedData() {
|
|
378
|
+
return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n => n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map(n => n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.unencryptedLogsHashes, ScopedLogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map(w => new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
|
|
293
379
|
}
|
|
294
380
|
enforceLimitOnNullifierChecks(errorMsgOrigin = '') {
|
|
295
381
|
// NOTE: Why error if _either_ limit was reached? If user code emits either an existent or non-existent
|
|
@@ -298,27 +384,15 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
298
384
|
// sequencer from lying and saying "this nullifier exists, but MAX_NULLIFIER_RRS has been reached, so I'm
|
|
299
385
|
// going to skip the read request and just revert instead" when the nullifier actually doesn't exist
|
|
300
386
|
// (or vice versa). So, if either maximum has been reached, any nullifier-reading operation must error.
|
|
301
|
-
if (this.nullifierReadRequests.length + this.
|
|
387
|
+
if (this.nullifierReadRequests.length + this.previousSideEffectArrayLengths.nullifierReadRequests >=
|
|
302
388
|
MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
|
|
303
389
|
throw new SideEffectLimitReachedError(`nullifier read request ${errorMsgOrigin}`, MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
304
390
|
}
|
|
305
391
|
if (this.nullifierNonExistentReadRequests.length +
|
|
306
|
-
this.
|
|
392
|
+
this.previousSideEffectArrayLengths.nullifierNonExistentReadRequests >=
|
|
307
393
|
MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX) {
|
|
308
394
|
throw new SideEffectLimitReachedError(`nullifier non-existent read request ${errorMsgOrigin}`, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX);
|
|
309
395
|
}
|
|
310
396
|
}
|
|
311
397
|
}
|
|
312
|
-
/**
|
|
313
|
-
* Helper function to create a public execution request from an AVM execution environment
|
|
314
|
-
*/
|
|
315
|
-
function createPublicCallRequest(avmEnvironment) {
|
|
316
|
-
const callContext = CallContext.from({
|
|
317
|
-
msgSender: avmEnvironment.sender,
|
|
318
|
-
contractAddress: avmEnvironment.address,
|
|
319
|
-
functionSelector: avmEnvironment.functionSelector,
|
|
320
|
-
isStaticCall: avmEnvironment.isStaticCall,
|
|
321
|
-
});
|
|
322
|
-
return new PublicCallRequest(callContext, computeVarArgsHash(avmEnvironment.calldata), /*counter=*/ 0);
|
|
323
|
-
}
|
|
324
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,WAAW,EAGX,mBAAmB,EACnB,4BAA4B,EAC5B,UAAU,EACV,GAAG,EACH,aAAa,EACb,OAAO,EACP,yBAAyB,EACzB,qCAAqC,EACrC,wBAAwB,EACxB,8BAA8B,EAC9B,sBAAsB,EACtB,kCAAkC,EAClC,qBAAqB,EACrB,+CAA+C,EAC/C,kCAAkC,EAClC,mCAAmC,EACnC,4BAA4B,EAC5B,sCAAsC,EACtC,2BAA2B,EAC3B,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,iCAAiC,EACjC,iBAAiB,EACjB,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACtB,mCAAmC,EACnC,wBAAwB,EACxB,WAAW,EACX,wBAAwB,EACxB,mBAAmB,EACnB,aAAa,EACb,cAAc,EAEd,iBAAiB,EACjB,4BAA4B,EAC5B,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AA0BtE;;GAEG;AACH,MAAM,OAAO,iCAAiC;IA0B5C;IACE,qDAAqD;IACrC,yBAAiC,CAAC;IAClD;;OAEG;IACc,wCAA6E,mCAAmC,CAAC,KAAK,EAAE,EACxH,sCAAyE,iCAAiC,CAAC,KAAK,EAAE;QALnH,2BAAsB,GAAtB,sBAAsB,CAAY;QAIjC,0CAAqC,GAArC,qCAAqC,CAAmF;QACxH,wCAAmC,GAAnC,mCAAmC,CAA+E;QAhC9H,QAAG,GAAG,iBAAiB,CAAC,8CAA8C,CAAC,CAAC;QAK/E,+EAA+E;QAC/E,2EAA2E;QACnE,yBAAoB,GAA0B,EAAE,CAAC;QACjD,kCAA6B,GAAmC,EAAE,CAAC;QAEnE,yBAAoB,GAA0B,EAAE,CAAC;QACjD,eAAU,GAAqB,EAAE,CAAC;QAElC,0BAAqB,GAAwB,EAAE,CAAC;QAChD,qCAAgC,GAAwB,EAAE,CAAC;QAC3D,eAAU,GAAsB,EAAE,CAAC;QAEnC,0BAAqB,GAA0B,EAAE,CAAC;QAClD,eAAU,GAA0B,EAAE,CAAC;QAEvC,oBAAe,GAAuB,EAAE,CAAC;QACzC,0BAAqB,GAAoB,EAAE,CAAC;QAalD,IAAI,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;QAChD,IAAI,CAAC,eAAe,GAAG,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACnD,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,iCAAiC,CAC1C,IAAI,CAAC,iBAAiB,EACtB,IAAI,mCAAmC,CACrC,IAAI,CAAC,qCAAqC,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAClG,IAAI,CAAC,qCAAqC,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EACpG,IAAI,CAAC,qCAAqC,CAAC,gCAAgC;YACzE,IAAI,CAAC,gCAAgC,CAAC,MAAM,EAC9C,IAAI,CAAC,qCAAqC,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EACpG,IAAI,CAAC,qCAAqC,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAC9F,EACD,IAAI,iCAAiC,CACnC,IAAI,CAAC,mCAAmC,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAC5E,IAAI,CAAC,mCAAmC,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAC5E,IAAI,CAAC,mCAAmC,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAC5E,IAAI,CAAC,mCAAmC,CAAC,uBAAuB,EAChE,IAAI,CAAC,mCAAmC,CAAC,mBAAmB,EAC5D,IAAI,CAAC,mCAAmC,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAClG,IAAI,CAAC,mCAAmC,CAAC,wBAAwB,GAAG,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAC7G,IAAI,CAAC,mCAAmC,CAAC,eAAe,CACzD,CACF,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEO,0BAA0B;QAChC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEM,sBAAsB,CAAC,eAAmB,EAAE,IAAQ,EAAE,KAAS,EAAE,OAAgB,EAAE,OAAgB;QACxG,qGAAqG;QACrG,IACE,IAAI,CAAC,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,qCAAqC,CAAC,eAAe;YAC7F,4BAA4B,EAC5B,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,uBAAuB,EAAE,4BAA4B,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAC5B,IAAI,mBAAmB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CACtG,CAAC;QACF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAC3C,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAC/E,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,iBAAiB,SAAS,KAAK,UAAU,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,uBAAuB,CAAC,eAAmB,EAAE,IAAQ,EAAE,KAAS;QACrE,IACE,IAAI,CAAC,6BAA6B,CAAC,MAAM,GAAG,IAAI,CAAC,mCAAmC,CAAC,wBAAwB;YAC7G,sCAAsC,EACtC,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,wBAAwB,EAAE,sCAAsC,CAAC,CAAC;QAC1G,CAAC;QAED,IAAI,CAAC,6BAA6B,CAAC,IAAI,CACrC,IAAI,4BAA4B,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CACvF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,iBAAiB,SAAS,KAAK,UAAU,IAAI,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,kBAAkB,CAAC,gBAAoB,EAAE,QAAY,EAAE,SAAa,EAAE,MAAe;QAC1F,6EAA6E;QAC7E,IACE,IAAI,CAAC,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,qCAAqC,CAAC,oBAAoB;YAClG,kCAAkC,EAClC,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,wBAAwB,EAAE,kCAAkC,CAAC,CAAC;QACtG,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAC5C,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CACtF,CAAC;QACF,yGAAyG;IAC3G,CAAC;IAEM,gBAAgB,CAAC,eAAmB,EAAE,QAAY;QACvD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,mCAAmC,CAAC,UAAU,IAAI,sBAAsB,EAAE,CAAC;YAC3G,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACpH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,mBAAmB,CAAC,eAAmB,EAAE,SAAa,EAAE,UAAc,EAAE,MAAe,EAAE,UAAmB;QACjH,2GAA2G;QAC3G,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAErC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAC1E,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CACxC,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAC7C,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAChG,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,iBAAiB,CAAC,eAAmB,EAAE,SAAa;QACzD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,mCAAmC,CAAC,UAAU,IAAI,qBAAqB,EAAE,CAAC;YAC1G,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAClB,IAAI,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAC3E,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CACxC,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,uBAAuB,CAAC,gBAAoB,EAAE,OAAW,EAAE,YAAgB,EAAE,MAAe;QACjG,4EAA4E;QAC5E,IACE,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC,qCAAqC,CAAC,qBAAqB;YACpG,qCAAqC,EACrC,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,+BAA+B,EAAE,qCAAqC,CAAC,CAAC;QAChH,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CACjD,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CACzF,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAAC,eAAmB,EAAE,SAAa,EAAE,OAAW;QAC1E,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,mCAAmC,CAAC,UAAU,IAAI,wBAAwB,EAAE,CAAC;YAC7G,MAAM,IAAI,2BAA2B,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,IAAI,CAClB,IAAI,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CACxE,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CACxC,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,mBAAmB,CAAC,eAAmB,EAAE,GAAS;QACvD,IACE,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,mCAAmC,CAAC,qBAAqB;YAC5F,2BAA2B,EAC3B,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAC/B,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,EACvC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAC1C,CAAC;QACF,MAAM,YAAY,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,uGAAuG;QACvG,uDAAuD;QACvD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC7B,IAAI,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAC9E,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CACxC,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,wBAAwB,CAC7B,eAAmB,EACnB,MAAe,EACf,WAAyC,4BAA4B,CAAC,OAAO,EAAE;QAE/E,IAAI,CAAC,6BAA6B,CAAC,uDAAuD,CAAC,CAAC;QAE5F,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAC/C,IAAI,uBAAuB,CACzB,eAAe,EACf,MAAM,EACN,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,EACxB,QAAQ,CAAC,kBAAkB,EAC3B,QAAQ,CAAC,UAAU,CACpB,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,6EAA6E;IAC7E,4FAA4F;IAC5F,sDAAsD;IAC/C,gBAAgB,CACrB,eAAmB,EACnB,MAAe,EACf,WAAmB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,mBAAiD,4BAA4B,CAAC,OAAO,EAAE,EACvF,gBAAyC;QACvC,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,oBAAoB,EAAE,EAAE,CAAC,IAAI,EAAE;QAC/B,wBAAwB,EAAE,EAAE,CAAC,IAAI,EAAE;KACpC;QAED,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAC1C,eAAe,EACf,MAAM,EACN,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,QAAQ,EACzB,gBAAgB,CAAC,eAAe,EAChC,gBAAgB,CAAC,kBAAkB,EACnC,gBAAgB,CAAC,UAAU,CAC5B,CAAC;QACF,mEAAmE;QACnE,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CACnD,IAAI,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAChE,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4DAA4D,MAAM,cAAc,IAAI,CAAC,SAAS,CAC5F,gBAAgB,CACjB,EAAE,CACJ,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,eAAe;IACpB,oCAAoC;IACpC,eAAqB;IACrB,oDAAoD;IACpD,iBAA0C;IAC1C,4DAA4D;IAC5D,YAAiB;IACjB,yDAAyD;IACzD,UAAe;IACf,wCAAwC;IACxC,SAAiB;IACjB,yBAAyB;IACzB,cAAqC;IACrC,gCAAgC;IAChC,gBAAwB,SAAS;QAEjC,sFAAsF;QACtF,MAAM,oBAAoB,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE5D,6FAA6F;QAC7F,wFAAwF;QACxF,+EAA+E;QAC/E,2FAA2F;QAC3F,sEAAsE;QACtE,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAEtG,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAC3C,IAAI,mBAAmB;QACrB,YAAY,CAAC,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpD,cAAc,CAAC,MAAM,EACrB,OAAO,EACP,oBAAoB,EACpB,iBAAiB,CAAC,OAAO,CAC1B,CACF,CAAC;IACJ,CAAC;IAEM,2BAA2B,CAAC,WAAiB;QAClD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACpE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,6BAA6B,CAAC,CAAC;QACtF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAC5F,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAC1D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACxE,CAAC;IAEM,yBAAyB,CAAC,WAAiB;QAChD,gEAAgE;QAChE,mEAAmE;QACnE,mCAAmC;QAEnC,uEAAuE;QACvE,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACpE,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,6BAA6B,CAAC,CAAC;QACtF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACpE,sCAAsC;QACtC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAC5F,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACtE,6CAA6C;QAC7C,4CAA4C;IAC9C,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,6BAA6B,EAAE,IAAI,CAAC,6BAA6B;YACjE,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,gCAAgC,EAAE,IAAI,CAAC,gCAAgC;YACvE,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;SAClD,CAAC;IACJ,CAAC;IAEM,uBAAuB;IAC5B,iBAAiB;IACjB,SAA+B;IAC/B,oDAAoD;IACpD,cAAuC;IACvC,4DAA4D;IAC5D,YAAiB;IACjB,yDAAyD;IACzD,UAAe;IACf,yBAAyB;IACzB,cAAqC;QAErC,OAAO,IAAI,qBAAqB;QAC9B,cAAc,CAAC,SAAS;QACxB,gBAAgB,CAAC,uBAAuB,CAAC,cAAc,CAAC;QACxD,oBAAoB,CAAC,SAAS,CAAC,mCAAmC,EAAE,sBAAsB,CAAC,KAAK,CAAC;QACjG,0CAA0C,CAAC,IAAI,CAAC,qCAAqC;QACrF,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,EAAE;QACpD,wCAAwC,CAAC,IAAI,CAAC,mCAAmC;QACjF,oBAAoB,CAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1E,2BAA2B,CAAC,IAAI,CAAC,sBAAsB;QACvD,yBAAyB,CAAC,IAAI,CAAC,iBAAiB;QAChD,iBAAiB,CAAC,YAAY;QAC9B,yCAAyC;QACzC,mBAAmB,CAAC,cAAc,CAAC,cAAc;QACjD,aAAa,CAAC,cAAc,CAAC,QAAQ,CACtC,CAAC;IACJ,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,wBAAwB,CACjC,wBAAwB,CAAC,KAAK,EAAE,EAAE,uCAAuC;QACzE,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,kCAAkC,CAAC,EACvG,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,kCAAkC,CAAC,EACtG,WAAW,CACT,IAAI,CAAC,gCAAgC,EACrC,iBAAiB,CAAC,KAAK,EAAE,EACzB,+CAA+C,CAChD,EACD,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,qCAAqC,CAAC;QAC3G,kJAAkJ;QAClJ,WAAW,CACT,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAChG,cAAc,CAAC,KAAK,EAAE,EACtB,4BAA4B,CAC7B,CACF,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,OAAY;QACrC,OAAO,IAAI,qBAAqB,CAC9B,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,sBAAsB,CAAC;QAC5E,6DAA6D;QAC7D,WAAW,CACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EACrG,SAAS,CAAC,KAAK,EAAE,EACjB,qBAAqB,CACtB,EACD,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,wBAAwB,CAAC;QACnF,4BAA4B,CAAC,SAAS,CAAC,8BAA8B,EAAE,OAAO,CAAC,KAAK,CAAC;QACrF,wBAAwB,CAAC,SAAS,CAAC,yBAAyB,EAAE,aAAa,CAAC,KAAK,CAAC,EAClF,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,2BAA2B,CAAC;QAC3F,kJAAkJ;QAClJ,WAAW,CACT,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAC9G,uBAAuB,CAAC,KAAK,EAAE,EAC/B,sCAAsC,CACvC;QACD,oBAAoB,CAAC,SAAS,CAAC,mCAAmC,EAAE,iBAAiB,CAAC,KAAK,CAAC;QAC5F,YAAY,CAAC,OAAO,CACrB,CAAC;IACJ,CAAC;IAEO,6BAA6B,CAAC,iBAAyB,EAAE;QAC/D,uGAAuG;QACvG,uGAAuG;QACvG,wGAAwG;QACxG,yGAAyG;QACzG,oGAAoG;QACpG,uGAAuG;QACvG,IACE,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC,qCAAqC,CAAC,qBAAqB;YACpG,kCAAkC,EAClC,CAAC;YACD,MAAM,IAAI,2BAA2B,CACnC,0BAA0B,cAAc,EAAE,EAC1C,kCAAkC,CACnC,CAAC;QACJ,CAAC;QACD,IACE,IAAI,CAAC,gCAAgC,CAAC,MAAM;YAC1C,IAAI,CAAC,qCAAqC,CAAC,gCAAgC;YAC7E,+CAA+C,EAC/C,CAAC;YACD,MAAM,IAAI,2BAA2B,CACnC,uCAAuC,cAAc,EAAE,EACvD,+CAA+C,CAChD,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED;;GAEG;AACH,SAAS,uBAAuB,CAAC,cAAuC;IACtE,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;QACnC,SAAS,EAAE,cAAc,CAAC,MAAM;QAChC,eAAe,EAAE,cAAc,CAAC,OAAO;QACvC,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;QACjD,YAAY,EAAE,cAAc,CAAC,YAAY;KAC1C,CAAC,CAAC;IACH,OAAO,IAAI,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC"}
|
|
398
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
|