@aztec/simulator 0.76.2 → 0.76.4-devnet-test
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 +4 -4
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +9 -9
- package/dest/acvm/oracle/typed_oracle.d.ts +7 -4
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +12 -9
- package/dest/avm/avm_simulator.js +2 -2
- package/dest/avm/avm_tree.d.ts +1 -0
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +19 -7
- package/dest/avm/journal/journal.js +23 -23
- package/dest/client/db_oracle.d.ts +12 -9
- package/dest/client/db_oracle.d.ts.map +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/view_data_oracle.d.ts +7 -4
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +19 -9
- package/dest/public/public_tx_context.js +3 -3
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +14 -14
- package/package.json +12 -12
- package/src/acvm/oracle/oracle.ts +9 -9
- package/src/acvm/oracle/typed_oracle.ts +12 -8
- package/src/avm/avm_simulator.ts +1 -1
- package/src/avm/avm_tree.ts +22 -6
- package/src/avm/journal/journal.ts +23 -23
- package/src/client/db_oracle.ts +12 -9
- package/src/client/index.ts +1 -0
- package/src/client/view_data_oracle.ts +24 -8
- package/src/public/public_tx_context.ts +2 -2
- package/src/public/side_effect_trace.ts +13 -13
|
@@ -51,7 +51,6 @@ export class SideEffectTrace {
|
|
|
51
51
|
this.publicLogs = [];
|
|
52
52
|
/** Make sure a forked trace is never merged twice. */
|
|
53
53
|
this.alreadyMergedIntoParent = false;
|
|
54
|
-
this.log.debug(`Creating trace instance with startSideEffectCounter: ${startSideEffectCounter}`);
|
|
55
54
|
this.sideEffectCounter = startSideEffectCounter;
|
|
56
55
|
this.avmCircuitHints = AvmExecutionHints.empty();
|
|
57
56
|
}
|
|
@@ -102,7 +101,7 @@ export class SideEffectTrace {
|
|
|
102
101
|
}
|
|
103
102
|
tracePublicStorageRead(contractAddress, slot, value, leafPreimage = PublicDataTreeLeafPreimage.empty(), leafIndex = Fr.zero(), path = emptyPublicDataPath()) {
|
|
104
103
|
this.avmCircuitHints.publicDataReads.items.push(new AvmPublicDataReadTreeHint(leafPreimage, leafIndex, path));
|
|
105
|
-
this.log.
|
|
104
|
+
this.log.trace(`Tracing storage read (address=${contractAddress}, slot=${slot}): value=${value} (counter=${this.sideEffectCounter})`);
|
|
106
105
|
this.incrementSideEffectCounter();
|
|
107
106
|
}
|
|
108
107
|
async tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
|
|
@@ -125,7 +124,7 @@ export class SideEffectTrace {
|
|
|
125
124
|
// New hinting
|
|
126
125
|
const readHint = new AvmPublicDataReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
|
|
127
126
|
this.avmCircuitHints.publicDataWrites.items.push(new AvmPublicDataWriteTreeHint(readHint, newLeafPreimage, insertionPath));
|
|
128
|
-
this.log.
|
|
127
|
+
this.log.trace(`Traced public data write (address=${contractAddress}, slot=${slot}): value=${value} (counter=${this.sideEffectCounter}, isProtocol:${protocolWrite})`);
|
|
129
128
|
this.incrementSideEffectCounter();
|
|
130
129
|
}
|
|
131
130
|
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
@@ -133,19 +132,20 @@ export class SideEffectTrace {
|
|
|
133
132
|
// New Hinting
|
|
134
133
|
this.avmCircuitHints.noteHashReads.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
135
134
|
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
135
|
+
this.log.trace(`Tracing note hash check (counter=${this.sideEffectCounter})`);
|
|
136
136
|
}
|
|
137
137
|
traceNewNoteHash(noteHash, leafIndex = Fr.zero(), path = emptyNoteHashPath()) {
|
|
138
138
|
if (this.noteHashes.length + this.previousSideEffectArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
139
139
|
throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
|
|
140
140
|
}
|
|
141
141
|
this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter));
|
|
142
|
-
this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
|
|
143
142
|
this.avmCircuitHints.noteHashWrites.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
143
|
+
this.log.trace(`Tracing new note hash (counter=${this.sideEffectCounter})`);
|
|
144
144
|
this.incrementSideEffectCounter();
|
|
145
145
|
}
|
|
146
146
|
traceNullifierCheck(_siloedNullifier, _exists, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
|
|
147
147
|
this.avmCircuitHints.nullifierReads.items.push(new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath));
|
|
148
|
-
this.log.
|
|
148
|
+
this.log.trace(`Tracing nullifier check (counter=${this.sideEffectCounter})`);
|
|
149
149
|
this.incrementSideEffectCounter();
|
|
150
150
|
}
|
|
151
151
|
traceNewNullifier(siloedNullifier, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath(), insertionPath = emptyNullifierPath()) {
|
|
@@ -155,12 +155,13 @@ export class SideEffectTrace {
|
|
|
155
155
|
this.nullifiers.push(new Nullifier(siloedNullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO));
|
|
156
156
|
const lowLeafReadHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
|
|
157
157
|
this.avmCircuitHints.nullifierWrites.items.push(new AvmNullifierWriteTreeHint(lowLeafReadHint, insertionPath));
|
|
158
|
-
this.log.
|
|
158
|
+
this.log.trace(`Tracing new nullifier (counter=${this.sideEffectCounter})`);
|
|
159
159
|
this.incrementSideEffectCounter();
|
|
160
160
|
}
|
|
161
161
|
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
162
162
|
traceL1ToL2MessageCheck(_contractAddress, msgHash, msgLeafIndex, _exists, path = emptyL1ToL2MessagePath()) {
|
|
163
163
|
this.avmCircuitHints.l1ToL2MessageReads.items.push(new AvmAppendTreeHint(msgLeafIndex, msgHash, path));
|
|
164
|
+
this.log.trace(`Tracing l1 to l2 message check (counter=${this.sideEffectCounter})`);
|
|
164
165
|
}
|
|
165
166
|
traceNewL2ToL1Message(contractAddress, recipient, content) {
|
|
166
167
|
if (this.l2ToL1Messages.length + this.previousSideEffectArrayLengths.l2ToL1Msgs >= MAX_L2_TO_L1_MSGS_PER_TX) {
|
|
@@ -168,7 +169,7 @@ export class SideEffectTrace {
|
|
|
168
169
|
}
|
|
169
170
|
const recipientAddress = EthAddress.fromField(recipient);
|
|
170
171
|
this.l2ToL1Messages.push(new L2ToL1Message(recipientAddress, content, this.sideEffectCounter).scope(contractAddress));
|
|
171
|
-
this.log.
|
|
172
|
+
this.log.trace(`Tracing new l2 to l1 message (counter=${this.sideEffectCounter})`);
|
|
172
173
|
this.incrementSideEffectCounter();
|
|
173
174
|
}
|
|
174
175
|
tracePublicLog(contractAddress, log) {
|
|
@@ -180,13 +181,13 @@ export class SideEffectTrace {
|
|
|
180
181
|
}
|
|
181
182
|
const publicLog = new PublicLog(contractAddress, padArrayEnd(log, Fr.ZERO, PUBLIC_LOG_DATA_SIZE_IN_FIELDS));
|
|
182
183
|
this.publicLogs.push(publicLog);
|
|
183
|
-
this.log.
|
|
184
|
+
this.log.trace(`Tracing new public log (counter=${this.sideEffectCounter})`);
|
|
184
185
|
this.incrementSideEffectCounter();
|
|
185
186
|
}
|
|
186
187
|
traceGetContractInstance(contractAddress, exists, instance = SerializableContractInstance.default(), lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
|
|
187
188
|
const membershipHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
|
|
188
189
|
this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(contractAddress, exists, instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeys, membershipHint));
|
|
189
|
-
this.log.
|
|
190
|
+
this.log.trace(`Tracing contract instance retrieval (counter=${this.sideEffectCounter})`);
|
|
190
191
|
this.incrementSideEffectCounter();
|
|
191
192
|
}
|
|
192
193
|
// This tracing function gets called everytime we start simulation/execution.
|
|
@@ -210,7 +211,7 @@ export class SideEffectTrace {
|
|
|
210
211
|
// Since the bytecode hints are keyed by class ID, we need to hint the instance separately
|
|
211
212
|
// since there might be multiple instances hinted for the same class ID.
|
|
212
213
|
this.avmCircuitHints.contractInstances.items.push(instance);
|
|
213
|
-
this.log.
|
|
214
|
+
this.log.trace(`Tracing contract instance for bytecode retrieval: exists=${exists}, instance=${jsonStringify(contractInstance)}`);
|
|
214
215
|
if (!exists) {
|
|
215
216
|
// this ensures there are no duplicates
|
|
216
217
|
this.log.debug(`Contract address ${contractAddress} does not exist. Not tracing bytecode & class ID.`);
|
|
@@ -222,7 +223,7 @@ export class SideEffectTrace {
|
|
|
222
223
|
// To do so, the circuit needs to know the class ID in the
|
|
223
224
|
if (this.gotBytecodeFromClassIds.has(contractInstance.contractClassId.toString())) {
|
|
224
225
|
// this ensures there are no duplicates
|
|
225
|
-
this.log.
|
|
226
|
+
this.log.trace(`Contract class id ${contractInstance.contractClassId.toString()} already exists in previous hints`);
|
|
226
227
|
return;
|
|
227
228
|
}
|
|
228
229
|
// If we could actually allow contract calls after the limit was reached, we would hint even if we have
|
|
@@ -236,7 +237,7 @@ export class SideEffectTrace {
|
|
|
236
237
|
this.log.debug(`Bytecode retrieval failure for contract class ID ${contractInstance.contractClassId.toString()} (limit reached)`);
|
|
237
238
|
throw new SideEffectLimitReachedError('contract calls to unique class IDs', MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS);
|
|
238
239
|
}
|
|
239
|
-
this.log.
|
|
240
|
+
this.log.trace(`Tracing bytecode & contract class for bytecode retrieval: class=${jsonStringify(contractClass)}`);
|
|
240
241
|
this.avmCircuitHints.contractBytecodeHints.set(contractInstance.contractClassId.toString(), new AvmContractBytecodeHints(bytecode, instance, contractClass));
|
|
241
242
|
// After adding the bytecode hint, mark the classId as retrieved to avoid duplication.
|
|
242
243
|
// The above map alone isn't sufficient because we need to check the parent trace's (and its parent) as well.
|
|
@@ -253,7 +254,6 @@ export class SideEffectTrace {
|
|
|
253
254
|
calldata,
|
|
254
255
|
/** Did the call revert? */
|
|
255
256
|
_reverted) {
|
|
256
|
-
this.log.debug(`Tracing enqueued call`);
|
|
257
257
|
// TODO(4805): check if some threshold is reached for max enqueued or nested calls (to unique contracts?)
|
|
258
258
|
this.enqueuedCalls.push(publicCallRequest);
|
|
259
259
|
this.avmCircuitHints.enqueuedCalls.items.push(new AvmEnqueuedCallHint(publicCallRequest.contractAddress, calldata));
|
|
@@ -313,4 +313,4 @@ export class SideEffectTrace {
|
|
|
313
313
|
return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n => n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map(n => n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.publicLogs, PublicLog.empty(), MAX_PUBLIC_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map(w => new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
|
|
314
314
|
}
|
|
315
315
|
}
|
|
316
|
-
//# 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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"}
|
|
316
|
+
//# 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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/simulator",
|
|
3
|
-
"version": "0.76.
|
|
3
|
+
"version": "0.76.4-devnet-test",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./common": "./dest/common.js",
|
|
@@ -60,17 +60,17 @@
|
|
|
60
60
|
]
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@aztec/circuit-types": "0.76.
|
|
64
|
-
"@aztec/circuits.js": "0.76.
|
|
65
|
-
"@aztec/foundation": "0.76.
|
|
66
|
-
"@aztec/noir-protocol-circuits-types": "0.76.
|
|
67
|
-
"@aztec/protocol-contracts": "0.76.
|
|
68
|
-
"@aztec/telemetry-client": "0.76.
|
|
69
|
-
"@aztec/types": "0.76.
|
|
70
|
-
"@aztec/world-state": "0.76.
|
|
71
|
-
"@noir-lang/acvm_js": "
|
|
72
|
-
"@noir-lang/noirc_abi": "
|
|
73
|
-
"@noir-lang/types": "
|
|
63
|
+
"@aztec/circuit-types": "0.76.4-devnet-test",
|
|
64
|
+
"@aztec/circuits.js": "0.76.4-devnet-test",
|
|
65
|
+
"@aztec/foundation": "0.76.4-devnet-test",
|
|
66
|
+
"@aztec/noir-protocol-circuits-types": "0.76.4-devnet-test",
|
|
67
|
+
"@aztec/protocol-contracts": "0.76.4-devnet-test",
|
|
68
|
+
"@aztec/telemetry-client": "0.76.4-devnet-test",
|
|
69
|
+
"@aztec/types": "0.76.4-devnet-test",
|
|
70
|
+
"@aztec/world-state": "0.76.4-devnet-test",
|
|
71
|
+
"@noir-lang/acvm_js": "1.0.0-beta.1",
|
|
72
|
+
"@noir-lang/noirc_abi": "1.0.0-beta.1",
|
|
73
|
+
"@noir-lang/types": "1.0.0-beta.1",
|
|
74
74
|
"levelup": "^5.1.1",
|
|
75
75
|
"lodash.clonedeep": "^4.5.0",
|
|
76
76
|
"memdown": "^6.1.1",
|
|
@@ -396,20 +396,20 @@ export class Oracle {
|
|
|
396
396
|
return toACVMField(true);
|
|
397
397
|
}
|
|
398
398
|
|
|
399
|
-
async
|
|
400
|
-
await this.typedOracle.
|
|
399
|
+
async storeCapsule([contractAddress]: ACVMField[], [slot]: ACVMField[], capsule: ACVMField[]) {
|
|
400
|
+
await this.typedOracle.storeCapsule(
|
|
401
401
|
AztecAddress.fromField(fromACVMField(contractAddress)),
|
|
402
402
|
fromACVMField(slot),
|
|
403
|
-
|
|
403
|
+
capsule.map(fromACVMField),
|
|
404
404
|
);
|
|
405
405
|
}
|
|
406
406
|
|
|
407
|
-
async
|
|
407
|
+
async loadCapsule(
|
|
408
408
|
[contractAddress]: ACVMField[],
|
|
409
409
|
[slot]: ACVMField[],
|
|
410
410
|
[tSize]: ACVMField[],
|
|
411
411
|
): Promise<(ACVMField | ACVMField[])[]> {
|
|
412
|
-
const values = await this.typedOracle.
|
|
412
|
+
const values = await this.typedOracle.loadCapsule(
|
|
413
413
|
AztecAddress.fromField(fromACVMField(contractAddress)),
|
|
414
414
|
fromACVMField(slot),
|
|
415
415
|
);
|
|
@@ -425,17 +425,17 @@ export class Oracle {
|
|
|
425
425
|
}
|
|
426
426
|
}
|
|
427
427
|
|
|
428
|
-
async
|
|
429
|
-
await this.typedOracle.
|
|
428
|
+
async deleteCapsule([contractAddress]: ACVMField[], [slot]: ACVMField[]) {
|
|
429
|
+
await this.typedOracle.deleteCapsule(AztecAddress.fromField(fromACVMField(contractAddress)), fromACVMField(slot));
|
|
430
430
|
}
|
|
431
431
|
|
|
432
|
-
async
|
|
432
|
+
async copyCapsule(
|
|
433
433
|
[contractAddress]: ACVMField[],
|
|
434
434
|
[srcSlot]: ACVMField[],
|
|
435
435
|
[dstSlot]: ACVMField[],
|
|
436
436
|
[numEntries]: ACVMField[],
|
|
437
437
|
) {
|
|
438
|
-
await this.typedOracle.
|
|
438
|
+
await this.typedOracle.copyCapsule(
|
|
439
439
|
AztecAddress.fromField(fromACVMField(contractAddress)),
|
|
440
440
|
fromACVMField(srcSlot),
|
|
441
441
|
fromACVMField(dstSlot),
|
|
@@ -242,19 +242,23 @@ export abstract class TypedOracle {
|
|
|
242
242
|
throw new OracleMethodNotAvailableError('deliverNote');
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
-
|
|
246
|
-
throw new OracleMethodNotAvailableError('
|
|
245
|
+
storeCapsule(_contractAddress: AztecAddress, _key: Fr, _capsule: Fr[]): Promise<void> {
|
|
246
|
+
throw new OracleMethodNotAvailableError('storeCapsule');
|
|
247
247
|
}
|
|
248
248
|
|
|
249
|
-
|
|
250
|
-
throw new OracleMethodNotAvailableError('
|
|
249
|
+
loadCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<Fr[] | null> {
|
|
250
|
+
throw new OracleMethodNotAvailableError('loadCapsule');
|
|
251
251
|
}
|
|
252
252
|
|
|
253
|
-
|
|
254
|
-
throw new OracleMethodNotAvailableError('
|
|
253
|
+
deleteCapsule(_contractAddress: AztecAddress, _key: Fr): Promise<void> {
|
|
254
|
+
throw new OracleMethodNotAvailableError('deleteCapsule');
|
|
255
255
|
}
|
|
256
256
|
|
|
257
|
-
|
|
258
|
-
throw new OracleMethodNotAvailableError('
|
|
257
|
+
copyCapsule(_contractAddress: AztecAddress, _srcKey: Fr, _dstKey: Fr, _numEntries: number): Promise<void> {
|
|
258
|
+
throw new OracleMethodNotAvailableError('copyCapsule');
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
aes128Decrypt(_ciphertext: Buffer, _iv: Buffer, _symKey: Buffer): Promise<Buffer> {
|
|
262
|
+
throw new OracleMethodNotAvailableError('aes128Decrypt');
|
|
259
263
|
}
|
|
260
264
|
}
|
package/src/avm/avm_simulator.ts
CHANGED
|
@@ -205,7 +205,7 @@ export class AvmSimulator {
|
|
|
205
205
|
|
|
206
206
|
const endTotalTime = performance.now();
|
|
207
207
|
const totalTime = endTotalTime - startTotalTime;
|
|
208
|
-
this.log.debug(`
|
|
208
|
+
this.log.debug(`Core AVM simulation took ${totalTime}ms`);
|
|
209
209
|
|
|
210
210
|
// Return results for processing by calling context
|
|
211
211
|
return results;
|
package/src/avm/avm_tree.ts
CHANGED
|
@@ -7,6 +7,21 @@ import { type IndexedTreeLeafPreimage, type TreeLeafPreimage } from '@aztec/foun
|
|
|
7
7
|
import { strict as assert } from 'assert';
|
|
8
8
|
import cloneDeep from 'lodash.clonedeep';
|
|
9
9
|
|
|
10
|
+
const MAX_TREE_DEPTH = 128;
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Helper function to precompute zero hashes
|
|
14
|
+
*/
|
|
15
|
+
async function preComputeZeroHashes(): Promise<Fr[]> {
|
|
16
|
+
let currentHash = Fr.zero();
|
|
17
|
+
const zeroHashes: Fr[] = [];
|
|
18
|
+
for (let i = 0; i < MAX_TREE_DEPTH; i++) {
|
|
19
|
+
zeroHashes.push(currentHash);
|
|
20
|
+
currentHash = await poseidon2Hash([currentHash, currentHash]);
|
|
21
|
+
}
|
|
22
|
+
return zeroHashes;
|
|
23
|
+
}
|
|
24
|
+
|
|
10
25
|
/****************************************************/
|
|
11
26
|
/****** Structs Used by the AvmEphemeralForest ******/
|
|
12
27
|
/****************************************************/
|
|
@@ -554,6 +569,8 @@ export class EphemeralAvmTree {
|
|
|
554
569
|
private tree: Tree;
|
|
555
570
|
public frontier: Fr[];
|
|
556
571
|
|
|
572
|
+
private static precomputedZeroHashes: Fr[] | undefined;
|
|
573
|
+
|
|
557
574
|
private constructor(private root: Leaf, public leafCount: bigint, public depth: number, private zeroHashes: Fr[]) {
|
|
558
575
|
this.tree = root;
|
|
559
576
|
this.frontier = [];
|
|
@@ -565,13 +582,12 @@ export class EphemeralAvmTree {
|
|
|
565
582
|
treeDb: MerkleTreeReadOperations,
|
|
566
583
|
merkleId: MerkleTreeId,
|
|
567
584
|
): Promise<EphemeralAvmTree> {
|
|
568
|
-
let
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
zeroHashes.push(zeroHash);
|
|
573
|
-
zeroHash = await poseidon2Hash([zeroHash, zeroHash]);
|
|
585
|
+
let zeroHashes = EphemeralAvmTree.precomputedZeroHashes;
|
|
586
|
+
if (zeroHashes === undefined) {
|
|
587
|
+
zeroHashes = await preComputeZeroHashes();
|
|
588
|
+
EphemeralAvmTree.precomputedZeroHashes = zeroHashes;
|
|
574
589
|
}
|
|
590
|
+
const zeroHash = zeroHashes[depth];
|
|
575
591
|
const tree = new EphemeralAvmTree(Leaf(zeroHash), forkedLeafCount, depth, zeroHashes);
|
|
576
592
|
await tree.initializeFrontier(treeDb, merkleId);
|
|
577
593
|
return tree;
|
|
@@ -144,16 +144,16 @@ export class AvmPersistableStateManager {
|
|
|
144
144
|
* @param value - the value being written to the slot
|
|
145
145
|
*/
|
|
146
146
|
public async writeStorage(contractAddress: AztecAddress, slot: Fr, value: Fr, protocolWrite = false): Promise<void> {
|
|
147
|
-
this.log.
|
|
147
|
+
this.log.trace(`Storage write (address=${contractAddress}, slot=${slot}): value=${value}`);
|
|
148
148
|
const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
149
|
-
this.log.
|
|
149
|
+
this.log.trace(`leafSlot=${leafSlot}`);
|
|
150
150
|
// Cache storage writes for later reference/reads
|
|
151
151
|
this.publicStorage.write(contractAddress, slot, value);
|
|
152
152
|
|
|
153
153
|
if (this.doMerkleOperations) {
|
|
154
154
|
const result = await this.merkleTrees.writePublicStorage(leafSlot, value);
|
|
155
155
|
assert(result !== undefined, 'Public data tree insertion error. You might want to disable doMerkleOperations.');
|
|
156
|
-
this.log.
|
|
156
|
+
this.log.trace(`Inserted public data tree leaf at leafSlot ${leafSlot}, value: ${value}`);
|
|
157
157
|
|
|
158
158
|
const lowLeafInfo = result.lowWitness;
|
|
159
159
|
const lowLeafPreimage = result.lowWitness.preimage as PublicDataTreeLeafPreimage;
|
|
@@ -195,9 +195,9 @@ export class AvmPersistableStateManager {
|
|
|
195
195
|
*/
|
|
196
196
|
public async readStorage(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
|
|
197
197
|
const { value, cached } = await this.publicStorage.read(contractAddress, slot);
|
|
198
|
-
this.log.
|
|
198
|
+
this.log.trace(`Storage read (address=${contractAddress}, slot=${slot}): value=${value}, cached=${cached}`);
|
|
199
199
|
const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
200
|
-
this.log.
|
|
200
|
+
this.log.trace(`leafSlot=${leafSlot}`);
|
|
201
201
|
|
|
202
202
|
if (this.doMerkleOperations) {
|
|
203
203
|
// Get leaf if present, low leaf if absent
|
|
@@ -212,8 +212,8 @@ export class AvmPersistableStateManager {
|
|
|
212
212
|
const leafPath = await this.merkleTrees.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
|
|
213
213
|
const leafPreimage = preimage as PublicDataTreeLeafPreimage;
|
|
214
214
|
|
|
215
|
-
this.log.
|
|
216
|
-
this.log.
|
|
215
|
+
this.log.trace(`leafPreimage.slot: ${leafPreimage.slot}, leafPreimage.value: ${leafPreimage.value}`);
|
|
216
|
+
this.log.trace(
|
|
217
217
|
`leafPreimage.nextSlot: ${leafPreimage.nextSlot}, leafPreimage.nextIndex: ${Number(leafPreimage.nextIndex)}`,
|
|
218
218
|
);
|
|
219
219
|
|
|
@@ -223,7 +223,7 @@ export class AvmPersistableStateManager {
|
|
|
223
223
|
`Value mismatch when performing public data read (got value: ${value}, value in ephemeral tree: ${leafPreimage.value})`,
|
|
224
224
|
);
|
|
225
225
|
} else {
|
|
226
|
-
this.log.
|
|
226
|
+
this.log.trace(`Slot has never been written before!`);
|
|
227
227
|
// Sanity check that the leaf slot is skipped by low leaf when it doesn't exist
|
|
228
228
|
assert(
|
|
229
229
|
leafPreimage.slot.toBigInt() < leafSlot.toBigInt() &&
|
|
@@ -250,7 +250,7 @@ export class AvmPersistableStateManager {
|
|
|
250
250
|
*/
|
|
251
251
|
public async peekStorage(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
|
|
252
252
|
const { value, cached } = await this.publicStorage.read(contractAddress, slot);
|
|
253
|
-
this.log.
|
|
253
|
+
this.log.trace(`Storage peek (address=${contractAddress}, slot=${slot}): value=${value}, cached=${cached}`);
|
|
254
254
|
return Promise.resolve(value);
|
|
255
255
|
}
|
|
256
256
|
|
|
@@ -266,7 +266,7 @@ export class AvmPersistableStateManager {
|
|
|
266
266
|
public async checkNoteHashExists(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr): Promise<boolean> {
|
|
267
267
|
const gotLeafValue = (await this.worldStateDB.getCommitmentValue(leafIndex.toBigInt())) ?? Fr.ZERO;
|
|
268
268
|
const exists = gotLeafValue.equals(noteHash);
|
|
269
|
-
this.log.
|
|
269
|
+
this.log.trace(
|
|
270
270
|
`noteHashes(${contractAddress})@${noteHash} ?? leafIndex: ${leafIndex} | gotLeafValue: ${gotLeafValue}, exists: ${exists}.`,
|
|
271
271
|
);
|
|
272
272
|
if (this.doMerkleOperations) {
|
|
@@ -306,7 +306,7 @@ export class AvmPersistableStateManager {
|
|
|
306
306
|
* @param noteHash - the siloed unique hash to write
|
|
307
307
|
*/
|
|
308
308
|
public async writeUniqueNoteHash(noteHash: Fr): Promise<void> {
|
|
309
|
-
this.log.
|
|
309
|
+
this.log.trace(`noteHashes += @${noteHash}.`);
|
|
310
310
|
|
|
311
311
|
if (this.doMerkleOperations) {
|
|
312
312
|
// Should write a helper for this
|
|
@@ -325,7 +325,7 @@ export class AvmPersistableStateManager {
|
|
|
325
325
|
* @returns exists - whether the nullifier exists in the nullifier set
|
|
326
326
|
*/
|
|
327
327
|
public async checkNullifierExists(contractAddress: AztecAddress, nullifier: Fr): Promise<boolean> {
|
|
328
|
-
this.log.
|
|
328
|
+
this.log.trace(`Checking existence of nullifier (address=${contractAddress}, nullifier=${nullifier})`);
|
|
329
329
|
const siloedNullifier = await siloNullifier(contractAddress, nullifier);
|
|
330
330
|
const [exists, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(
|
|
331
331
|
siloedNullifier,
|
|
@@ -367,7 +367,7 @@ export class AvmPersistableStateManager {
|
|
|
367
367
|
]
|
|
368
368
|
> {
|
|
369
369
|
const [exists, isPending, _] = await this.nullifiers.checkExists(siloedNullifier);
|
|
370
|
-
this.log.
|
|
370
|
+
this.log.trace(`Checked siloed nullifier ${siloedNullifier} (exists=${exists}), pending=${isPending}`);
|
|
371
371
|
|
|
372
372
|
if (this.doMerkleOperations) {
|
|
373
373
|
// Get leaf if present, low leaf if absent
|
|
@@ -386,7 +386,7 @@ export class AvmPersistableStateManager {
|
|
|
386
386
|
);
|
|
387
387
|
|
|
388
388
|
if (exists) {
|
|
389
|
-
this.log.
|
|
389
|
+
this.log.trace(`Siloed nullifier ${siloedNullifier} exists at leafIndex=${leafIndex}`);
|
|
390
390
|
} else {
|
|
391
391
|
// Sanity check that the leaf value is skipped by low leaf when it doesn't exist
|
|
392
392
|
assert(
|
|
@@ -407,7 +407,7 @@ export class AvmPersistableStateManager {
|
|
|
407
407
|
* @param nullifier - the unsiloed nullifier to write
|
|
408
408
|
*/
|
|
409
409
|
public async writeNullifier(contractAddress: AztecAddress, nullifier: Fr) {
|
|
410
|
-
this.log.
|
|
410
|
+
this.log.trace(`Inserting new nullifier (address=${nullifier}, nullifier=${contractAddress})`);
|
|
411
411
|
const siloedNullifier = await siloNullifier(contractAddress, nullifier);
|
|
412
412
|
await this.writeSiloedNullifier(siloedNullifier);
|
|
413
413
|
}
|
|
@@ -417,7 +417,7 @@ export class AvmPersistableStateManager {
|
|
|
417
417
|
* @param siloedNullifier - the siloed nullifier to write
|
|
418
418
|
*/
|
|
419
419
|
public async writeSiloedNullifier(siloedNullifier: Fr) {
|
|
420
|
-
this.log.
|
|
420
|
+
this.log.trace(`Inserting siloed nullifier=${siloedNullifier}`);
|
|
421
421
|
|
|
422
422
|
if (this.doMerkleOperations) {
|
|
423
423
|
// Maybe overkill, but we should check if the nullifier is already present in the tree before attempting to insert
|
|
@@ -447,13 +447,13 @@ export class AvmPersistableStateManager {
|
|
|
447
447
|
// Cache pending nullifiers for later access
|
|
448
448
|
await this.nullifiers.append(siloedNullifier);
|
|
449
449
|
// We append the new nullifier
|
|
450
|
-
this.log.
|
|
450
|
+
this.log.trace(
|
|
451
451
|
`Nullifier tree root before insertion ${await this.merkleTrees.treeMap
|
|
452
452
|
.get(MerkleTreeId.NULLIFIER_TREE)!
|
|
453
453
|
.getRoot()}`,
|
|
454
454
|
);
|
|
455
455
|
const appendResult = await this.merkleTrees.appendNullifier(siloedNullifier);
|
|
456
|
-
this.log.
|
|
456
|
+
this.log.trace(
|
|
457
457
|
`Nullifier tree root after insertion ${await this.merkleTrees.treeMap
|
|
458
458
|
.get(MerkleTreeId.NULLIFIER_TREE)!
|
|
459
459
|
.getRoot()}`,
|
|
@@ -496,7 +496,7 @@ export class AvmPersistableStateManager {
|
|
|
496
496
|
): Promise<boolean> {
|
|
497
497
|
const valueAtIndex = (await this.worldStateDB.getL1ToL2LeafValue(msgLeafIndex.toBigInt())) ?? Fr.ZERO;
|
|
498
498
|
const exists = valueAtIndex.equals(msgHash);
|
|
499
|
-
this.log.
|
|
499
|
+
this.log.trace(
|
|
500
500
|
`l1ToL2Messages(@${msgLeafIndex}) ?? exists: ${exists}, expected: ${msgHash}, found: ${valueAtIndex}.`,
|
|
501
501
|
);
|
|
502
502
|
|
|
@@ -522,7 +522,7 @@ export class AvmPersistableStateManager {
|
|
|
522
522
|
* @param content - Message content.
|
|
523
523
|
*/
|
|
524
524
|
public writeL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr) {
|
|
525
|
-
this.log.
|
|
525
|
+
this.log.trace(`L2ToL1Messages(${contractAddress}) += (recipient: ${recipient}, content: ${content}).`);
|
|
526
526
|
this.trace.traceNewL2ToL1Message(contractAddress, recipient, content);
|
|
527
527
|
}
|
|
528
528
|
|
|
@@ -532,7 +532,7 @@ export class AvmPersistableStateManager {
|
|
|
532
532
|
* @param log - log contents
|
|
533
533
|
*/
|
|
534
534
|
public writePublicLog(contractAddress: AztecAddress, log: Fr[]) {
|
|
535
|
-
this.log.
|
|
535
|
+
this.log.trace(`PublicLog(${contractAddress}) += event with ${log.length} fields.`);
|
|
536
536
|
this.trace.tracePublicLog(contractAddress, log);
|
|
537
537
|
}
|
|
538
538
|
|
|
@@ -542,7 +542,7 @@ export class AvmPersistableStateManager {
|
|
|
542
542
|
* @returns the contract instance or undefined if it does not exist.
|
|
543
543
|
*/
|
|
544
544
|
public async getContractInstance(contractAddress: AztecAddress): Promise<SerializableContractInstance | undefined> {
|
|
545
|
-
this.log.
|
|
545
|
+
this.log.trace(`Getting contract instance for address ${contractAddress}`);
|
|
546
546
|
const instanceWithAddress = await this.worldStateDB.getContractInstance(contractAddress);
|
|
547
547
|
const exists = instanceWithAddress !== undefined;
|
|
548
548
|
|
|
@@ -568,7 +568,7 @@ export class AvmPersistableStateManager {
|
|
|
568
568
|
|
|
569
569
|
if (exists) {
|
|
570
570
|
const instance = new SerializableContractInstance(instanceWithAddress);
|
|
571
|
-
this.log.
|
|
571
|
+
this.log.trace(
|
|
572
572
|
`Got contract instance (address=${contractAddress}): exists=${exists}, instance=${jsonStringify(instance)}`,
|
|
573
573
|
);
|
|
574
574
|
if (this.doMerkleOperations) {
|
package/src/client/db_oracle.ts
CHANGED
|
@@ -256,32 +256,35 @@ export interface DBOracle extends CommitmentsDB {
|
|
|
256
256
|
removeNullifiedNotes(contractAddress: AztecAddress): Promise<void>;
|
|
257
257
|
|
|
258
258
|
/**
|
|
259
|
-
* Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `
|
|
260
|
-
* * If data was already stored at this slot, it is
|
|
259
|
+
* Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `loadCapsule`.
|
|
260
|
+
* * If data was already stored at this slot, it is overwritten.
|
|
261
261
|
* @param contractAddress - The contract address to scope the data under.
|
|
262
262
|
* @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
|
|
263
|
-
* @param
|
|
263
|
+
* @param capsule - An array of field elements representing the capsule.
|
|
264
|
+
* @remarks A capsule is a "blob" of data that is passed to the contract through an oracle. It works similarly
|
|
265
|
+
* to public contract storage in that it's indexed by the contract address and storage slot but instead of the global
|
|
266
|
+
* network state it's backed by local PXE db.
|
|
264
267
|
*/
|
|
265
|
-
|
|
268
|
+
storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void>;
|
|
266
269
|
|
|
267
270
|
/**
|
|
268
|
-
* Returns data previously stored via `
|
|
271
|
+
* Returns data previously stored via `storeCapsule` in the per-contract non-volatile database.
|
|
269
272
|
* @param contractAddress - The contract address under which the data is scoped.
|
|
270
273
|
* @param slot - The slot in the database to read.
|
|
271
274
|
* @returns The stored data or `null` if no data is stored under the slot.
|
|
272
275
|
*/
|
|
273
|
-
|
|
276
|
+
loadCapsule(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
|
|
274
277
|
|
|
275
278
|
/**
|
|
276
279
|
* Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
|
|
277
280
|
* @param contractAddress - The contract address under which the data is scoped.
|
|
278
281
|
* @param slot - The slot in the database to delete.
|
|
279
282
|
*/
|
|
280
|
-
|
|
283
|
+
deleteCapsule(contractAddress: AztecAddress, slot: Fr): Promise<void>;
|
|
281
284
|
|
|
282
285
|
/**
|
|
283
286
|
* Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
|
|
284
|
-
* structures by avoiding repeated calls to `
|
|
287
|
+
* structures by avoiding repeated calls to `loadCapsule` and `storeCapsule`.
|
|
285
288
|
* Supports overlapping source and destination regions (which will result in the overlapped source values being
|
|
286
289
|
* overwritten). All copied slots must exist in the database (i.e. have been stored and not deleted)
|
|
287
290
|
*
|
|
@@ -290,5 +293,5 @@ export interface DBOracle extends CommitmentsDB {
|
|
|
290
293
|
* @param dstSlot - The first slot to copy to.
|
|
291
294
|
* @param numEntries - The number of entries to copy.
|
|
292
295
|
*/
|
|
293
|
-
|
|
296
|
+
copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
|
|
294
297
|
}
|
package/src/client/index.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { AcirSimulator } from './simulator.js';
|
|
2
|
+
export { ViewDataOracle } from './view_data_oracle.js';
|
|
2
3
|
export { DBOracle, ContractClassNotFoundError, ContractNotFoundError } from './db_oracle.js';
|
|
3
4
|
export * from './pick_notes.js';
|
|
4
5
|
export { ExecutionNoteCache } from './execution_note_cache.js';
|