@aztec/simulator 0.57.0 → 0.59.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.js +2 -2
- package/dest/acvm/oracle/typed_oracle.d.ts +1 -2
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +1 -1
- package/dest/avm/avm_gas.js +2 -2
- package/dest/avm/avm_memory_types.d.ts +7 -3
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +29 -14
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +5 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +3 -3
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +2 -3
- package/dest/avm/opcodes/accrued_substate.js +17 -17
- package/dest/avm/opcodes/arithmetic.js +2 -2
- package/dest/avm/opcodes/bitwise.d.ts +3 -3
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +9 -8
- package/dest/avm/opcodes/comparators.js +2 -2
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +4 -3
- package/dest/avm/opcodes/control_flow.js +1 -1
- package/dest/avm/opcodes/conversion.js +4 -4
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +18 -9
- package/dest/avm/opcodes/external_calls.js +10 -10
- package/dest/avm/opcodes/hashing.js +8 -8
- package/dest/avm/opcodes/instruction_impl.d.ts +1 -2
- package/dest/avm/opcodes/instruction_impl.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction_impl.js +2 -5
- package/dest/avm/opcodes/memory.js +3 -3
- package/dest/avm/opcodes/misc.js +4 -4
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +24 -9
- package/dest/avm/opcodes/storage.js +2 -2
- package/dest/avm/serialization/instruction_serialization.js +2 -2
- package/dest/avm/test_utils.d.ts +1 -2
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/avm/test_utils.js +1 -1
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +7 -3
- package/dest/client/db_oracle.d.ts +1 -2
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/index.d.ts +1 -0
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +2 -1
- package/dest/client/private_execution.d.ts +10 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +25 -5
- package/dest/client/view_data_oracle.d.ts +1 -2
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +1 -1
- package/dest/public/db_interfaces.d.ts +1 -2
- package/dest/public/db_interfaces.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.d.ts +76 -0
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -0
- package/dest/public/dual_side_effect_trace.js +109 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts +114 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -0
- package/dest/public/enqueued_call_side_effect_trace.js +314 -0
- package/dest/public/enqueued_call_simulator.d.ts +2 -2
- package/dest/public/enqueued_call_simulator.d.ts.map +1 -1
- package/dest/public/enqueued_call_simulator.js +18 -7
- package/dest/public/enqueued_calls_processor.d.ts +2 -2
- package/dest/public/enqueued_calls_processor.d.ts.map +1 -1
- package/dest/public/enqueued_calls_processor.js +3 -5
- package/dest/public/execution.d.ts +3 -4
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -1
- package/dest/public/executor.d.ts +6 -4
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +18 -9
- package/dest/public/fee_payment.d.ts +1 -1
- package/dest/public/fee_payment.d.ts.map +1 -1
- package/dest/public/fee_payment.js +4 -7
- package/dest/public/hints_builder.d.ts +2 -2
- package/dest/public/hints_builder.d.ts.map +1 -1
- package/dest/public/hints_builder.js +1 -1
- package/dest/public/public_db_sources.d.ts +4 -5
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +15 -11
- package/dest/public/public_kernel_tail_simulator.d.ts +3 -3
- package/dest/public/public_kernel_tail_simulator.d.ts.map +1 -1
- package/dest/public/public_kernel_tail_simulator.js +1 -1
- 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 +8 -12
- package/dest/public/side_effect_trace.d.ts +1 -2
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +2 -2
- package/package.json +9 -9
- package/src/acvm/oracle/oracle.ts +1 -1
- package/src/acvm/oracle/typed_oracle.ts +6 -2
- package/src/avm/avm_gas.ts +1 -1
- package/src/avm/avm_memory_types.ts +28 -11
- package/src/avm/avm_simulator.ts +7 -1
- package/src/avm/fixtures/index.ts +2 -2
- package/src/avm/journal/journal.ts +3 -4
- package/src/avm/opcodes/accrued_substate.ts +17 -17
- package/src/avm/opcodes/arithmetic.ts +1 -1
- package/src/avm/opcodes/bitwise.ts +8 -7
- package/src/avm/opcodes/comparators.ts +1 -1
- package/src/avm/opcodes/contract.ts +3 -2
- package/src/avm/opcodes/control_flow.ts +1 -1
- package/src/avm/opcodes/conversion.ts +4 -4
- package/src/avm/opcodes/ec_add.ts +15 -8
- package/src/avm/opcodes/external_calls.ts +10 -10
- package/src/avm/opcodes/hashing.ts +8 -8
- package/src/avm/opcodes/instruction_impl.ts +0 -3
- package/src/avm/opcodes/memory.ts +3 -3
- package/src/avm/opcodes/misc.ts +4 -4
- package/src/avm/opcodes/multi_scalar_mul.ts +20 -12
- package/src/avm/opcodes/storage.ts +2 -2
- package/src/avm/serialization/instruction_serialization.ts +1 -1
- package/src/avm/test_utils.ts +1 -2
- package/src/client/client_execution_context.ts +6 -1
- package/src/client/db_oracle.ts +6 -2
- package/src/client/index.ts +1 -0
- package/src/client/private_execution.ts +36 -6
- package/src/client/view_data_oracle.ts +1 -2
- package/src/public/db_interfaces.ts +5 -2
- package/src/public/dual_side_effect_trace.ts +173 -0
- package/src/public/enqueued_call_side_effect_trace.ts +552 -0
- package/src/public/enqueued_call_simulator.ts +33 -11
- package/src/public/enqueued_calls_processor.ts +4 -6
- package/src/public/execution.ts +2 -4
- package/src/public/executor.ts +38 -9
- package/src/public/fee_payment.ts +4 -6
- package/src/public/hints_builder.ts +2 -2
- package/src/public/public_db_sources.ts +31 -22
- package/src/public/public_kernel_tail_simulator.ts +3 -3
- package/src/public/public_processor.ts +16 -16
- package/src/public/side_effect_trace.ts +2 -2
|
@@ -0,0 +1,314 @@
|
|
|
1
|
+
import { UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmContractInstanceHint, AvmExecutionHints, AvmExternalCallHint, AvmKeyValueHint, AztecAddress, CallContext, ContractStorageRead, ContractStorageUpdateRequest, EthAddress, Gas, L2ToL1Message, LogHash, MAX_ENCRYPTED_LOGS_PER_TX, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_ENCRYPTED_LOGS_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_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX, NoteHash, Nullifier, PublicAccumulatedData, PublicAccumulatedDataArrayLengths, PublicCallRequest, PublicDataRead, PublicDataUpdateRequest, PublicInnerCallRequest, PublicValidationRequestArrayLengths, PublicValidationRequests, ReadRequest, RollupValidationRequests, ScopedL2ToL1Message, ScopedLogHash, ScopedNoteHash, ScopedReadRequest, TreeLeafReadRequest, VMCircuitPublicInputs, } from '@aztec/circuits.js';
|
|
3
|
+
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
4
|
+
import { makeTuple } from '@aztec/foundation/array';
|
|
5
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
6
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
7
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
8
|
+
import { SideEffectLimitReachedError } from './side_effect_errors.js';
|
|
9
|
+
/**
|
|
10
|
+
* Trace side effects for an entire enqueued call.
|
|
11
|
+
*/
|
|
12
|
+
export class PublicEnqueuedCallSideEffectTrace {
|
|
13
|
+
constructor(
|
|
14
|
+
/** The counter of this trace's first side effect. */
|
|
15
|
+
startSideEffectCounter = 0,
|
|
16
|
+
/** Track parent's (or previous kernel's) lengths so the AVM can properly enforce TX-wide limits,
|
|
17
|
+
* otherwise the public kernel can fail to prove because TX limits are breached.
|
|
18
|
+
*/
|
|
19
|
+
previousValidationRequestArrayLengths = PublicValidationRequestArrayLengths.empty(), previousAccumulatedDataArrayLengths = PublicAccumulatedDataArrayLengths.empty()) {
|
|
20
|
+
this.startSideEffectCounter = startSideEffectCounter;
|
|
21
|
+
this.previousValidationRequestArrayLengths = previousValidationRequestArrayLengths;
|
|
22
|
+
this.previousAccumulatedDataArrayLengths = previousAccumulatedDataArrayLengths;
|
|
23
|
+
this.log = createDebugLogger('aztec:public_enqueued_call_side_effect_trace');
|
|
24
|
+
// TODO(dbanks12): make contract address mandatory in ContractStorage* structs,
|
|
25
|
+
// and include it in serialization, or modify PublicData* structs for this.
|
|
26
|
+
this.contractStorageReads = [];
|
|
27
|
+
this.contractStorageUpdateRequests = [];
|
|
28
|
+
this.noteHashReadRequests = [];
|
|
29
|
+
this.noteHashes = [];
|
|
30
|
+
this.nullifierReadRequests = [];
|
|
31
|
+
this.nullifierNonExistentReadRequests = [];
|
|
32
|
+
this.nullifiers = [];
|
|
33
|
+
this.l1ToL2MsgReadRequests = [];
|
|
34
|
+
this.l2ToL1Msgs = [];
|
|
35
|
+
this.unencryptedLogs = [];
|
|
36
|
+
this.unencryptedLogsHashes = [];
|
|
37
|
+
this.sideEffectCounter = startSideEffectCounter;
|
|
38
|
+
this.avmCircuitHints = AvmExecutionHints.empty();
|
|
39
|
+
}
|
|
40
|
+
fork() {
|
|
41
|
+
return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new PublicValidationRequestArrayLengths(this.previousValidationRequestArrayLengths.noteHashReadRequests + this.noteHashReadRequests.length, this.previousValidationRequestArrayLengths.nullifierReadRequests + this.nullifierReadRequests.length, this.previousValidationRequestArrayLengths.nullifierNonExistentReadRequests +
|
|
42
|
+
this.nullifierNonExistentReadRequests.length, this.previousValidationRequestArrayLengths.l1ToL2MsgReadRequests + this.l1ToL2MsgReadRequests.length, this.previousValidationRequestArrayLengths.publicDataReads + this.contractStorageReads.length), new PublicAccumulatedDataArrayLengths(this.previousAccumulatedDataArrayLengths.noteHashes + this.noteHashes.length, this.previousAccumulatedDataArrayLengths.nullifiers + this.nullifiers.length, this.previousAccumulatedDataArrayLengths.l2ToL1Msgs + this.l2ToL1Msgs.length, this.previousAccumulatedDataArrayLengths.noteEncryptedLogsHashes, this.previousAccumulatedDataArrayLengths.encryptedLogsHashes, this.previousAccumulatedDataArrayLengths.unencryptedLogsHashes + this.unencryptedLogsHashes.length, this.previousAccumulatedDataArrayLengths.publicDataUpdateRequests + this.contractStorageUpdateRequests.length, this.previousAccumulatedDataArrayLengths.publicCallStack));
|
|
43
|
+
}
|
|
44
|
+
getCounter() {
|
|
45
|
+
return this.sideEffectCounter;
|
|
46
|
+
}
|
|
47
|
+
incrementSideEffectCounter() {
|
|
48
|
+
this.sideEffectCounter++;
|
|
49
|
+
}
|
|
50
|
+
tracePublicStorageRead(storageAddress, slot, value, _exists, _cached) {
|
|
51
|
+
// NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
|
|
52
|
+
if (this.contractStorageReads.length + this.previousValidationRequestArrayLengths.publicDataReads >=
|
|
53
|
+
MAX_PUBLIC_DATA_READS_PER_TX) {
|
|
54
|
+
throw new SideEffectLimitReachedError('contract storage read', MAX_PUBLIC_DATA_READS_PER_TX);
|
|
55
|
+
}
|
|
56
|
+
this.contractStorageReads.push(new ContractStorageRead(slot, value, this.sideEffectCounter, AztecAddress.fromField(storageAddress)));
|
|
57
|
+
this.avmCircuitHints.storageValues.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value));
|
|
58
|
+
this.log.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
59
|
+
this.incrementSideEffectCounter();
|
|
60
|
+
}
|
|
61
|
+
tracePublicStorageWrite(storageAddress, slot, value) {
|
|
62
|
+
if (this.contractStorageUpdateRequests.length + this.previousAccumulatedDataArrayLengths.publicDataUpdateRequests >=
|
|
63
|
+
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
64
|
+
throw new SideEffectLimitReachedError('contract storage write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
65
|
+
}
|
|
66
|
+
this.contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(slot, value, this.sideEffectCounter, storageAddress));
|
|
67
|
+
this.log.debug(`SSTORE cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
68
|
+
this.incrementSideEffectCounter();
|
|
69
|
+
}
|
|
70
|
+
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
71
|
+
traceNoteHashCheck(_storageAddress, noteHash, leafIndex, exists) {
|
|
72
|
+
// NOTE: storageAddress is unused because noteHash is an already-siloed leaf
|
|
73
|
+
if (this.noteHashReadRequests.length + this.previousValidationRequestArrayLengths.noteHashReadRequests >=
|
|
74
|
+
MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
|
|
75
|
+
throw new SideEffectLimitReachedError('note hash read request', MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
76
|
+
}
|
|
77
|
+
this.noteHashReadRequests.push(new TreeLeafReadRequest(noteHash, leafIndex));
|
|
78
|
+
this.avmCircuitHints.noteHashExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(leafIndex), /*value=*/ exists ? Fr.ONE : Fr.ZERO));
|
|
79
|
+
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
80
|
+
}
|
|
81
|
+
traceNewNoteHash(storageAddress, noteHash) {
|
|
82
|
+
if (this.noteHashes.length + this.previousAccumulatedDataArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
83
|
+
throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
|
|
84
|
+
}
|
|
85
|
+
this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(AztecAddress.fromField(storageAddress)));
|
|
86
|
+
this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
|
|
87
|
+
this.incrementSideEffectCounter();
|
|
88
|
+
}
|
|
89
|
+
traceNullifierCheck(storageAddress, nullifier, _leafIndex, exists, _isPending) {
|
|
90
|
+
// NOTE: isPending and leafIndex are unused for now but may be used for optimizations or kernel hints later
|
|
91
|
+
this.enforceLimitOnNullifierChecks();
|
|
92
|
+
const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(AztecAddress.fromField(storageAddress));
|
|
93
|
+
if (exists) {
|
|
94
|
+
this.nullifierReadRequests.push(readRequest);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
this.nullifierNonExistentReadRequests.push(readRequest);
|
|
98
|
+
}
|
|
99
|
+
this.avmCircuitHints.nullifierExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)));
|
|
100
|
+
this.log.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
|
|
101
|
+
this.incrementSideEffectCounter();
|
|
102
|
+
}
|
|
103
|
+
traceNewNullifier(storageAddress, nullifier) {
|
|
104
|
+
if (this.nullifiers.length + this.previousAccumulatedDataArrayLengths.nullifiers >= MAX_NULLIFIERS_PER_TX) {
|
|
105
|
+
throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
|
|
106
|
+
}
|
|
107
|
+
this.nullifiers.push(new Nullifier(nullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO).scope(AztecAddress.fromField(storageAddress)));
|
|
108
|
+
this.log.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
|
|
109
|
+
this.incrementSideEffectCounter();
|
|
110
|
+
}
|
|
111
|
+
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
112
|
+
traceL1ToL2MessageCheck(_contractAddress, msgHash, msgLeafIndex, exists) {
|
|
113
|
+
// NOTE: contractAddress is unused because msgHash is an already-siloed leaf
|
|
114
|
+
if (this.l1ToL2MsgReadRequests.length + this.previousValidationRequestArrayLengths.l1ToL2MsgReadRequests >=
|
|
115
|
+
MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX) {
|
|
116
|
+
throw new SideEffectLimitReachedError('l1 to l2 message read request', MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX);
|
|
117
|
+
}
|
|
118
|
+
this.l1ToL2MsgReadRequests.push(new TreeLeafReadRequest(msgHash, msgLeafIndex));
|
|
119
|
+
this.avmCircuitHints.l1ToL2MessageExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(msgLeafIndex), /*value=*/ exists ? Fr.ONE : Fr.ZERO));
|
|
120
|
+
}
|
|
121
|
+
traceNewL2ToL1Message(contractAddress, recipient, content) {
|
|
122
|
+
if (this.l2ToL1Msgs.length + this.previousAccumulatedDataArrayLengths.l2ToL1Msgs >= MAX_L2_TO_L1_MSGS_PER_TX) {
|
|
123
|
+
throw new SideEffectLimitReachedError('l2 to l1 message', MAX_L2_TO_L1_MSGS_PER_TX);
|
|
124
|
+
}
|
|
125
|
+
const recipientAddress = EthAddress.fromField(recipient);
|
|
126
|
+
this.l2ToL1Msgs.push(new L2ToL1Message(recipientAddress, content, this.sideEffectCounter).scope(AztecAddress.fromField(contractAddress)));
|
|
127
|
+
this.log.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
|
|
128
|
+
this.incrementSideEffectCounter();
|
|
129
|
+
}
|
|
130
|
+
traceUnencryptedLog(contractAddress, log) {
|
|
131
|
+
if (this.unencryptedLogs.length + this.previousAccumulatedDataArrayLengths.unencryptedLogsHashes >=
|
|
132
|
+
MAX_UNENCRYPTED_LOGS_PER_TX) {
|
|
133
|
+
throw new SideEffectLimitReachedError('unencrypted log', MAX_UNENCRYPTED_LOGS_PER_TX);
|
|
134
|
+
}
|
|
135
|
+
const ulog = new UnencryptedL2Log(AztecAddress.fromField(contractAddress), Buffer.concat(log.map(f => f.toBuffer())));
|
|
136
|
+
const basicLogHash = Fr.fromBuffer(ulog.hash());
|
|
137
|
+
this.unencryptedLogs.push(ulog);
|
|
138
|
+
// This length is for charging DA and is checked on-chain - has to be length of log preimage + 4 bytes.
|
|
139
|
+
// 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(AztecAddress.fromField(contractAddress)));
|
|
141
|
+
this.log.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
|
|
142
|
+
this.incrementSideEffectCounter();
|
|
143
|
+
}
|
|
144
|
+
traceGetContractInstance(instance) {
|
|
145
|
+
this.enforceLimitOnNullifierChecks('(contract address nullifier from GETCONTRACTINSTANCE)');
|
|
146
|
+
// TODO(dbanks12): should emit a nullifier read request
|
|
147
|
+
this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(instance.address, new Fr(instance.exists ? 1 : 0), instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeys));
|
|
148
|
+
this.log.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
|
|
149
|
+
this.incrementSideEffectCounter();
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Trace a nested call.
|
|
153
|
+
* Accept some results from a finished nested call's trace into this one.
|
|
154
|
+
*/
|
|
155
|
+
traceNestedCall(
|
|
156
|
+
/** The trace of the nested call. */
|
|
157
|
+
nestedCallTrace,
|
|
158
|
+
/** The execution environment of the nested call. */
|
|
159
|
+
_nestedEnvironment,
|
|
160
|
+
/** How much gas was available for this public execution. */
|
|
161
|
+
startGasLeft,
|
|
162
|
+
/** How much gas was left after this public execution. */
|
|
163
|
+
endGasLeft,
|
|
164
|
+
/** Bytecode used for this execution. */
|
|
165
|
+
_bytecode,
|
|
166
|
+
/** The call's results */
|
|
167
|
+
avmCallResults,
|
|
168
|
+
/** Function name for logging */
|
|
169
|
+
_functionName = 'unknown') {
|
|
170
|
+
// Store end side effect counter before it gets updated by absorbing nested call trace
|
|
171
|
+
const endSideEffectCounter = new Fr(this.sideEffectCounter);
|
|
172
|
+
// TODO(4805): check if some threshold is reached for max nested calls (to unique contracts?)
|
|
173
|
+
// TODO(dbanks12): should emit a nullifier read request. There should be two thresholds.
|
|
174
|
+
// one for max unique contract calls, and another based on max nullifier reads.
|
|
175
|
+
// Since this trace function happens _after_ a nested call, such threshold limits must take
|
|
176
|
+
// place in another trace function that occurs _before_ a nested call.
|
|
177
|
+
if (avmCallResults.reverted) {
|
|
178
|
+
this.absorbRevertedNestedTrace(nestedCallTrace);
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
this.absorbSuccessfulNestedTrace(nestedCallTrace);
|
|
182
|
+
}
|
|
183
|
+
const gasUsed = new Gas(startGasLeft.daGas - endGasLeft.daGas, startGasLeft.l2Gas - endGasLeft.l2Gas);
|
|
184
|
+
this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
|
|
185
|
+
/*success=*/ new Fr(avmCallResults.reverted ? 0 : 1), avmCallResults.output, gasUsed, endSideEffectCounter));
|
|
186
|
+
}
|
|
187
|
+
absorbSuccessfulNestedTrace(nestedTrace) {
|
|
188
|
+
this.sideEffectCounter = nestedTrace.sideEffectCounter;
|
|
189
|
+
this.contractStorageReads.push(...nestedTrace.contractStorageReads);
|
|
190
|
+
this.contractStorageUpdateRequests.push(...nestedTrace.contractStorageUpdateRequests);
|
|
191
|
+
this.noteHashReadRequests.push(...nestedTrace.noteHashReadRequests);
|
|
192
|
+
this.noteHashes.push(...nestedTrace.noteHashes);
|
|
193
|
+
this.nullifierReadRequests.push(...nestedTrace.nullifierReadRequests);
|
|
194
|
+
this.nullifierNonExistentReadRequests.push(...nestedTrace.nullifierNonExistentReadRequests);
|
|
195
|
+
this.nullifiers.push(...nestedTrace.nullifiers);
|
|
196
|
+
this.l1ToL2MsgReadRequests.push(...nestedTrace.l1ToL2MsgReadRequests);
|
|
197
|
+
this.l2ToL1Msgs.push(...nestedTrace.l2ToL1Msgs);
|
|
198
|
+
this.unencryptedLogs.push(...nestedTrace.unencryptedLogs);
|
|
199
|
+
this.unencryptedLogsHashes.push(...nestedTrace.unencryptedLogsHashes);
|
|
200
|
+
}
|
|
201
|
+
absorbRevertedNestedTrace(nestedTrace) {
|
|
202
|
+
// All read requests, and any writes (storage & nullifiers) that
|
|
203
|
+
// require complex validation in public kernel (with end lifetimes)
|
|
204
|
+
// must be absorbed even on revert.
|
|
205
|
+
// TODO(dbanks12): What should happen to side effect counter on revert?
|
|
206
|
+
this.sideEffectCounter = nestedTrace.sideEffectCounter;
|
|
207
|
+
this.contractStorageReads.push(...nestedTrace.contractStorageReads);
|
|
208
|
+
this.contractStorageUpdateRequests.push(...nestedTrace.contractStorageUpdateRequests);
|
|
209
|
+
this.noteHashReadRequests.push(...nestedTrace.noteHashReadRequests);
|
|
210
|
+
// new noteHashes are tossed on revert
|
|
211
|
+
this.nullifierReadRequests.push(...nestedTrace.nullifierReadRequests);
|
|
212
|
+
this.nullifierNonExistentReadRequests.push(...nestedTrace.nullifierNonExistentReadRequests);
|
|
213
|
+
this.nullifiers.push(...nestedTrace.nullifiers);
|
|
214
|
+
this.l1ToL2MsgReadRequests.push(...nestedTrace.l1ToL2MsgReadRequests);
|
|
215
|
+
// new l2-to-l1 messages are tossed on revert
|
|
216
|
+
// new unencrypted logs are tossed on revert
|
|
217
|
+
}
|
|
218
|
+
getSideEffects() {
|
|
219
|
+
return {
|
|
220
|
+
contractStorageReads: this.contractStorageReads,
|
|
221
|
+
contractStorageUpdateRequests: this.contractStorageUpdateRequests,
|
|
222
|
+
noteHashReadRequests: this.noteHashReadRequests,
|
|
223
|
+
noteHashes: this.noteHashes,
|
|
224
|
+
nullifierReadRequests: this.nullifierReadRequests,
|
|
225
|
+
nullifierNonExistentReadRequests: this.nullifierNonExistentReadRequests,
|
|
226
|
+
nullifiers: this.nullifiers,
|
|
227
|
+
l1ToL2MsgReadRequests: this.l1ToL2MsgReadRequests,
|
|
228
|
+
l2ToL1Msgs: this.l2ToL1Msgs,
|
|
229
|
+
unencryptedLogs: this.unencryptedLogs,
|
|
230
|
+
unencryptedLogsHashes: this.unencryptedLogsHashes,
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
toVMCircuitPublicInputs(
|
|
234
|
+
/** Constants. */
|
|
235
|
+
constants,
|
|
236
|
+
/** The execution environment of the nested call. */
|
|
237
|
+
avmEnvironment,
|
|
238
|
+
/** How much gas was available for this public execution. */
|
|
239
|
+
startGasLeft,
|
|
240
|
+
/** How much gas was left after this public execution. */
|
|
241
|
+
endGasLeft,
|
|
242
|
+
/** The call's results */
|
|
243
|
+
avmCallResults) {
|
|
244
|
+
return new VMCircuitPublicInputs(
|
|
245
|
+
/*constants=*/ constants,
|
|
246
|
+
/*callRequest=*/ createPublicCallRequest(avmEnvironment),
|
|
247
|
+
/*publicCallStack=*/ makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicInnerCallRequest.empty),
|
|
248
|
+
/*previousValidationRequestArrayLengths=*/ this.previousValidationRequestArrayLengths,
|
|
249
|
+
/*validationRequests=*/ this.getValidationRequests(),
|
|
250
|
+
/*previousAccumulatedDataArrayLengths=*/ this.previousAccumulatedDataArrayLengths,
|
|
251
|
+
/*accumulatedData=*/ this.getAccumulatedData(startGasLeft.sub(endGasLeft)),
|
|
252
|
+
/*startSideEffectCounter=*/ this.startSideEffectCounter,
|
|
253
|
+
/*endSideEffectCounter=*/ this.sideEffectCounter,
|
|
254
|
+
/*startGasLeft=*/ startGasLeft,
|
|
255
|
+
// TODO(dbanks12): should have endGasLeft
|
|
256
|
+
/*transactionFee=*/ avmEnvironment.transactionFee,
|
|
257
|
+
/*reverted=*/ avmCallResults.reverted);
|
|
258
|
+
}
|
|
259
|
+
getUnencryptedLogs() {
|
|
260
|
+
return this.unencryptedLogs;
|
|
261
|
+
}
|
|
262
|
+
getAvmCircuitHints() {
|
|
263
|
+
return this.avmCircuitHints;
|
|
264
|
+
}
|
|
265
|
+
getValidationRequests() {
|
|
266
|
+
return new PublicValidationRequests(RollupValidationRequests.empty(), // TODO(dbanks12): what should this be?
|
|
267
|
+
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),
|
|
268
|
+
// TODO(dbanks12): this is only necessary until VMCircuitPublicInputs uses unsiloed storage slots and pairs storage accesses with contract address
|
|
269
|
+
padArrayEnd(this.contractStorageReads.map(r => new PublicDataRead(r.storageSlot, r.currentValue, r.counter)), PublicDataRead.empty(), MAX_PUBLIC_DATA_READS_PER_TX));
|
|
270
|
+
}
|
|
271
|
+
getAccumulatedData(gasUsed) {
|
|
272
|
+
return new PublicAccumulatedData(padArrayEnd(this.noteHashes, ScopedNoteHash.empty(), MAX_NOTE_HASHES_PER_TX),
|
|
273
|
+
// TODO(dbanks12): should be able to use ScopedNullifier here
|
|
274
|
+
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),
|
|
275
|
+
/*noteEncryptedLogsHashes=*/ makeTuple(MAX_NOTE_ENCRYPTED_LOGS_PER_TX, LogHash.empty),
|
|
276
|
+
/*encryptedLogsHashes=*/ makeTuple(MAX_ENCRYPTED_LOGS_PER_TX, ScopedLogHash.empty), padArrayEnd(this.unencryptedLogsHashes, ScopedLogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_TX),
|
|
277
|
+
// TODO(dbanks12): this is only necessary until VMCircuitPublicInputs uses unsiloed storage slots and pairs storage accesses with contract address
|
|
278
|
+
padArrayEnd(this.contractStorageUpdateRequests.map(w => new PublicDataUpdateRequest(w.storageSlot, w.newValue, w.counter)), PublicDataUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
|
|
279
|
+
/*publicCallStack=*/ makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicCallRequest.empty),
|
|
280
|
+
/*gasUsed=*/ gasUsed);
|
|
281
|
+
}
|
|
282
|
+
enforceLimitOnNullifierChecks(errorMsgOrigin = '') {
|
|
283
|
+
// NOTE: Why error if _either_ limit was reached? If user code emits either an existent or non-existent
|
|
284
|
+
// nullifier read request (NULLIFIEREXISTS, GETCONTRACTINSTANCE, *CALL), and one of the limits has been
|
|
285
|
+
// reached (MAX_NULLIFIER_NON_EXISTENT_RRS vs MAX_NULLIFIER_RRS), but not the other, we must prevent the
|
|
286
|
+
// sequencer from lying and saying "this nullifier exists, but MAX_NULLIFIER_RRS has been reached, so I'm
|
|
287
|
+
// going to skip the read request and just revert instead" when the nullifier actually doesn't exist
|
|
288
|
+
// (or vice versa). So, if either maximum has been reached, any nullifier-reading operation must error.
|
|
289
|
+
if (this.nullifierReadRequests.length + this.previousValidationRequestArrayLengths.nullifierReadRequests >=
|
|
290
|
+
MAX_NULLIFIER_READ_REQUESTS_PER_TX) {
|
|
291
|
+
throw new SideEffectLimitReachedError(`nullifier read request ${errorMsgOrigin}`, MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
292
|
+
}
|
|
293
|
+
if (this.nullifierNonExistentReadRequests.length +
|
|
294
|
+
this.previousValidationRequestArrayLengths.nullifierNonExistentReadRequests >=
|
|
295
|
+
MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX) {
|
|
296
|
+
throw new SideEffectLimitReachedError(`nullifier non-existent read request ${errorMsgOrigin}`, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX);
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
/**
|
|
301
|
+
* Helper function to create a public execution request from an AVM execution environment
|
|
302
|
+
*/
|
|
303
|
+
function createPublicCallRequest(avmEnvironment) {
|
|
304
|
+
const callContext = CallContext.from({
|
|
305
|
+
msgSender: avmEnvironment.sender,
|
|
306
|
+
storageContractAddress: avmEnvironment.storageAddress,
|
|
307
|
+
functionSelector: avmEnvironment.functionSelector,
|
|
308
|
+
isDelegateCall: avmEnvironment.isDelegateCall,
|
|
309
|
+
isStaticCall: avmEnvironment.isStaticCall,
|
|
310
|
+
});
|
|
311
|
+
return new PublicCallRequest(avmEnvironment.address, callContext, computeVarArgsHash(avmEnvironment.calldata),
|
|
312
|
+
/*counter=*/ 0);
|
|
313
|
+
}
|
|
314
|
+
//# 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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { NestedProcessReturnValues, type PublicExecutionRequest, PublicKernelPhase, type PublicProvingRequest, type SimulationError, type Tx, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
|
|
2
2
|
import { Fr, Gas, type GlobalVariables, type Header, type PublicCallRequest, type PublicKernelCircuitPublicInputs, VMCircuitPublicInputs } from '@aztec/circuits.js';
|
|
3
|
-
import { type
|
|
3
|
+
import { type MerkleTreeReadOperations } from '@aztec/world-state';
|
|
4
4
|
import { type PublicExecutor } from './executor.js';
|
|
5
5
|
import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
|
|
6
6
|
export type EnqueuedCallResult = {
|
|
@@ -24,7 +24,7 @@ export declare class EnqueuedCallSimulator {
|
|
|
24
24
|
private globalVariables;
|
|
25
25
|
private historicalHeader;
|
|
26
26
|
private log;
|
|
27
|
-
constructor(db:
|
|
27
|
+
constructor(db: MerkleTreeReadOperations, publicExecutor: PublicExecutor, publicKernelSimulator: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header);
|
|
28
28
|
simulate(callRequest: PublicCallRequest, executionRequest: PublicExecutionRequest, tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, availableGas: Gas, transactionFee: Fr, phase: PublicKernelPhase): Promise<EnqueuedCallResult>;
|
|
29
29
|
private combineNestedExecutionResults;
|
|
30
30
|
/** Returns all pending private and public nullifiers. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueued_call_simulator.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,yBAAyB,EAEzB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,EAEF,GAAG,EACH,KAAK,eAAe,EACpB,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"enqueued_call_simulator.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,yBAAyB,EAEzB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,EAEF,GAAG,EACH,KAAK,eAAe,EACpB,KAAK,MAAM,EAsBX,KAAK,iBAAiB,EAItB,KAAK,+BAA+B,EAQpC,qBAAqB,EAGtB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAmBzF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oCAAoC;IACpC,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,+DAA+D;IAC/D,YAAY,EAAE,qBAAqB,CAAC;IACpC,4EAA4E;IAC5E,kBAAkB,EAAE,yBAAyB,CAAC;IAC9C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,CAAC;IACxC,uDAAuD;IACvD,OAAO,EAAE,GAAG,CAAC;IACb,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,qBAAqB;IAG9B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,gBAAgB;IAN1B,OAAO,CAAC,GAAG,CAAc;gBAEf,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM;IAK5B,QAAQ,CACZ,WAAW,EAAE,iBAAiB,EAC9B,gBAAgB,EAAE,sBAAsB,EACxC,EAAE,EAAE,EAAE,EACN,0BAA0B,EAAE,+BAA+B,EAC3D,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,CAAC;YA8DhB,6BAA6B;IAuE3C,yDAAyD;IACzD,OAAO,CAAC,0BAA0B;YAIpB,gBAAgB;IAY9B;;;;;OAKG;YACW,iBAAiB;YAMjB,sBAAsB;IAkEpC,OAAO,CAAC,eAAe;CAMxB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AVM_REQUEST, MerkleTreeId, NestedProcessReturnValues, ProvingRequestType, PublicKernelPhase, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, ContractStorageRead, ContractStorageUpdateRequest, Fr, FunctionData, Gas, L2ToL1Message, LogHash, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_UNENCRYPTED_LOGS_PER_CALL, NESTED_RECURSIVE_PROOF_LENGTH, NoteHash, Nullifier, PublicAccumulatedData, PublicAccumulatedDataArrayLengths, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicInnerCallRequest, PublicKernelInnerCircuitPrivateInputs, PublicKernelInnerData, PublicValidationRequestArrayLengths, PublicValidationRequests, ReadRequest, RevertCode, TreeLeafReadRequest, VMCircuitPublicInputs, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
2
|
+
import { AztecAddress, ContractStorageRead, ContractStorageUpdateRequest, Fr, FunctionData, Gas, L2ToL1Message, LogHash, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, MAX_L2_GAS_PER_ENQUEUED_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_UNENCRYPTED_LOGS_PER_CALL, NESTED_RECURSIVE_PROOF_LENGTH, NoteHash, Nullifier, PublicAccumulatedData, PublicAccumulatedDataArrayLengths, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicInnerCallRequest, PublicKernelInnerCircuitPrivateInputs, PublicKernelInnerData, PublicValidationRequestArrayLengths, PublicValidationRequests, ReadRequest, RevertCode, TreeLeafReadRequest, VMCircuitPublicInputs, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
3
3
|
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
4
4
|
import { makeTuple } from '@aztec/foundation/array';
|
|
5
5
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
@@ -29,19 +29,30 @@ export class EnqueuedCallSimulator {
|
|
|
29
29
|
this.log = createDebugLogger(`aztec:sequencer`);
|
|
30
30
|
}
|
|
31
31
|
async simulate(callRequest, executionRequest, tx, previousPublicKernelOutput, availableGas, transactionFee, phase) {
|
|
32
|
+
// Gas allocated to an enqueued call can be different from the available gas
|
|
33
|
+
// if there is more gas available than the max allocation per enqueued call.
|
|
34
|
+
const allocatedGas = new Gas(
|
|
35
|
+
/*daGas=*/ availableGas.daGas,
|
|
36
|
+
/*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_ENQUEUED_CALL));
|
|
32
37
|
const pendingNullifiers = this.getSiloedPendingNullifiers(previousPublicKernelOutput);
|
|
33
38
|
const startSideEffectCounter = previousPublicKernelOutput.endSideEffectCounter + 1;
|
|
34
|
-
const
|
|
39
|
+
const prevAccumulatedData = phase === PublicKernelPhase.SETUP
|
|
40
|
+
? previousPublicKernelOutput.endNonRevertibleData
|
|
41
|
+
: previousPublicKernelOutput.end;
|
|
42
|
+
const previousValidationRequestArrayLengths = PublicValidationRequestArrayLengths.new(previousPublicKernelOutput.validationRequests);
|
|
43
|
+
const previousAccumulatedDataArrayLengths = PublicAccumulatedDataArrayLengths.new(prevAccumulatedData);
|
|
44
|
+
// If this is the first enqueued call in public, constants will be empty
|
|
45
|
+
// because private kernel does not expose them.
|
|
46
|
+
const constants = previousPublicKernelOutput.constants.clone();
|
|
47
|
+
constants.globalVariables = this.globalVariables;
|
|
48
|
+
const result = await this.publicExecutor.simulate(executionRequest, constants, allocatedGas, tx.data.constants.txContext, pendingNullifiers, transactionFee, startSideEffectCounter, previousValidationRequestArrayLengths, previousAccumulatedDataArrayLengths);
|
|
35
49
|
const callStack = makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicInnerCallRequest.empty);
|
|
36
50
|
callStack[0].item.contractAddress = callRequest.contractAddress;
|
|
37
51
|
callStack[0].item.callContext = callRequest.callContext;
|
|
38
52
|
callStack[0].item.argsHash = callRequest.argsHash;
|
|
39
|
-
const prevAccumulatedData = phase === PublicKernelPhase.SETUP
|
|
40
|
-
? previousPublicKernelOutput.endNonRevertibleData
|
|
41
|
-
: previousPublicKernelOutput.end;
|
|
42
53
|
const accumulatedData = PublicAccumulatedData.empty();
|
|
43
54
|
accumulatedData.publicCallStack[0] = callRequest;
|
|
44
|
-
const startVMCircuitOutput = new VMCircuitPublicInputs(previousPublicKernelOutput.constants, callRequest, callStack,
|
|
55
|
+
const startVMCircuitOutput = new VMCircuitPublicInputs(previousPublicKernelOutput.constants, callRequest, callStack, previousValidationRequestArrayLengths, PublicValidationRequests.empty(), previousAccumulatedDataArrayLengths, accumulatedData, startSideEffectCounter, startSideEffectCounter, allocatedGas, result.transactionFee, result.reverted);
|
|
45
56
|
return await this.combineNestedExecutionResults(result, startVMCircuitOutput);
|
|
46
57
|
}
|
|
47
58
|
async combineNestedExecutionResults(topResult, startVMCircuitOutput) {
|
|
@@ -151,4 +162,4 @@ export class EnqueuedCallSimulator {
|
|
|
151
162
|
return Promise.resolve(bytecodeHash);
|
|
152
163
|
}
|
|
153
164
|
}
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_simulator.js","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"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"}
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_simulator.js","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type MerkleTreeReadOperations, type NestedProcessReturnValues, type ProcessedTx, type PublicExecutionRequest, PublicKernelPhase, type PublicProvingRequest, type SimulationError, type Tx } from '@aztec/circuit-types';
|
|
2
2
|
import { type GlobalVariables, type Header, type KernelCircuitPublicInputs, type PublicCallRequest } from '@aztec/circuits.js';
|
|
3
3
|
import { EnqueuedCallSimulator } from './enqueued_call_simulator.js';
|
|
4
4
|
import { type PublicExecutor } from './executor.js';
|
|
@@ -31,7 +31,7 @@ export declare class EnqueuedCallsProcessor {
|
|
|
31
31
|
private publicKernelTailSimulator;
|
|
32
32
|
private log;
|
|
33
33
|
constructor(publicKernelSimulator: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, worldStateDB: WorldStateDB, enqueuedCallSimulator: EnqueuedCallSimulator, publicKernelTailSimulator: PublicKernelTailSimulator);
|
|
34
|
-
static create(db:
|
|
34
|
+
static create(db: MerkleTreeReadOperations, publicExecutor: PublicExecutor, publicKernelSimulator: PublicKernelCircuitSimulator, globalVariables: GlobalVariables, historicalHeader: Header, worldStateDB: WorldStateDB): EnqueuedCallsProcessor;
|
|
35
35
|
static getExecutionRequestsByPhase(tx: Tx, phase: PublicKernelPhase): PublicExecutionRequest[];
|
|
36
36
|
static getCallRequestsByPhase(tx: Tx, phase: PublicKernelPhase): PublicCallRequest[];
|
|
37
37
|
process(tx: Tx): Promise<TxPublicCallsResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueued_calls_processor.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,
|
|
1
|
+
{"version":3,"file":"enqueued_calls_processor.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAEhB,KAAK,sBAAsB,EAE3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,yBAAyB,EAE9B,KAAK,iBAAiB,EAOvB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAuB9E,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,gDAAgD;IAChD,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,0EAA0E;IAC1E,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,4CAA4C;IAC5C,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,yBAAyB;IAPnC,OAAO,CAAC,GAAG,CAAc;gBAGf,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,qBAAqB,EAC5C,yBAAyB,EAAE,yBAAyB;IAK9D,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,YAAY;IAqB5B,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,sBAAsB,EAAE;IAe9F,MAAM,CAAC,sBAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,EAAE;IAe9E,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAyErC,YAAY;IA0F1B,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,iBAAiB;YAoBX,qBAAqB;IAuBnC,OAAO,CAAC,qBAAqB;CAa9B"}
|
|
@@ -2,7 +2,7 @@ import { ProvingRequestType, PublicKernelPhase, } from '@aztec/circuit-types';
|
|
|
2
2
|
import { EnqueuedCallData, Fr, Gas, NESTED_RECURSIVE_PROOF_LENGTH, PublicKernelCircuitPrivateInputs, PublicKernelData, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
3
3
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { Timer } from '@aztec/foundation/timer';
|
|
5
|
-
import { ProtocolCircuitVks, getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types';
|
|
5
|
+
import { ProtocolCircuitVks, TubeVk, getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types';
|
|
6
6
|
import { inspect } from 'util';
|
|
7
7
|
import { EnqueuedCallSimulator } from './enqueued_call_simulator.js';
|
|
8
8
|
import { PublicKernelTailSimulator } from './public_kernel_tail_simulator.js';
|
|
@@ -207,12 +207,10 @@ export class EnqueuedCallsProcessor {
|
|
|
207
207
|
getPreviousKernelData(previousOutput, isFromPrivate) {
|
|
208
208
|
// The proof is not used in simulation.
|
|
209
209
|
const proof = makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH);
|
|
210
|
-
const vk = isFromPrivate
|
|
211
|
-
? ProtocolCircuitVks.PrivateKernelTailToPublicArtifact
|
|
212
|
-
: ProtocolCircuitVks.PublicKernelMergeArtifact;
|
|
210
|
+
const vk = isFromPrivate ? TubeVk : ProtocolCircuitVks.PublicKernelMergeArtifact;
|
|
213
211
|
const vkIndex = getVKIndex(vk);
|
|
214
212
|
const siblingPath = getVKSiblingPath(vkIndex);
|
|
215
213
|
return new PublicKernelData(previousOutput, proof, vk, vkIndex, siblingPath);
|
|
216
214
|
}
|
|
217
215
|
}
|
|
218
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_calls_processor.js","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"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"}
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_calls_processor.js","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { NestedProcessReturnValues, type PublicExecutionRequest, type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
|
|
3
|
-
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, type L2ToL1Message, type LogHash, type NoteHash, type Nullifier, PublicInnerCallRequest, type ReadRequest, type TreeLeafReadRequest } from '@aztec/circuits.js';
|
|
4
|
-
import { type Gas as AvmGas } from '../avm/avm_gas.js';
|
|
3
|
+
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, Gas, type L2ToL1Message, type LogHash, type NoteHash, type Nullifier, PublicInnerCallRequest, type ReadRequest, type TreeLeafReadRequest } from '@aztec/circuits.js';
|
|
5
4
|
/**
|
|
6
5
|
* The public function execution result.
|
|
7
6
|
*/
|
|
@@ -13,9 +12,9 @@ export interface PublicExecutionResult {
|
|
|
13
12
|
/** The side effect counter after executing this function call */
|
|
14
13
|
endSideEffectCounter: Fr;
|
|
15
14
|
/** How much gas was available for this public execution. */
|
|
16
|
-
startGasLeft:
|
|
15
|
+
startGasLeft: Gas;
|
|
17
16
|
/** How much gas was left after this public execution. */
|
|
18
|
-
endGasLeft:
|
|
17
|
+
endGasLeft: Gas;
|
|
19
18
|
/** Transaction fee set for this tx. */
|
|
20
19
|
transactionFee: Fr;
|
|
21
20
|
/** Bytecode used for this execution. */
|