@aztec/simulator 0.43.0 → 0.45.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/oracle/oracle.d.ts +3 -1
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +12 -6
- package/dest/acvm/oracle/typed_oracle.d.ts +6 -4
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +8 -2
- package/dest/avm/avm_context.d.ts +1 -1
- package/dest/avm/avm_context.d.ts.map +1 -1
- package/dest/avm/avm_context.js +3 -3
- package/dest/avm/{avm_message_call_result.d.ts → avm_contract_call_result.d.ts} +2 -2
- package/dest/avm/avm_contract_call_result.d.ts.map +1 -0
- package/dest/avm/avm_contract_call_result.js +18 -0
- package/dest/avm/avm_execution_environment.d.ts +8 -10
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +15 -19
- package/dest/avm/avm_gas.js +2 -2
- package/dest/avm/avm_simulator.d.ts +4 -4
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +7 -8
- package/dest/avm/bytecode_utils.d.ts +5 -0
- package/dest/avm/bytecode_utils.d.ts.map +1 -0
- package/dest/avm/bytecode_utils.js +29 -0
- package/dest/avm/errors.js +2 -2
- package/dest/avm/fixtures/index.d.ts +10 -6
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +10 -17
- package/dest/avm/journal/journal.d.ts +56 -65
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +80 -117
- package/dest/avm/journal/nullifiers.d.ts +21 -8
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +26 -8
- package/dest/avm/journal/public_storage.d.ts +5 -1
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +11 -2
- package/dest/avm/opcodes/accrued_substate.d.ts +1 -2
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +8 -17
- package/dest/avm/opcodes/environment_getters.d.ts +13 -8
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +20 -13
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +11 -27
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +5 -5
- package/dest/avm/serialization/instruction_serialization.d.ts +9 -9
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +10 -10
- package/dest/avm/test_utils.d.ts +14 -0
- package/dest/avm/test_utils.d.ts.map +1 -0
- package/dest/avm/test_utils.js +36 -0
- package/dest/client/client_execution_context.d.ts +6 -4
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +8 -6
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +1 -1
- package/dest/client/execution_result.d.ts +2 -1
- package/dest/client/execution_result.d.ts.map +1 -1
- package/dest/client/execution_result.js +1 -1
- package/dest/client/index.d.ts +2 -0
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +3 -1
- package/dest/client/simulator.d.ts +3 -3
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +1 -1
- package/dest/client/view_data_oracle.d.ts +5 -1
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +12 -4
- package/dest/mocks/fixtures.d.ts +3 -3
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +6 -5
- package/dest/public/abstract_phase_manager.d.ts +1 -0
- package/dest/public/abstract_phase_manager.d.ts.map +1 -1
- package/dest/public/abstract_phase_manager.js +17 -14
- package/dest/public/app_logic_phase_manager.d.ts.map +1 -1
- package/dest/public/app_logic_phase_manager.js +2 -1
- package/dest/public/execution.d.ts +33 -30
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +2 -2
- package/dest/public/executor.d.ts +12 -7
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +42 -33
- package/dest/public/hints_builder.d.ts +1 -1
- package/dest/public/index.d.ts +1 -1
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +1 -1
- package/dest/public/public_kernel.d.ts +1 -1
- package/dest/public/public_kernel.d.ts.map +1 -1
- package/dest/public/public_kernel.js +2 -2
- package/dest/public/public_processor.d.ts +5 -2
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +142 -123
- package/dest/public/side_effect_trace.d.ts +87 -0
- package/dest/public/side_effect_trace.d.ts.map +1 -0
- package/dest/public/side_effect_trace.js +236 -0
- package/dest/public/side_effect_trace_interface.d.ts +36 -0
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -0
- package/dest/public/side_effect_trace_interface.js +2 -0
- package/dest/public/teardown_phase_manager.d.ts.map +1 -1
- package/dest/public/teardown_phase_manager.js +2 -1
- package/dest/rollup/rollup.d.ts +1 -1
- package/dest/rollup/rollup.d.ts.map +1 -1
- package/dest/rollup/rollup.js +2 -2
- package/package.json +18 -9
- package/src/acvm/oracle/oracle.ts +23 -5
- package/src/acvm/oracle/typed_oracle.ts +23 -4
- package/src/avm/avm_context.ts +2 -2
- package/src/avm/{avm_message_call_result.ts → avm_contract_call_result.ts} +1 -1
- package/src/avm/avm_execution_environment.ts +16 -26
- package/src/avm/avm_gas.ts +1 -1
- package/src/avm/avm_simulator.ts +10 -13
- package/src/avm/bytecode_utils.ts +32 -0
- package/src/avm/errors.ts +1 -1
- package/src/avm/fixtures/index.ts +21 -23
- package/src/avm/journal/journal.ts +118 -224
- package/src/avm/journal/nullifiers.ts +30 -13
- package/src/avm/journal/public_storage.ts +12 -2
- package/src/avm/opcodes/accrued_substate.ts +12 -21
- package/src/avm/opcodes/environment_getters.ts +23 -14
- package/src/avm/opcodes/external_calls.ts +13 -36
- package/src/avm/serialization/bytecode_serialization.ts +4 -3
- package/src/avm/serialization/instruction_serialization.ts +3 -3
- package/src/avm/test_utils.ts +53 -0
- package/src/client/client_execution_context.ts +22 -7
- package/src/client/execution_note_cache.ts +0 -1
- package/src/client/execution_result.ts +2 -1
- package/src/client/index.ts +2 -0
- package/src/client/simulator.ts +8 -2
- package/src/client/view_data_oracle.ts +20 -3
- package/src/mocks/fixtures.ts +7 -6
- package/src/public/abstract_phase_manager.ts +32 -21
- package/src/public/app_logic_phase_manager.ts +1 -0
- package/src/public/execution.ts +45 -31
- package/src/public/executor.ts +71 -49
- package/src/public/index.ts +1 -1
- package/src/public/public_kernel.ts +2 -1
- package/src/public/public_processor.ts +11 -2
- package/src/public/side_effect_trace.ts +341 -0
- package/src/public/side_effect_trace_interface.ts +41 -0
- package/src/public/teardown_phase_manager.ts +1 -0
- package/src/rollup/rollup.ts +3 -1
- package/dest/avm/avm_message_call_result.d.ts.map +0 -1
- package/dest/avm/avm_message_call_result.js +0 -18
- package/dest/avm/journal/trace.d.ts +0 -33
- package/dest/avm/journal/trace.d.ts.map +0 -1
- package/dest/avm/journal/trace.js +0 -152
- package/dest/avm/journal/trace_types.d.ts +0 -55
- package/dest/avm/journal/trace_types.d.ts.map +0 -1
- package/dest/avm/journal/trace_types.js +0 -2
- package/dest/public/transitional_adaptors.d.ts +0 -21
- package/dest/public/transitional_adaptors.d.ts.map +0 -1
- package/dest/public/transitional_adaptors.js +0 -90
- package/src/avm/journal/trace.ts +0 -181
- package/src/avm/journal/trace_types.ts +0 -91
- package/src/public/transitional_adaptors.ts +0 -168
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import { UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmContractInstanceHint, AvmExecutionHints, AvmExternalCallHint, AvmKeyValueHint, AztecAddress, CallContext, ContractStorageRead, ContractStorageUpdateRequest, EthAddress, Gas, L2ToL1Message, LogHash, NoteHash, Nullifier, ReadRequest, } from '@aztec/circuits.js';
|
|
3
|
+
import { EventSelector } from '@aztec/foundation/abi';
|
|
4
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
|
+
import { createSimulationError } from '../common/errors.js';
|
|
7
|
+
export class PublicSideEffectTrace {
|
|
8
|
+
constructor(
|
|
9
|
+
/** The counter of this trace's first side effect. */
|
|
10
|
+
startSideEffectCounter = 0) {
|
|
11
|
+
this.startSideEffectCounter = startSideEffectCounter;
|
|
12
|
+
this.logger = createDebugLogger('aztec:public_side_effect_trace');
|
|
13
|
+
this.contractStorageReads = [];
|
|
14
|
+
this.contractStorageUpdateRequests = [];
|
|
15
|
+
this.noteHashReadRequests = [];
|
|
16
|
+
this.newNoteHashes = [];
|
|
17
|
+
this.nullifierReadRequests = [];
|
|
18
|
+
this.nullifierNonExistentReadRequests = [];
|
|
19
|
+
this.newNullifiers = [];
|
|
20
|
+
this.l1ToL2MsgReadRequests = [];
|
|
21
|
+
this.newL2ToL1Messages = [];
|
|
22
|
+
this.unencryptedLogs = [];
|
|
23
|
+
this.allUnencryptedLogs = [];
|
|
24
|
+
this.unencryptedLogsHashes = [];
|
|
25
|
+
this.gotContractInstances = [];
|
|
26
|
+
this.nestedExecutions = [];
|
|
27
|
+
this.sideEffectCounter = startSideEffectCounter;
|
|
28
|
+
this.avmCircuitHints = AvmExecutionHints.empty();
|
|
29
|
+
}
|
|
30
|
+
fork() {
|
|
31
|
+
return new PublicSideEffectTrace(this.sideEffectCounter);
|
|
32
|
+
}
|
|
33
|
+
getCounter() {
|
|
34
|
+
return this.sideEffectCounter;
|
|
35
|
+
}
|
|
36
|
+
incrementSideEffectCounter() {
|
|
37
|
+
this.sideEffectCounter++;
|
|
38
|
+
}
|
|
39
|
+
tracePublicStorageRead(storageAddress, slot, value, _exists, _cached) {
|
|
40
|
+
// TODO(4805): check if some threshold is reached for max storage reads
|
|
41
|
+
// (need access to parent length, or trace needs to be initialized with parent's contents)
|
|
42
|
+
// NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
|
|
43
|
+
this.contractStorageReads.push(new ContractStorageRead(slot, value, this.sideEffectCounter, AztecAddress.fromField(storageAddress)));
|
|
44
|
+
this.avmCircuitHints.storageValues.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value));
|
|
45
|
+
this.logger.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
46
|
+
this.incrementSideEffectCounter();
|
|
47
|
+
}
|
|
48
|
+
tracePublicStorageWrite(storageAddress, slot, value) {
|
|
49
|
+
// TODO(4805): check if some threshold is reached for max storage writes
|
|
50
|
+
// (need access to parent length, or trace needs to be initialized with parent's contents)
|
|
51
|
+
this.contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(slot, value, this.sideEffectCounter, storageAddress));
|
|
52
|
+
this.logger.debug(`SSTORE cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
53
|
+
this.incrementSideEffectCounter();
|
|
54
|
+
}
|
|
55
|
+
traceNoteHashCheck(_storageAddress, noteHash, _leafIndex, exists) {
|
|
56
|
+
// TODO(4805): check if some threshold is reached for max note hash checks
|
|
57
|
+
// NOTE: storageAddress is unused but will be important when an AVM circuit processes an entire enqueued call
|
|
58
|
+
// TODO(dbanks12): leafIndex is unused for now but later must be used by kernel to constrain that the kernel
|
|
59
|
+
// is in fact checking the leaf indicated by the user
|
|
60
|
+
this.noteHashReadRequests.push(new ReadRequest(noteHash, this.sideEffectCounter));
|
|
61
|
+
this.avmCircuitHints.noteHashExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)));
|
|
62
|
+
this.logger.debug(`NOTE_HASH_CHECK cnt: ${this.sideEffectCounter}`);
|
|
63
|
+
this.incrementSideEffectCounter();
|
|
64
|
+
}
|
|
65
|
+
traceNewNoteHash(_storageAddress, noteHash) {
|
|
66
|
+
// TODO(4805): check if some threshold is reached for max new note hash
|
|
67
|
+
// NOTE: storageAddress is unused but will be important when an AVM circuit processes an entire enqueued call
|
|
68
|
+
// TODO(dbanks12): non-existent note hashes should emit a read request of the note hash that actually
|
|
69
|
+
// IS there, and the AVM circuit should accept THAT noteHash as a hint. The circuit will then compare
|
|
70
|
+
// the noteHash against the one provided by the user code to determine what to return to the user (exists or not),
|
|
71
|
+
// and will then propagate the actually-present noteHash to its public inputs.
|
|
72
|
+
this.newNoteHashes.push(new NoteHash(noteHash, this.sideEffectCounter));
|
|
73
|
+
this.logger.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
|
|
74
|
+
this.incrementSideEffectCounter();
|
|
75
|
+
}
|
|
76
|
+
traceNullifierCheck(_storageAddress, nullifier, _leafIndex, exists, _isPending) {
|
|
77
|
+
// TODO(4805): check if some threshold is reached for max new nullifier
|
|
78
|
+
// NOTE: storageAddress is unused but will be important when an AVM circuit processes an entire enqueued call
|
|
79
|
+
// NOTE: isPending and leafIndex are unused for now but may be used for optimizations or kernel hints later
|
|
80
|
+
const readRequest = new ReadRequest(nullifier, this.sideEffectCounter);
|
|
81
|
+
if (exists) {
|
|
82
|
+
this.nullifierReadRequests.push(readRequest);
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
this.nullifierNonExistentReadRequests.push(readRequest);
|
|
86
|
+
}
|
|
87
|
+
this.avmCircuitHints.nullifierExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)));
|
|
88
|
+
this.logger.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
|
|
89
|
+
this.incrementSideEffectCounter();
|
|
90
|
+
}
|
|
91
|
+
traceNewNullifier(_storageAddress, nullifier) {
|
|
92
|
+
// TODO(4805): check if some threshold is reached for max new nullifier
|
|
93
|
+
// NOTE: storageAddress is unused but will be important when an AVM circuit processes an entire enqueued call
|
|
94
|
+
this.newNullifiers.push(new Nullifier(nullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO));
|
|
95
|
+
this.logger.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
|
|
96
|
+
this.incrementSideEffectCounter();
|
|
97
|
+
}
|
|
98
|
+
traceL1ToL2MessageCheck(_contractAddress, msgHash, _msgLeafIndex, exists) {
|
|
99
|
+
// TODO(4805): check if some threshold is reached for max message reads
|
|
100
|
+
// NOTE: contractAddress is unused but will be important when an AVM circuit processes an entire enqueued call
|
|
101
|
+
// TODO(dbanks12): leafIndex is unused for now but later must be used by kernel to constrain that the kernel
|
|
102
|
+
// is in fact checking the leaf indicated by the user
|
|
103
|
+
this.l1ToL2MsgReadRequests.push(new ReadRequest(msgHash, this.sideEffectCounter));
|
|
104
|
+
this.avmCircuitHints.l1ToL2MessageExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)));
|
|
105
|
+
this.logger.debug(`L1_TO_L2_MSG_CHECK cnt: ${this.sideEffectCounter}`);
|
|
106
|
+
this.incrementSideEffectCounter();
|
|
107
|
+
}
|
|
108
|
+
traceNewL2ToL1Message(recipient, content) {
|
|
109
|
+
// TODO(4805): check if some threshold is reached for max messages
|
|
110
|
+
const recipientAddress = EthAddress.fromField(recipient);
|
|
111
|
+
this.newL2ToL1Messages.push(new L2ToL1Message(recipientAddress, content, this.sideEffectCounter));
|
|
112
|
+
this.logger.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
|
|
113
|
+
this.incrementSideEffectCounter();
|
|
114
|
+
}
|
|
115
|
+
traceUnencryptedLog(contractAddress, log) {
|
|
116
|
+
// TODO(4805): check if some threshold is reached for max logs
|
|
117
|
+
const ulog = new UnencryptedL2Log(AztecAddress.fromField(contractAddress),
|
|
118
|
+
// TODO(#7198): Remove event selector from UnencryptedL2Log
|
|
119
|
+
EventSelector.fromField(new Fr(0)), Buffer.concat(log.map(f => f.toBuffer())));
|
|
120
|
+
const basicLogHash = Fr.fromBuffer(ulog.hash());
|
|
121
|
+
this.unencryptedLogs.push(ulog);
|
|
122
|
+
this.allUnencryptedLogs.push(ulog);
|
|
123
|
+
// TODO(6578): explain magic number 4 here
|
|
124
|
+
this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)));
|
|
125
|
+
this.logger.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
|
|
126
|
+
this.incrementSideEffectCounter();
|
|
127
|
+
}
|
|
128
|
+
traceGetContractInstance(instance) {
|
|
129
|
+
// TODO(4805): check if some threshold is reached for max contract instance retrievals
|
|
130
|
+
this.gotContractInstances.push(instance);
|
|
131
|
+
this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(instance.address, new Fr(instance.exists ? 1 : 0), instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeysHash));
|
|
132
|
+
this.logger.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
|
|
133
|
+
this.incrementSideEffectCounter();
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* Trace a nested call.
|
|
137
|
+
* Accept some results from a finished nested call's trace into this one.
|
|
138
|
+
*/
|
|
139
|
+
traceNestedCall(
|
|
140
|
+
/** The trace of the nested call. */
|
|
141
|
+
nestedCallTrace,
|
|
142
|
+
/** The execution environment of the nested call. */
|
|
143
|
+
nestedEnvironment,
|
|
144
|
+
/** How much gas was available for this public execution. */
|
|
145
|
+
startGasLeft,
|
|
146
|
+
/** How much gas was left after this public execution. */
|
|
147
|
+
endGasLeft,
|
|
148
|
+
/** Bytecode used for this execution. */
|
|
149
|
+
bytecode,
|
|
150
|
+
/** The call's results */
|
|
151
|
+
avmCallResults,
|
|
152
|
+
/** Function name for logging */
|
|
153
|
+
functionName = 'unknown') {
|
|
154
|
+
const result = nestedCallTrace.toPublicExecutionResult(nestedEnvironment, startGasLeft, endGasLeft, bytecode, avmCallResults, functionName);
|
|
155
|
+
this.sideEffectCounter = result.endSideEffectCounter.toNumber();
|
|
156
|
+
// when a nested call returns, caller accepts its updated counter
|
|
157
|
+
this.allUnencryptedLogs.push(...result.allUnencryptedLogs.logs);
|
|
158
|
+
// NOTE: eventually if the AVM circuit processes an entire enqueued call,
|
|
159
|
+
// this function will accept all of the nested's side effects into this instance
|
|
160
|
+
this.nestedExecutions.push(result);
|
|
161
|
+
const gasUsed = new Gas(result.startGasLeft.daGas - result.endGasLeft.daGas, result.startGasLeft.l2Gas - result.endGasLeft.l2Gas);
|
|
162
|
+
this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
|
|
163
|
+
/*success=*/ new Fr(result.reverted ? 0 : 1), result.returnValues, gasUsed, result.endSideEffectCounter));
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* Convert this trace to a PublicExecutionResult for use externally to the simulator.
|
|
167
|
+
*/
|
|
168
|
+
toPublicExecutionResult(
|
|
169
|
+
/** The execution environment of the nested call. */
|
|
170
|
+
avmEnvironment,
|
|
171
|
+
/** How much gas was available for this public execution. */
|
|
172
|
+
startGasLeft,
|
|
173
|
+
/** How much gas was left after this public execution. */
|
|
174
|
+
endGasLeft,
|
|
175
|
+
/** Bytecode used for this execution. */
|
|
176
|
+
bytecode,
|
|
177
|
+
/** The call's results */
|
|
178
|
+
avmCallResults,
|
|
179
|
+
/** Function name for logging */
|
|
180
|
+
functionName = 'unknown',
|
|
181
|
+
/** The side effect counter of the execution request itself */
|
|
182
|
+
requestSideEffectCounter = this.startSideEffectCounter) {
|
|
183
|
+
return {
|
|
184
|
+
executionRequest: createPublicExecutionRequest(requestSideEffectCounter, avmEnvironment),
|
|
185
|
+
startSideEffectCounter: new Fr(this.startSideEffectCounter),
|
|
186
|
+
endSideEffectCounter: new Fr(this.sideEffectCounter),
|
|
187
|
+
startGasLeft,
|
|
188
|
+
endGasLeft,
|
|
189
|
+
transactionFee: avmEnvironment.transactionFee,
|
|
190
|
+
bytecode,
|
|
191
|
+
calldata: avmEnvironment.calldata,
|
|
192
|
+
returnValues: avmCallResults.output,
|
|
193
|
+
reverted: avmCallResults.reverted,
|
|
194
|
+
revertReason: avmCallResults.revertReason ? createSimulationError(avmCallResults.revertReason) : undefined,
|
|
195
|
+
contractStorageReads: this.contractStorageReads,
|
|
196
|
+
contractStorageUpdateRequests: this.contractStorageUpdateRequests,
|
|
197
|
+
noteHashReadRequests: this.noteHashReadRequests,
|
|
198
|
+
newNoteHashes: this.newNoteHashes,
|
|
199
|
+
nullifierReadRequests: this.nullifierReadRequests,
|
|
200
|
+
nullifierNonExistentReadRequests: this.nullifierNonExistentReadRequests,
|
|
201
|
+
newNullifiers: this.newNullifiers,
|
|
202
|
+
l1ToL2MsgReadRequests: this.l1ToL2MsgReadRequests,
|
|
203
|
+
newL2ToL1Messages: this.newL2ToL1Messages,
|
|
204
|
+
// correct the type on these now that they are finalized (lists won't grow)
|
|
205
|
+
unencryptedLogs: new UnencryptedFunctionL2Logs(this.unencryptedLogs),
|
|
206
|
+
allUnencryptedLogs: new UnencryptedFunctionL2Logs(this.allUnencryptedLogs),
|
|
207
|
+
unencryptedLogsHashes: this.unencryptedLogsHashes,
|
|
208
|
+
// TODO(dbanks12): process contract instance read requests in public kernel
|
|
209
|
+
//gotContractInstances: this.gotContractInstances,
|
|
210
|
+
nestedExecutions: this.nestedExecutions,
|
|
211
|
+
avmCircuitHints: this.avmCircuitHints,
|
|
212
|
+
functionName,
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
/**
|
|
217
|
+
* Helper function to create a public execution request from an AVM execution environment
|
|
218
|
+
*/
|
|
219
|
+
function createPublicExecutionRequest(requestSideEffectCounter, avmEnvironment) {
|
|
220
|
+
const callContext = CallContext.from({
|
|
221
|
+
msgSender: avmEnvironment.sender,
|
|
222
|
+
storageContractAddress: avmEnvironment.storageAddress,
|
|
223
|
+
functionSelector: avmEnvironment.functionSelector,
|
|
224
|
+
isDelegateCall: avmEnvironment.isDelegateCall,
|
|
225
|
+
isStaticCall: avmEnvironment.isStaticCall,
|
|
226
|
+
sideEffectCounter: requestSideEffectCounter,
|
|
227
|
+
});
|
|
228
|
+
return {
|
|
229
|
+
contractAddress: avmEnvironment.address,
|
|
230
|
+
functionSelector: avmEnvironment.functionSelector,
|
|
231
|
+
callContext,
|
|
232
|
+
// execution request does not contain AvmContextInputs prefix
|
|
233
|
+
args: avmEnvironment.getCalldataWithoutPrefix(),
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { type Gas } from '@aztec/circuits.js';
|
|
3
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
4
|
+
import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
|
|
5
|
+
import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
|
|
6
|
+
import { type TracedContractInstance } from './side_effect_trace.js';
|
|
7
|
+
export interface PublicSideEffectTraceInterface {
|
|
8
|
+
fork(): PublicSideEffectTraceInterface;
|
|
9
|
+
getCounter(): number;
|
|
10
|
+
tracePublicStorageRead(storageAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean): void;
|
|
11
|
+
tracePublicStorageWrite(storageAddress: Fr, slot: Fr, value: Fr): void;
|
|
12
|
+
traceNoteHashCheck(storageAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean): void;
|
|
13
|
+
traceNewNoteHash(storageAddress: Fr, noteHash: Fr): void;
|
|
14
|
+
traceNullifierCheck(storageAddress: Fr, nullifier: Fr, leafIndex: Fr, exists: boolean, isPending: boolean): void;
|
|
15
|
+
traceNewNullifier(storageAddress: Fr, nullifier: Fr): void;
|
|
16
|
+
traceL1ToL2MessageCheck(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
|
|
17
|
+
traceNewL2ToL1Message(recipient: Fr, content: Fr): void;
|
|
18
|
+
traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
|
|
19
|
+
traceGetContractInstance(instance: TracedContractInstance): void;
|
|
20
|
+
traceNestedCall(
|
|
21
|
+
/** The trace of the nested call. */
|
|
22
|
+
nestedCallTrace: PublicSideEffectTraceInterface,
|
|
23
|
+
/** The execution environment of the nested call. */
|
|
24
|
+
nestedEnvironment: AvmExecutionEnvironment,
|
|
25
|
+
/** How much gas was available for this public execution. */
|
|
26
|
+
startGasLeft: Gas,
|
|
27
|
+
/** How much gas was left after this public execution. */
|
|
28
|
+
endGasLeft: Gas,
|
|
29
|
+
/** Bytecode used for this execution. */
|
|
30
|
+
bytecode: Buffer,
|
|
31
|
+
/** The call's results */
|
|
32
|
+
avmCallResults: AvmContractCallResult,
|
|
33
|
+
/** Function name */
|
|
34
|
+
functionName: string): void;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=side_effect_trace_interface.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAErE,MAAM,WAAW,8BAA8B;IAC7C,IAAI,IAAI,8BAA8B,CAAC;IACvC,UAAU,IAAI,MAAM,CAAC;IACrB,sBAAsB,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACxG,uBAAuB,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC;IACvE,kBAAkB,CAAC,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3F,gBAAgB,CAAC,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,IAAI,CAAC;IACzD,mBAAmB,CAAC,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IACjH,iBAAiB,CAAC,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC;IAC3D,uBAAuB,CAAC,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnG,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC;IACxD,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAE1D,wBAAwB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACjE,eAAe;IACb,oCAAoC;IACpC,eAAe,EAAE,8BAA8B;IAC/C,oDAAoD;IACpD,iBAAiB,EAAE,uBAAuB;IAC1C,4DAA4D;IAE5D,YAAY,EAAE,GAAG;IACjB,yDAAyD;IAEzD,UAAU,EAAE,GAAG;IACf,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,oBAAoB;IACpB,YAAY,EAAE,MAAM,GACnB,IAAI,CAAC;CACT"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teardown_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/teardown_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,EAAE,EACP,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,+BAA+B,EACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAI/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,gBAA4C;IAKtC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,+BAA+B;;;;;;;
|
|
1
|
+
{"version":3,"file":"teardown_phase_manager.d.ts","sourceRoot":"","sources":["../../src/public/teardown_phase_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,EAAE,EACP,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,+BAA+B,EACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAI/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,gBAA4C;IAKtC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,+BAA+B;;;;;;;cA0BtE,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,+BAA+B,GAAG,EAAE;cAU1F,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,2BAA2B,EAAE,+BAA+B,GAAG,GAAG;CAG9G"}
|
|
@@ -20,6 +20,7 @@ export class TeardownPhaseManager extends AbstractPhaseManager {
|
|
|
20
20
|
});
|
|
21
21
|
if (revertReason) {
|
|
22
22
|
await this.publicStateDB.rollbackToCheckpoint();
|
|
23
|
+
tx.filterRevertedLogs(kernelOutput);
|
|
23
24
|
}
|
|
24
25
|
else {
|
|
25
26
|
// TODO(#6464): Should we allow emitting contracts in the public teardown phase?
|
|
@@ -45,4 +46,4 @@ export class TeardownPhaseManager extends AbstractPhaseManager {
|
|
|
45
46
|
return tx.data.constants.txContext.gasSettings.getTeardownLimits();
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVhcmRvd25fcGhhc2VfbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvdGVhcmRvd25fcGhhc2VfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQXNDLE1BQU0sc0JBQXNCLENBQUM7QUFXNUYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUUvQixPQUFPLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUkxRjs7R0FFRztBQUNILE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxvQkFBb0I7SUFDNUQsWUFDRSxFQUF3QixFQUN4QixjQUE4QixFQUM5QixZQUEwQyxFQUMxQyxlQUFnQyxFQUNoQyxnQkFBd0IsRUFDZCxpQkFBOEMsRUFDOUMsYUFBNEIsRUFDdEMsUUFBMEIsZ0JBQWdCLENBQUMsUUFBUTtRQUVuRCxLQUFLLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBSnhFLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBNkI7UUFDOUMsa0JBQWEsR0FBYixhQUFhLENBQWU7SUFJeEMsQ0FBQztJQUVRLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBTSxFQUFFLDBCQUEyRDtRQUN2RixJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwRCxNQUFNLEVBQUUsd0JBQXdCLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsR0FDekYsTUFBTSxJQUFJLENBQUMsMEJBQTBCLENBQUMsRUFBRSxFQUFFLDBCQUEwQixDQUFDLENBQUMsS0FBSztRQUN6RSx3RkFBd0Y7UUFDeEYsS0FBSyxFQUFDLEdBQUcsRUFBQyxFQUFFO1lBQ1YsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUFFLENBQUM7WUFDNUMsTUFBTSxHQUFHLENBQUM7UUFDWixDQUFDLENBQ0YsQ0FBQztRQUNKLElBQUksWUFBWSxFQUFFLENBQUM7WUFDakIsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLG9CQUFvQixFQUFFLENBQUM7WUFDaEQsRUFBRSxDQUFDLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3RDLENBQUM7YUFBTSxDQUFDO1lBQ04sZ0ZBQWdGO1lBQ2hGLG9DQUFvQztZQUNwQyxFQUFFLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3pELENBQUM7UUFFRCw2Q0FBNkM7UUFDN0MsTUFBTSxxQkFBcUIsR0FBMkIsd0JBQXdCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3hGLE9BQU8scUJBQXFCLENBQUMsSUFBSSxFQUFFLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hFLENBQUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxFQUFFLHFCQUFxQixFQUFFLGtCQUFrQixFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQztJQUM5RyxDQUFDO0lBRWtCLGlCQUFpQixDQUFDLEVBQU0sRUFBRSwwQkFBMkQ7UUFDdEcsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQztRQUM1RCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQztRQUM3QyxnRkFBZ0Y7UUFDaEYsTUFBTSxPQUFPLEdBQUcsMEJBQTBCLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsMEJBQTBCLENBQUMsb0JBQW9CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDcEgsTUFBTSxLQUFLLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbkcsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRWtCLGVBQWUsQ0FBQyxFQUFNLEVBQUUsMkJBQTREO1FBQ3JHLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQ3JFLENBQUM7Q0FDRiJ9
|
package/dest/rollup/rollup.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type MergeRollupInputs, type ParityPublicInputs, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs } from '@aztec/circuits.js';
|
|
2
|
-
import { type SimulationProvider } from '
|
|
2
|
+
import { type SimulationProvider } from '../providers/simulation_provider.js';
|
|
3
3
|
/**
|
|
4
4
|
* Circuit simulator for the rollup circuits.
|
|
5
5
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/rollup.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/rollup.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;AAsB5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACnF;;;;OAIG;IACH,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACrF;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,qBAAa,0BAA2B,YAAW,eAAe;IAMpD,OAAO,CAAC,kBAAkB;IALtC,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,aAAa,CAAsC;gBAEvC,kBAAkB,EAAE,kBAAkB;IAE1D;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAUrF;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAUrF;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAS/F;;;;OAIG;IACU,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAUjG;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAgBzF"}
|
package/dest/rollup/rollup.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
2
2
|
import { elapsed } from '@aztec/foundation/timer';
|
|
3
3
|
import { BaseParityArtifact, MergeRollupArtifact, RootParityArtifact, RootRollupArtifact, SimulatedBaseRollupArtifact, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
|
|
4
|
-
import { WASMSimulator } from '
|
|
4
|
+
import { WASMSimulator } from '../providers/acvm_wasm.js';
|
|
5
5
|
/**
|
|
6
6
|
* Implements the rollup circuit simulator.
|
|
7
7
|
*/
|
|
@@ -75,4 +75,4 @@ export class RealRollupCircuitSimulator {
|
|
|
75
75
|
return result;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JvbGx1cC9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBV0EsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xELE9BQU8sRUFDTCxrQkFBa0IsRUFDbEIsbUJBQW1CLEVBQ25CLGtCQUFrQixFQUNsQixrQkFBa0IsRUFDbEIsMkJBQTJCLEVBQzNCLG1DQUFtQyxFQUNuQyxzQ0FBc0MsRUFDdEMsb0NBQW9DLEVBQ3BDLHVDQUF1QyxFQUN2QyxtQ0FBbUMsRUFDbkMsc0NBQXNDLEVBQ3RDLG1DQUFtQyxFQUNuQyxzQ0FBc0MsRUFDdEMsNENBQTRDLEVBQzVDLCtDQUErQyxHQUNoRCxNQUFNLHFDQUFxQyxDQUFDO0FBRTdDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQXVDMUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTBCO0lBTXJDLFlBQW9CLGtCQUFzQztRQUF0Qyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBTGxELFFBQUcsR0FBRyxpQkFBaUIsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBRTFELHNEQUFzRDtRQUM5QyxrQkFBYSxHQUFrQixJQUFJLGFBQWEsRUFBRSxDQUFDO0lBRUUsQ0FBQztJQUU5RDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLGlCQUFpQixDQUFDLE1BQXdCO1FBQ3JELE1BQU0sVUFBVSxHQUFHLG1DQUFtQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRS9ELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztRQUU5RixNQUFNLE1BQU0sR0FBRyxzQ0FBc0MsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUUvRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsTUFBd0I7UUFDckQsTUFBTSxVQUFVLEdBQUcsbUNBQW1DLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFL0QsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsZUFBZSxDQUFDLFVBQVUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBRTlGLE1BQU0sTUFBTSxHQUFHLHNDQUFzQyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRS9ELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUF1QjtRQUNwRCxNQUFNLFVBQVUsR0FBRyw0Q0FBNEMsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUV2RSxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLDJCQUEyQixDQUFDLENBQUM7UUFFdkcsTUFBTSxNQUFNLEdBQUcsK0NBQStDLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFeEUsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLGtCQUFrQixDQUFDLEtBQXdCO1FBQ3RELE1BQU0sVUFBVSxHQUFHLG9DQUFvQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRS9ELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFFMUYsTUFBTSxNQUFNLEdBQUcsdUNBQXVDLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFaEUsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBdUI7UUFDcEQsTUFBTSxVQUFVLEdBQUcsbUNBQW1DLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFOUQsTUFBTSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1FBRXBILE1BQU0sTUFBTSxHQUFHLHNDQUFzQyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRS9ELElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLCtCQUErQixFQUFFO1lBQzlDLFNBQVMsRUFBRSxvQkFBb0I7WUFDL0IsV0FBVyxFQUFFLGFBQWE7WUFDMUIsUUFBUTtZQUNSLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUNsQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFDcEMsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztDQUNGIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/simulator",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.45.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -32,7 +32,15 @@
|
|
|
32
32
|
"rootDir": "./src",
|
|
33
33
|
"transform": {
|
|
34
34
|
"^.+\\.tsx?$": [
|
|
35
|
-
"@swc/jest"
|
|
35
|
+
"@swc/jest",
|
|
36
|
+
{
|
|
37
|
+
"jsc": {
|
|
38
|
+
"parser": {
|
|
39
|
+
"syntax": "typescript",
|
|
40
|
+
"decorators": true
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
36
44
|
]
|
|
37
45
|
},
|
|
38
46
|
"extensionsToTreatAsEsm": [
|
|
@@ -48,13 +56,14 @@
|
|
|
48
56
|
]
|
|
49
57
|
},
|
|
50
58
|
"dependencies": {
|
|
51
|
-
"@aztec/circuit-types": "0.
|
|
52
|
-
"@aztec/circuits.js": "0.
|
|
53
|
-
"@aztec/foundation": "0.
|
|
54
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
55
|
-
"@aztec/protocol-contracts": "0.
|
|
56
|
-
"@aztec/
|
|
57
|
-
"@aztec/
|
|
59
|
+
"@aztec/circuit-types": "0.45.0",
|
|
60
|
+
"@aztec/circuits.js": "0.45.0",
|
|
61
|
+
"@aztec/foundation": "0.45.0",
|
|
62
|
+
"@aztec/noir-protocol-circuits-types": "0.45.0",
|
|
63
|
+
"@aztec/protocol-contracts": "0.45.0",
|
|
64
|
+
"@aztec/telemetry-client": "0.45.0",
|
|
65
|
+
"@aztec/types": "0.45.0",
|
|
66
|
+
"@aztec/world-state": "0.45.0",
|
|
58
67
|
"@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
|
|
59
68
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
60
69
|
"levelup": "^5.1.1",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
2
|
import { KeyValidationRequest } from '@aztec/circuits.js';
|
|
3
|
-
import { EventSelector, FunctionSelector } from '@aztec/foundation/abi';
|
|
3
|
+
import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { Fr, Point } from '@aztec/foundation/fields';
|
|
6
6
|
|
|
@@ -49,6 +49,14 @@ export class Oracle {
|
|
|
49
49
|
return toACVMField(await this.typedOracle.getContractAddress());
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
+
async getVersion(): Promise<ACVMField> {
|
|
53
|
+
return toACVMField(await this.typedOracle.getVersion());
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
async getChainId(): Promise<ACVMField> {
|
|
57
|
+
return toACVMField(await this.typedOracle.getChainId());
|
|
58
|
+
}
|
|
59
|
+
|
|
52
60
|
async getKeyValidationRequest([pkMHash]: ACVMField[]): Promise<ACVMField[]> {
|
|
53
61
|
const { pkM, skApp } = await this.typedOracle.getKeyValidationRequest(fromACVMField(pkMHash));
|
|
54
62
|
|
|
@@ -244,7 +252,7 @@ export class Oracle {
|
|
|
244
252
|
): ACVMField {
|
|
245
253
|
this.typedOracle.notifyCreatedNote(
|
|
246
254
|
fromACVMField(storageSlot),
|
|
247
|
-
fromACVMField(noteTypeId),
|
|
255
|
+
NoteSelector.fromField(fromACVMField(noteTypeId)),
|
|
248
256
|
note.map(fromACVMField),
|
|
249
257
|
fromACVMField(innerNoteHash),
|
|
250
258
|
+counter,
|
|
@@ -279,8 +287,18 @@ export class Oracle {
|
|
|
279
287
|
return message.toFields().map(toACVMField);
|
|
280
288
|
}
|
|
281
289
|
|
|
282
|
-
async storageRead(
|
|
283
|
-
|
|
290
|
+
async storageRead(
|
|
291
|
+
[contractAddress]: ACVMField[],
|
|
292
|
+
[startStorageSlot]: ACVMField[],
|
|
293
|
+
[blockNumber]: ACVMField[],
|
|
294
|
+
[numberOfElements]: ACVMField[],
|
|
295
|
+
): Promise<ACVMField[]> {
|
|
296
|
+
const values = await this.typedOracle.storageRead(
|
|
297
|
+
fromACVMField(contractAddress),
|
|
298
|
+
fromACVMField(startStorageSlot),
|
|
299
|
+
+blockNumber,
|
|
300
|
+
+numberOfElements,
|
|
301
|
+
);
|
|
284
302
|
return values.map(toACVMField);
|
|
285
303
|
}
|
|
286
304
|
|
|
@@ -357,7 +375,7 @@ export class Oracle {
|
|
|
357
375
|
const encLog = this.typedOracle.computeEncryptedNoteLog(
|
|
358
376
|
AztecAddress.fromString(contractAddress),
|
|
359
377
|
Fr.fromString(storageSlot),
|
|
360
|
-
Fr.fromString(noteTypeId),
|
|
378
|
+
NoteSelector.fromField(Fr.fromString(noteTypeId)),
|
|
361
379
|
ovKeys,
|
|
362
380
|
ivpkM,
|
|
363
381
|
preimage.map(fromACVMField),
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
type PrivateCallStackItem,
|
|
17
17
|
type PublicCallRequest,
|
|
18
18
|
} from '@aztec/circuits.js';
|
|
19
|
-
import { type FunctionSelector } from '@aztec/foundation/abi';
|
|
19
|
+
import { type FunctionSelector, type NoteSelector } from '@aztec/foundation/abi';
|
|
20
20
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
21
21
|
import { Fr } from '@aztec/foundation/fields';
|
|
22
22
|
import { type ContractInstance } from '@aztec/types/contracts';
|
|
@@ -90,6 +90,14 @@ export abstract class TypedOracle {
|
|
|
90
90
|
throw new OracleMethodNotAvailableError('getContractAddress');
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
+
getChainId(): Promise<Fr> {
|
|
94
|
+
throw new OracleMethodNotAvailableError('getChainId');
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
getVersion(): Promise<Fr> {
|
|
98
|
+
throw new OracleMethodNotAvailableError('getVersion');
|
|
99
|
+
}
|
|
100
|
+
|
|
93
101
|
getKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
|
|
94
102
|
throw new OracleMethodNotAvailableError('getKeyValidationRequest');
|
|
95
103
|
}
|
|
@@ -156,7 +164,13 @@ export abstract class TypedOracle {
|
|
|
156
164
|
throw new OracleMethodNotAvailableError('getNotes');
|
|
157
165
|
}
|
|
158
166
|
|
|
159
|
-
notifyCreatedNote(
|
|
167
|
+
notifyCreatedNote(
|
|
168
|
+
_storageSlot: Fr,
|
|
169
|
+
_noteTypeId: NoteSelector,
|
|
170
|
+
_note: Fr[],
|
|
171
|
+
_innerNoteHash: Fr,
|
|
172
|
+
_counter: number,
|
|
173
|
+
): void {
|
|
160
174
|
throw new OracleMethodNotAvailableError('notifyCreatedNote');
|
|
161
175
|
}
|
|
162
176
|
|
|
@@ -176,7 +190,12 @@ export abstract class TypedOracle {
|
|
|
176
190
|
throw new OracleMethodNotAvailableError('getL1ToL2MembershipWitness');
|
|
177
191
|
}
|
|
178
192
|
|
|
179
|
-
storageRead(
|
|
193
|
+
storageRead(
|
|
194
|
+
_contractAddress: Fr,
|
|
195
|
+
_startStorageSlot: Fr,
|
|
196
|
+
_blockNumber: number,
|
|
197
|
+
_numberOfElements: number,
|
|
198
|
+
): Promise<Fr[]> {
|
|
180
199
|
throw new OracleMethodNotAvailableError('storageRead');
|
|
181
200
|
}
|
|
182
201
|
|
|
@@ -211,7 +230,7 @@ export abstract class TypedOracle {
|
|
|
211
230
|
computeEncryptedNoteLog(
|
|
212
231
|
_contractAddress: AztecAddress,
|
|
213
232
|
_storageSlot: Fr,
|
|
214
|
-
_noteTypeId:
|
|
233
|
+
_noteTypeId: NoteSelector,
|
|
215
234
|
_ovKeys: KeyValidationRequest,
|
|
216
235
|
_ivpkM: PublicKey,
|
|
217
236
|
_preimage: Fr[],
|
package/src/avm/avm_context.ts
CHANGED
|
@@ -43,13 +43,13 @@ export class AvmContext {
|
|
|
43
43
|
calldata: Fr[],
|
|
44
44
|
allocatedGas: Gas,
|
|
45
45
|
callType: 'CALL' | 'STATICCALL',
|
|
46
|
-
|
|
46
|
+
functionSelector: FunctionSelector = FunctionSelector.empty(),
|
|
47
47
|
): AvmContext {
|
|
48
48
|
const deriveFn =
|
|
49
49
|
callType === 'CALL'
|
|
50
50
|
? this.environment.deriveEnvironmentForNestedCall
|
|
51
51
|
: this.environment.deriveEnvironmentForNestedStaticCall;
|
|
52
|
-
const newExecutionEnvironment = deriveFn.call(this.environment, address, calldata,
|
|
52
|
+
const newExecutionEnvironment = deriveFn.call(this.environment, address, calldata, functionSelector);
|
|
53
53
|
const forkedWorldState = this.persistableState.fork();
|
|
54
54
|
const machineState = AvmMachineState.fromState(gasToGasLeft(allocatedGas));
|
|
55
55
|
return new AvmContext(forkedWorldState, newExecutionEnvironment, machineState);
|
|
@@ -5,7 +5,7 @@ import { type AvmRevertReason } from './errors.js';
|
|
|
5
5
|
/**
|
|
6
6
|
* Results of an contract call's execution in the AVM.
|
|
7
7
|
*/
|
|
8
|
-
export class
|
|
8
|
+
export class AvmContractCallResult {
|
|
9
9
|
constructor(public reverted: boolean, public output: Fr[], public revertReason?: AvmRevertReason) {}
|
|
10
10
|
|
|
11
11
|
toString(): string {
|