@aztec/txe 0.76.4 → 0.77.0-testnet-ignition.21
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/bin/index.js +3 -5
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +106 -106
- package/dest/node/txe_node.d.ts +19 -6
- package/dest/node/txe_node.d.ts.map +1 -1
- package/dest/node/txe_node.js +303 -334
- package/dest/oracle/txe_oracle.d.ts +25 -16
- package/dest/oracle/txe_oracle.d.ts.map +1 -1
- package/dest/oracle/txe_oracle.js +249 -143
- package/dest/txe_service/txe_service.d.ts +3 -3
- package/dest/txe_service/txe_service.d.ts.map +1 -1
- package/dest/txe_service/txe_service.js +205 -105
- package/dest/util/encoding.d.ts +39 -25
- package/dest/util/encoding.d.ts.map +1 -1
- package/dest/util/encoding.js +45 -11
- package/dest/util/expected_failure_error.js +1 -2
- package/dest/util/txe_database.d.ts +3 -2
- package/dest/util/txe_database.d.ts.map +1 -1
- package/dest/util/txe_database.js +6 -10
- package/dest/util/txe_public_contract_data_source.d.ts +5 -3
- package/dest/util/txe_public_contract_data_source.d.ts.map +1 -1
- package/dest/util/txe_public_contract_data_source.js +25 -13
- package/dest/util/txe_world_state_db.d.ts +6 -8
- package/dest/util/txe_world_state_db.d.ts.map +1 -1
- package/dest/util/txe_world_state_db.js +10 -23
- package/package.json +14 -15
- package/src/index.ts +2 -2
- package/src/node/txe_node.ts +64 -42
- package/src/oracle/txe_oracle.ts +101 -86
- package/src/txe_service/txe_service.ts +25 -28
- package/src/util/encoding.ts +32 -5
- package/src/util/txe_database.ts +3 -2
- package/src/util/txe_public_contract_data_source.ts +8 -9
- package/src/util/txe_world_state_db.ts +9 -26
|
@@ -1,27 +1,62 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { AuthWitness, Body, L2Block, MerkleTreeId, Note, NullifierMembershipWitness, PublicDataWitness, PublicExecutionRequest, SimulationError, TxEffect, TxHash, } from '@aztec/circuit-types';
|
|
4
|
-
import { AppendOnlyTreeSnapshot, BlockHeader, CallContext, Gas, GasFees, GlobalVariables, IndexedTaggingSecret, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PRIVATE_CONTEXT_INPUTS_LENGTH, PUBLIC_DISPATCH_SELECTOR, PrivateContextInputs, PublicDataTreeLeaf, PublicDataWrite, computeTaggingSecretPoint, deriveKeys, } from '@aztec/circuits.js';
|
|
5
|
-
import { Schnorr } from '@aztec/circuits.js/barretenberg';
|
|
6
|
-
import { computeNoteHashNonce, computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash, siloNullifier, } from '@aztec/circuits.js/hash';
|
|
7
|
-
import { makeAppendOnlyTreeSnapshot, makeContentCommitment, makeGlobalVariables, makeHeader, } from '@aztec/circuits.js/testing';
|
|
8
|
-
import { FunctionSelector, countArgumentsSize, } from '@aztec/foundation/abi';
|
|
9
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
1
|
+
import { Body, L2Block, Note } from '@aztec/aztec.js';
|
|
2
|
+
import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PRIVATE_CONTEXT_INPUTS_LENGTH, PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
|
|
10
3
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
11
|
-
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
4
|
+
import { Schnorr, poseidon2Hash } from '@aztec/foundation/crypto';
|
|
12
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
13
6
|
import { applyStringFormatting, createDebugOnlyLogger } from '@aztec/foundation/log';
|
|
14
7
|
import { Timer } from '@aztec/foundation/timer';
|
|
15
8
|
import { ContractDataOracle, SimulatorOracle, enrichPublicSimulationError } from '@aztec/pxe';
|
|
16
|
-
import { ExecutionNoteCache, Oracle, ViewDataOracle, WASMSimulator, extractCallStack, extractPrivateCircuitPublicInputs, pickNotes, toACVMWitness, witnessMapToFields
|
|
9
|
+
import { ExecutionNoteCache, Oracle, ViewDataOracle, WASMSimulator, extractCallStack, extractPrivateCircuitPublicInputs, pickNotes, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
|
|
17
10
|
import { createTxForPublicCalls } from '@aztec/simulator/public/fixtures';
|
|
18
|
-
import { ExecutionError, PublicTxSimulator, createSimulationError, resolveAssertionMessageFromError
|
|
11
|
+
import { ExecutionError, PublicTxSimulator, createSimulationError, resolveAssertionMessageFromError } from '@aztec/simulator/server';
|
|
12
|
+
import { FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
|
|
13
|
+
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
14
|
+
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
15
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
16
|
+
import { SimulationError } from '@aztec/stdlib/errors';
|
|
17
|
+
import { Gas, GasFees } from '@aztec/stdlib/gas';
|
|
18
|
+
import { computeNoteHashNonce, computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
|
|
19
|
+
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
20
|
+
import { computeTaggingSecretPoint, deriveKeys } from '@aztec/stdlib/keys';
|
|
21
|
+
import { IndexedTaggingSecret } from '@aztec/stdlib/logs';
|
|
22
|
+
import { makeAppendOnlyTreeSnapshot, makeContentCommitment, makeGlobalVariables, makeHeader } from '@aztec/stdlib/testing';
|
|
23
|
+
import { AppendOnlyTreeSnapshot, MerkleTreeId, NullifierMembershipWitness, PublicDataTreeLeaf, PublicDataWitness } from '@aztec/stdlib/trees';
|
|
24
|
+
import { BlockHeader, CallContext, GlobalVariables, PublicExecutionRequest, TxEffect, TxHash } from '@aztec/stdlib/tx';
|
|
25
|
+
import { ForkCheckpoint } from '@aztec/world-state/native';
|
|
19
26
|
import { TXENode } from '../node/txe_node.js';
|
|
20
27
|
import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
|
|
21
28
|
import { TXEWorldStateDB } from '../util/txe_world_state_db.js';
|
|
22
29
|
export class TXE {
|
|
23
|
-
|
|
24
|
-
|
|
30
|
+
logger;
|
|
31
|
+
executionCache;
|
|
32
|
+
keyStore;
|
|
33
|
+
txeDatabase;
|
|
34
|
+
contractAddress;
|
|
35
|
+
nativeWorldStateService;
|
|
36
|
+
baseFork;
|
|
37
|
+
blockNumber;
|
|
38
|
+
sideEffectCounter;
|
|
39
|
+
msgSender;
|
|
40
|
+
functionSelector;
|
|
41
|
+
isStaticCall;
|
|
42
|
+
// Return/revert data of the latest nested call.
|
|
43
|
+
nestedCallReturndata;
|
|
44
|
+
contractDataOracle;
|
|
45
|
+
simulatorOracle;
|
|
46
|
+
viewDataOracle;
|
|
47
|
+
publicDataWrites;
|
|
48
|
+
uniqueNoteHashesFromPublic;
|
|
49
|
+
siloedNullifiersFromPublic;
|
|
50
|
+
privateLogs;
|
|
51
|
+
publicLogs;
|
|
52
|
+
committedBlocks;
|
|
53
|
+
VERSION;
|
|
54
|
+
CHAIN_ID;
|
|
55
|
+
node;
|
|
56
|
+
simulationProvider;
|
|
57
|
+
noteCache;
|
|
58
|
+
debug;
|
|
59
|
+
constructor(logger, executionCache, keyStore, txeDatabase, contractAddress, nativeWorldStateService, baseFork){
|
|
25
60
|
this.logger = logger;
|
|
26
61
|
this.executionCache = executionCache;
|
|
27
62
|
this.keyStore = keyStore;
|
|
@@ -33,7 +68,6 @@ export class TXE {
|
|
|
33
68
|
this.sideEffectCounter = 0;
|
|
34
69
|
this.functionSelector = FunctionSelector.fromField(new Fr(0));
|
|
35
70
|
this.isStaticCall = false;
|
|
36
|
-
// Return/revert data of the latest nested call.
|
|
37
71
|
this.nestedCallReturndata = [];
|
|
38
72
|
this.publicDataWrites = [];
|
|
39
73
|
this.uniqueNoteHashesFromPublic = [];
|
|
@@ -50,8 +84,7 @@ export class TXE {
|
|
|
50
84
|
// Default msg_sender (for entrypoints) is now Fr.max_value rather than 0 addr (see #7190 & #7404)
|
|
51
85
|
this.msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE);
|
|
52
86
|
this.simulatorOracle = new SimulatorOracle(this.contractDataOracle, txeDatabase, keyStore, this.node, this.simulationProvider);
|
|
53
|
-
this.viewDataOracle = new ViewDataOracle(this.contractAddress, []
|
|
54
|
-
this.node);
|
|
87
|
+
this.viewDataOracle = new ViewDataOracle(this.contractAddress, [], [], this.simulatorOracle, this.node);
|
|
55
88
|
this.debug = createDebugOnlyLogger('aztec:kv-pxe-database');
|
|
56
89
|
}
|
|
57
90
|
static async create(logger, executionCache, keyStore, txeDatabase, nativeWorldStateService, baseFork) {
|
|
@@ -65,10 +98,10 @@ export class TXE {
|
|
|
65
98
|
return this.baseFork;
|
|
66
99
|
}
|
|
67
100
|
getChainId() {
|
|
68
|
-
return Promise.resolve(this.node.getChainId().then(id
|
|
101
|
+
return Promise.resolve(this.node.getChainId().then((id)=>new Fr(id)));
|
|
69
102
|
}
|
|
70
103
|
getVersion() {
|
|
71
|
-
return Promise.resolve(this.node.getVersion().then(v
|
|
104
|
+
return Promise.resolve(this.node.getVersion().then((v)=>new Fr(v)));
|
|
72
105
|
}
|
|
73
106
|
getMsgSender() {
|
|
74
107
|
return this.msgSender;
|
|
@@ -113,8 +146,7 @@ export class TXE {
|
|
|
113
146
|
async getPrivateContextInputs(blockNumber, sideEffectsCounter = this.sideEffectCounter, isStaticCall = false) {
|
|
114
147
|
if (blockNumber > this.blockNumber) {
|
|
115
148
|
throw new Error(`Tried to request private context inputs for ${blockNumber}, which is greater than our current block number of ${this.blockNumber}`);
|
|
116
|
-
}
|
|
117
|
-
else if (blockNumber === this.blockNumber) {
|
|
149
|
+
} else if (blockNumber === this.blockNumber) {
|
|
118
150
|
this.logger.debug(`Tried to request private context inputs for ${blockNumber}, equal to current block of ${this.blockNumber}. Clamping to current block - 1.`);
|
|
119
151
|
blockNumber = this.blockNumber - 1;
|
|
120
152
|
}
|
|
@@ -139,18 +171,20 @@ export class TXE {
|
|
|
139
171
|
const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
|
|
140
172
|
const schnorr = new Schnorr();
|
|
141
173
|
const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
|
|
142
|
-
const authWitness = new AuthWitness(messageHash, [
|
|
174
|
+
const authWitness = new AuthWitness(messageHash, [
|
|
175
|
+
...signature.toBuffer()
|
|
176
|
+
]);
|
|
143
177
|
return this.txeDatabase.addAuthWitness(authWitness.requestHash, authWitness.witness);
|
|
144
178
|
}
|
|
145
179
|
async addPublicDataWrites(writes) {
|
|
146
180
|
this.publicDataWrites.push(...writes);
|
|
147
|
-
await this.baseFork.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, writes.map(w
|
|
181
|
+
await this.baseFork.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, writes.map((w)=>new PublicDataTreeLeaf(w.leafSlot, w.value).toBuffer()));
|
|
148
182
|
}
|
|
149
183
|
async checkNullifiersNotInTree(contractAddress, nullifiers) {
|
|
150
|
-
const siloedNullifiers = await Promise.all(nullifiers.map(nullifier
|
|
184
|
+
const siloedNullifiers = await Promise.all(nullifiers.map((nullifier)=>siloNullifier(contractAddress, nullifier)));
|
|
151
185
|
const db = this.baseFork;
|
|
152
|
-
const nullifierIndexesInTree = await db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, siloedNullifiers.map(n
|
|
153
|
-
if (nullifierIndexesInTree.some(index
|
|
186
|
+
const nullifierIndexesInTree = await db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, siloedNullifiers.map((n)=>n.toBuffer()));
|
|
187
|
+
if (nullifierIndexesInTree.some((index)=>index !== undefined)) {
|
|
154
188
|
throw new Error(`Rejecting tx for emitting duplicate nullifiers`);
|
|
155
189
|
}
|
|
156
190
|
}
|
|
@@ -161,20 +195,22 @@ export class TXE {
|
|
|
161
195
|
this.uniqueNoteHashesFromPublic.push(...siloedNoteHashes);
|
|
162
196
|
}
|
|
163
197
|
async addPrivateLogs(contractAddress, privateLogs) {
|
|
164
|
-
for (const privateLog of privateLogs)
|
|
165
|
-
privateLog.fields[0] = await poseidon2Hash([
|
|
198
|
+
for (const privateLog of privateLogs){
|
|
199
|
+
privateLog.fields[0] = await poseidon2Hash([
|
|
200
|
+
contractAddress,
|
|
201
|
+
privateLog.fields[0]
|
|
202
|
+
]);
|
|
166
203
|
}
|
|
167
204
|
this.privateLogs.push(...privateLogs);
|
|
168
205
|
}
|
|
169
206
|
addPublicLogs(logs) {
|
|
170
|
-
logs.forEach(log
|
|
207
|
+
logs.forEach((log)=>{
|
|
171
208
|
try {
|
|
172
209
|
// The first elt stores lengths => tag is in fields[1]
|
|
173
210
|
const tag = log.log[1];
|
|
174
211
|
this.logger.verbose(`Found tagged public log with tag ${tag.toString()} in block ${this.blockNumber}`);
|
|
175
212
|
this.publicLogs.push(log);
|
|
176
|
-
}
|
|
177
|
-
catch (err) {
|
|
213
|
+
} catch (err) {
|
|
178
214
|
this.logger.warn(`Failed to add tagged log to store: ${err}`);
|
|
179
215
|
}
|
|
180
216
|
});
|
|
@@ -213,12 +249,17 @@ export class TXE {
|
|
|
213
249
|
}
|
|
214
250
|
async getMembershipWitness(blockNumber, treeId, leafValue) {
|
|
215
251
|
const snap = this.nativeWorldStateService.getSnapshot(blockNumber);
|
|
216
|
-
const index = (await snap.findLeafIndices(treeId, [
|
|
252
|
+
const index = (await snap.findLeafIndices(treeId, [
|
|
253
|
+
leafValue.toBuffer()
|
|
254
|
+
]))[0];
|
|
217
255
|
if (index === undefined) {
|
|
218
256
|
throw new Error(`Leaf value: ${leafValue} not found in ${MerkleTreeId[treeId]} at block ${blockNumber}`);
|
|
219
257
|
}
|
|
220
258
|
const siblingPath = await snap.getSiblingPath(treeId, index);
|
|
221
|
-
return [
|
|
259
|
+
return [
|
|
260
|
+
new Fr(index),
|
|
261
|
+
...siblingPath.toFields()
|
|
262
|
+
];
|
|
222
263
|
}
|
|
223
264
|
async getSiblingPath(blockNumber, treeId, leafIndex) {
|
|
224
265
|
const snap = this.nativeWorldStateService.getSnapshot(blockNumber);
|
|
@@ -227,13 +268,18 @@ export class TXE {
|
|
|
227
268
|
}
|
|
228
269
|
async getNullifierMembershipWitness(blockNumber, nullifier) {
|
|
229
270
|
const snap = this.nativeWorldStateService.getSnapshot(blockNumber);
|
|
230
|
-
const [index] = await snap.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
271
|
+
const [index] = await snap.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
272
|
+
nullifier.toBuffer()
|
|
273
|
+
]);
|
|
231
274
|
if (!index) {
|
|
232
275
|
return undefined;
|
|
233
276
|
}
|
|
234
277
|
const leafPreimagePromise = snap.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
|
|
235
278
|
const siblingPathPromise = snap.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
|
|
236
|
-
const [leafPreimage, siblingPath] = await Promise.all([
|
|
279
|
+
const [leafPreimage, siblingPath] = await Promise.all([
|
|
280
|
+
leafPreimagePromise,
|
|
281
|
+
siblingPathPromise
|
|
282
|
+
]);
|
|
237
283
|
if (!leafPreimage) {
|
|
238
284
|
return undefined;
|
|
239
285
|
}
|
|
@@ -244,9 +290,8 @@ export class TXE {
|
|
|
244
290
|
const lowLeafResult = await snap.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
|
|
245
291
|
if (!lowLeafResult) {
|
|
246
292
|
return undefined;
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
const preimage = (await snap.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
|
|
293
|
+
} else {
|
|
294
|
+
const preimage = await snap.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
|
|
250
295
|
const path = await snap.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
|
|
251
296
|
return new PublicDataWitness(lowLeafResult.index, preimage, path);
|
|
252
297
|
}
|
|
@@ -261,7 +306,7 @@ export class TXE {
|
|
|
261
306
|
if (alreadyPresent) {
|
|
262
307
|
this.logger.warn(`Nullifier ${nullifier.toBigInt()} already exists in the tree`);
|
|
263
308
|
}
|
|
264
|
-
const preimageData =
|
|
309
|
+
const preimageData = await snap.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
|
|
265
310
|
const siblingPath = await snap.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
|
|
266
311
|
return new NullifierMembershipWitness(BigInt(index), preimageData, siblingPath);
|
|
267
312
|
}
|
|
@@ -289,23 +334,32 @@ export class TXE {
|
|
|
289
334
|
const pendingNotes = this.noteCache.getNotes(this.contractAddress, storageSlot);
|
|
290
335
|
const pendingNullifiers = this.noteCache.getNullifiers(this.contractAddress);
|
|
291
336
|
const dbNotes = await this.simulatorOracle.getNotes(this.contractAddress, storageSlot, status);
|
|
292
|
-
const dbNotesFiltered = dbNotes.filter(n
|
|
293
|
-
const notes = pickNotes([
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
337
|
+
const dbNotesFiltered = dbNotes.filter((n)=>!pendingNullifiers.has(n.siloedNullifier.value));
|
|
338
|
+
const notes = pickNotes([
|
|
339
|
+
...dbNotesFiltered,
|
|
340
|
+
...pendingNotes
|
|
341
|
+
], {
|
|
342
|
+
selects: selectByIndexes.slice(0, numSelects).map((index, i)=>({
|
|
343
|
+
selector: {
|
|
344
|
+
index,
|
|
345
|
+
offset: selectByOffsets[i],
|
|
346
|
+
length: selectByLengths[i]
|
|
347
|
+
},
|
|
348
|
+
value: selectValues[i],
|
|
349
|
+
comparator: selectComparators[i]
|
|
350
|
+
})),
|
|
351
|
+
sorts: sortByIndexes.map((index, i)=>({
|
|
352
|
+
selector: {
|
|
353
|
+
index,
|
|
354
|
+
offset: sortByOffsets[i],
|
|
355
|
+
length: sortByLengths[i]
|
|
356
|
+
},
|
|
357
|
+
order: sortOrder[i]
|
|
358
|
+
})),
|
|
303
359
|
limit,
|
|
304
|
-
offset
|
|
360
|
+
offset
|
|
305
361
|
});
|
|
306
|
-
this.logger.debug(`Returning ${notes.length} notes for ${this.contractAddress} at ${storageSlot}: ${notes
|
|
307
|
-
.map(n => `${n.nonce.toString()}:[${n.note.items.map(i => i.toString()).join(',')}]`)
|
|
308
|
-
.join(', ')}`);
|
|
362
|
+
this.logger.debug(`Returning ${notes.length} notes for ${this.contractAddress} at ${storageSlot}: ${notes.map((n)=>`${n.nonce.toString()}:[${n.note.items.map((i)=>i.toString()).join(',')}]`).join(', ')}`);
|
|
309
363
|
return notes;
|
|
310
364
|
}
|
|
311
365
|
notifyCreatedNote(storageSlot, _noteTypeId, noteItems, noteHash, counter) {
|
|
@@ -313,27 +367,33 @@ export class TXE {
|
|
|
313
367
|
this.noteCache.addNewNote({
|
|
314
368
|
contractAddress: this.contractAddress,
|
|
315
369
|
storageSlot,
|
|
316
|
-
nonce: Fr.ZERO,
|
|
370
|
+
nonce: Fr.ZERO,
|
|
317
371
|
note,
|
|
318
|
-
siloedNullifier: undefined,
|
|
319
|
-
noteHash
|
|
372
|
+
siloedNullifier: undefined,
|
|
373
|
+
noteHash
|
|
320
374
|
}, counter);
|
|
321
375
|
this.sideEffectCounter = counter + 1;
|
|
322
376
|
return Promise.resolve();
|
|
323
377
|
}
|
|
324
378
|
async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
325
|
-
await this.checkNullifiersNotInTree(this.contractAddress, [
|
|
379
|
+
await this.checkNullifiersNotInTree(this.contractAddress, [
|
|
380
|
+
innerNullifier
|
|
381
|
+
]);
|
|
326
382
|
await this.noteCache.nullifyNote(this.contractAddress, innerNullifier, noteHash);
|
|
327
383
|
this.sideEffectCounter = counter + 1;
|
|
328
384
|
}
|
|
329
385
|
async notifyCreatedNullifier(innerNullifier) {
|
|
330
|
-
await this.checkNullifiersNotInTree(this.contractAddress, [
|
|
386
|
+
await this.checkNullifiersNotInTree(this.contractAddress, [
|
|
387
|
+
innerNullifier
|
|
388
|
+
]);
|
|
331
389
|
await this.noteCache.nullifierCreated(this.contractAddress, innerNullifier);
|
|
332
390
|
}
|
|
333
391
|
async checkNullifierExists(innerNullifier) {
|
|
334
392
|
const snap = this.nativeWorldStateService.getSnapshot(this.blockNumber - 1);
|
|
335
393
|
const nullifier = await siloNullifier(this.contractAddress, innerNullifier);
|
|
336
|
-
const [index] = await snap.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
394
|
+
const [index] = await snap.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
395
|
+
nullifier.toBuffer()
|
|
396
|
+
]);
|
|
337
397
|
return index !== undefined;
|
|
338
398
|
}
|
|
339
399
|
getL1ToL2MembershipWitness(_contractAddress, _messageHash, _secret) {
|
|
@@ -343,18 +403,17 @@ export class TXE {
|
|
|
343
403
|
let db;
|
|
344
404
|
if (blockNumber === this.blockNumber) {
|
|
345
405
|
db = this.baseFork;
|
|
346
|
-
}
|
|
347
|
-
else {
|
|
406
|
+
} else {
|
|
348
407
|
db = this.nativeWorldStateService.getSnapshot(blockNumber);
|
|
349
408
|
}
|
|
350
409
|
const values = [];
|
|
351
|
-
for
|
|
410
|
+
for(let i = 0n; i < numberOfElements; i++){
|
|
352
411
|
const storageSlot = startStorageSlot.add(new Fr(i));
|
|
353
412
|
const leafSlot = (await computePublicDataTreeLeafSlot(contractAddress, storageSlot)).toBigInt();
|
|
354
413
|
const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
|
|
355
414
|
let value = Fr.ZERO;
|
|
356
415
|
if (lowLeafResult && lowLeafResult.alreadyPresent) {
|
|
357
|
-
const preimage =
|
|
416
|
+
const preimage = await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
|
|
358
417
|
value = preimage.value;
|
|
359
418
|
}
|
|
360
419
|
this.logger.debug(`Oracle storage read: slot=${storageSlot.toString()} value=${value}`);
|
|
@@ -363,51 +422,58 @@ export class TXE {
|
|
|
363
422
|
return values;
|
|
364
423
|
}
|
|
365
424
|
async storageWrite(startStorageSlot, values) {
|
|
366
|
-
const publicDataWrites = await Promise.all(values.map(async (value, i)
|
|
425
|
+
const publicDataWrites = await Promise.all(values.map(async (value, i)=>{
|
|
367
426
|
const storageSlot = startStorageSlot.add(new Fr(i));
|
|
368
427
|
this.logger.debug(`Oracle storage write: slot=${storageSlot.toString()} value=${value}`);
|
|
369
428
|
return new PublicDataWrite(await computePublicDataTreeLeafSlot(this.contractAddress, storageSlot), value);
|
|
370
429
|
}));
|
|
371
430
|
await this.addPublicDataWrites(publicDataWrites);
|
|
372
|
-
return publicDataWrites.map(write
|
|
431
|
+
return publicDataWrites.map((write)=>write.value);
|
|
373
432
|
}
|
|
374
433
|
async commitState() {
|
|
375
434
|
const blockNumber = await this.getBlockNumber();
|
|
376
435
|
const { usedTxRequestHashForNonces } = this.noteCache.finish();
|
|
377
436
|
if (this.committedBlocks.has(blockNumber)) {
|
|
378
437
|
throw new Error('Already committed state');
|
|
379
|
-
}
|
|
380
|
-
else {
|
|
438
|
+
} else {
|
|
381
439
|
this.committedBlocks.add(blockNumber);
|
|
382
440
|
}
|
|
383
441
|
const fork = this.baseFork;
|
|
384
442
|
const txEffect = TxEffect.empty();
|
|
385
443
|
const nonceGenerator = usedTxRequestHashForNonces ? this.getTxRequestHash() : this.noteCache.getAllNullifiers()[0];
|
|
386
444
|
let i = 0;
|
|
387
|
-
const uniqueNoteHashesFromPrivate = await Promise.all(this.noteCache
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
445
|
+
const uniqueNoteHashesFromPrivate = await Promise.all(this.noteCache.getAllNotes().map(async (pendingNote)=>computeUniqueNoteHash(await computeNoteHashNonce(nonceGenerator, i++), await siloNoteHash(pendingNote.note.contractAddress, pendingNote.noteHashForConsumption))));
|
|
446
|
+
txEffect.noteHashes = [
|
|
447
|
+
...uniqueNoteHashesFromPrivate,
|
|
448
|
+
...this.uniqueNoteHashesFromPublic
|
|
449
|
+
];
|
|
450
|
+
txEffect.nullifiers = [
|
|
451
|
+
...this.siloedNullifiersFromPublic,
|
|
452
|
+
...this.noteCache.getAllNullifiers()
|
|
453
|
+
];
|
|
392
454
|
if (usedTxRequestHashForNonces) {
|
|
393
455
|
txEffect.nullifiers.unshift(this.getTxRequestHash());
|
|
394
456
|
}
|
|
395
457
|
txEffect.publicDataWrites = this.publicDataWrites;
|
|
396
|
-
const body = new Body([
|
|
458
|
+
const body = new Body([
|
|
459
|
+
txEffect
|
|
460
|
+
]);
|
|
397
461
|
const l2Block = new L2Block(makeAppendOnlyTreeSnapshot(blockNumber + 1), makeHeader(0, blockNumber, blockNumber), body);
|
|
398
462
|
const paddedTxEffects = l2Block.body.txEffects;
|
|
399
463
|
const l1ToL2Messages = Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(0).map(Fr.zero);
|
|
400
464
|
{
|
|
401
|
-
const noteHashesPadded = paddedTxEffects.flatMap(txEffect
|
|
465
|
+
const noteHashesPadded = paddedTxEffects.flatMap((txEffect)=>padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
|
|
402
466
|
await fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
|
|
403
467
|
await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2Messages);
|
|
404
468
|
}
|
|
405
469
|
{
|
|
406
|
-
for (const txEffect of paddedTxEffects)
|
|
470
|
+
for (const txEffect of paddedTxEffects){
|
|
407
471
|
// We do not need to add public data writes because we apply them as we go. We use the sequentialInsert because
|
|
408
472
|
// the batchInsert was not working when updating a previously updated slot.
|
|
473
|
+
// FIXME: public data writes, note hashes, nullifiers, messages should all be handled in the same way.
|
|
474
|
+
// They are all relevant to subsequent enqueued calls and txs.
|
|
409
475
|
const nullifiersPadded = padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX);
|
|
410
|
-
await fork.batchInsert(MerkleTreeId.NULLIFIER_TREE, nullifiersPadded.map(nullifier
|
|
476
|
+
await fork.batchInsert(MerkleTreeId.NULLIFIER_TREE, nullifiersPadded.map((nullifier)=>nullifier.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
411
477
|
}
|
|
412
478
|
}
|
|
413
479
|
await this.node.setTxEffect(blockNumber, new TxHash(new Fr(blockNumber)), txEffect);
|
|
@@ -420,6 +486,11 @@ export class TXE {
|
|
|
420
486
|
header.globalVariables.blockNumber = new Fr(blockNumber);
|
|
421
487
|
l2Block.header = header;
|
|
422
488
|
await fork.updateArchive(l2Block.header);
|
|
489
|
+
// We've built a block with all of our state changes in a "fork".
|
|
490
|
+
// Now emulate a "sync" to this block, by letting cpp reapply the block's
|
|
491
|
+
// changes to the underlying unforked world state and comparing the results
|
|
492
|
+
// against the block's state reference (which is this state reference here in the fork).
|
|
493
|
+
// This essentially commits the state updates to the unforked state and sanity checks the roots.
|
|
423
494
|
await this.nativeWorldStateService.handleL2BlockAndMessages(l2Block, l1ToL2Messages);
|
|
424
495
|
this.publicDataWrites = [];
|
|
425
496
|
this.privateLogs = [];
|
|
@@ -449,14 +520,14 @@ export class TXE {
|
|
|
449
520
|
const initialWitness = await this.getInitialWitness(artifact, argsHash, sideEffectCounter, isStaticCall);
|
|
450
521
|
const acvmCallback = new Oracle(this);
|
|
451
522
|
const timer = new Timer();
|
|
452
|
-
const acirExecutionResult = await this.simulationProvider
|
|
453
|
-
.executeUserCircuit(acir, initialWitness, acvmCallback)
|
|
454
|
-
.catch((err) => {
|
|
523
|
+
const acirExecutionResult = await this.simulationProvider.executeUserCircuit(acir, initialWitness, acvmCallback).catch((err)=>{
|
|
455
524
|
err.message = resolveAssertionMessageFromError(err, artifact);
|
|
456
525
|
const execError = new ExecutionError(err.message, {
|
|
457
526
|
contractAddress: targetContractAddress,
|
|
458
|
-
functionSelector
|
|
459
|
-
}, extractCallStack(err, artifact.debug), {
|
|
527
|
+
functionSelector
|
|
528
|
+
}, extractCallStack(err, artifact.debug), {
|
|
529
|
+
cause: err
|
|
530
|
+
});
|
|
460
531
|
this.logger.debug(`Error executing private function ${targetContractAddress}:${functionSelector}`);
|
|
461
532
|
throw createSimulationError(execError);
|
|
462
533
|
});
|
|
@@ -469,16 +540,19 @@ export class TXE {
|
|
|
469
540
|
eventName: 'circuit-witness-generation',
|
|
470
541
|
inputSize: initialWitnessSize,
|
|
471
542
|
outputSize: publicInputs.toBuffer().length,
|
|
472
|
-
appCircuitName: 'noname'
|
|
543
|
+
appCircuitName: 'noname'
|
|
473
544
|
});
|
|
474
545
|
// Apply side effects
|
|
475
546
|
const endSideEffectCounter = publicInputs.endSideEffectCounter;
|
|
476
547
|
this.sideEffectCounter = endSideEffectCounter.toNumber() + 1;
|
|
477
|
-
await this.addPrivateLogs(targetContractAddress, publicInputs.privateLogs.filter(privateLog
|
|
548
|
+
await this.addPrivateLogs(targetContractAddress, publicInputs.privateLogs.filter((privateLog)=>!privateLog.isEmpty()).map((privateLog)=>privateLog.log));
|
|
478
549
|
this.setContractAddress(currentContractAddress);
|
|
479
550
|
this.setMsgSender(currentMessageSender);
|
|
480
551
|
this.setFunctionSelector(currentFunctionSelector);
|
|
481
|
-
return {
|
|
552
|
+
return {
|
|
553
|
+
endSideEffectCounter,
|
|
554
|
+
returnsHash: publicInputs.returnsHash
|
|
555
|
+
};
|
|
482
556
|
}
|
|
483
557
|
async getInitialWitness(abi, argsHash, sideEffectCounter, isStaticCall) {
|
|
484
558
|
const argumentsSize = countArgumentsSize(abi);
|
|
@@ -491,7 +565,10 @@ export class TXE {
|
|
|
491
565
|
if (privateContextInputsAsFields.length !== PRIVATE_CONTEXT_INPUTS_LENGTH) {
|
|
492
566
|
throw new Error('Invalid private context inputs size');
|
|
493
567
|
}
|
|
494
|
-
const fields = [
|
|
568
|
+
const fields = [
|
|
569
|
+
...privateContextInputsAsFields,
|
|
570
|
+
...args
|
|
571
|
+
];
|
|
495
572
|
return toACVMWitness(0, fields);
|
|
496
573
|
}
|
|
497
574
|
async getDebugFunctionName(address, selector) {
|
|
@@ -499,15 +576,15 @@ export class TXE {
|
|
|
499
576
|
if (!instance) {
|
|
500
577
|
return undefined;
|
|
501
578
|
}
|
|
502
|
-
const artifact = await this.contractDataOracle.getContractArtifact(instance.
|
|
579
|
+
const artifact = await this.contractDataOracle.getContractArtifact(instance.currentContractClassId);
|
|
503
580
|
if (!artifact) {
|
|
504
581
|
return undefined;
|
|
505
582
|
}
|
|
506
|
-
const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f)
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
const functionSelectorAndName = functionSelectorsAndNames.find(f
|
|
583
|
+
const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f)=>({
|
|
584
|
+
name: f.name,
|
|
585
|
+
selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters)
|
|
586
|
+
})));
|
|
587
|
+
const functionSelectorAndName = functionSelectorsAndNames.find((f)=>f.selector.equals(selector));
|
|
511
588
|
if (!functionSelectorAndName) {
|
|
512
589
|
return undefined;
|
|
513
590
|
}
|
|
@@ -521,23 +598,35 @@ export class TXE {
|
|
|
521
598
|
globalVariables.version = new Fr(await this.node.getVersion());
|
|
522
599
|
globalVariables.blockNumber = new Fr(this.blockNumber);
|
|
523
600
|
globalVariables.gasFees = new GasFees(1, 1);
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
601
|
+
let result;
|
|
602
|
+
// Checkpoint here so that we can revert merkle ops after simulation.
|
|
603
|
+
// See note at revert below.
|
|
604
|
+
const checkpoint = await ForkCheckpoint.new(db);
|
|
605
|
+
try {
|
|
606
|
+
const simulator = new PublicTxSimulator(db, new TXEWorldStateDB(db, new TXEPublicContractDataSource(this), this), globalVariables, /*doMerkleOperations=*/ true);
|
|
607
|
+
const { usedTxRequestHashForNonces } = this.noteCache.finish();
|
|
608
|
+
const firstNullifier = usedTxRequestHashForNonces ? this.getTxRequestHash() : this.noteCache.getAllNullifiers()[0];
|
|
609
|
+
// When setting up a teardown call, we tell it that
|
|
610
|
+
// private execution used Gas(1, 1) so it can compute a tx fee.
|
|
611
|
+
const gasUsedByPrivate = isTeardown ? new Gas(1, 1) : Gas.empty();
|
|
612
|
+
const tx = await createTxForPublicCalls(firstNullifier, /*setupExecutionRequests=*/ [], /*appExecutionRequests=*/ isTeardown ? [] : [
|
|
613
|
+
executionRequest
|
|
614
|
+
], /*teardownExecutionRequests=*/ isTeardown ? executionRequest : undefined, /*feePayer=*/ AztecAddress.zero(), gasUsedByPrivate);
|
|
615
|
+
result = await simulator.simulate(tx);
|
|
616
|
+
} finally{
|
|
617
|
+
// NOTE: Don't accept any merkle updates from the AVM since this was just 1 enqueued call
|
|
618
|
+
// and the TXE will re-apply all txEffects after entire execution (all enqueued calls)
|
|
619
|
+
// complete.
|
|
620
|
+
await checkpoint.revert();
|
|
621
|
+
// If an error is thrown during the above simulation, this revert is the last
|
|
622
|
+
// thing executed and we skip the postprocessing below.
|
|
623
|
+
}
|
|
624
|
+
const noteHashes = result.avmProvingRequest.inputs.publicInputs.accumulatedData.noteHashes.filter((s)=>!s.isEmpty());
|
|
625
|
+
const publicDataWrites = result.avmProvingRequest.inputs.publicInputs.accumulatedData.publicDataWrites.filter((s)=>!s.isEmpty());
|
|
626
|
+
// For now, public data writes are the only merkle operations that are readable by later enqueued calls in the TXE.
|
|
538
627
|
await this.addPublicDataWrites(publicDataWrites);
|
|
539
628
|
this.addUniqueNoteHashesFromPublic(noteHashes);
|
|
540
|
-
this.addPublicLogs(result.avmProvingRequest.inputs.publicInputs.accumulatedData.publicLogs.filter(log
|
|
629
|
+
this.addPublicLogs(result.avmProvingRequest.inputs.publicInputs.accumulatedData.publicLogs.filter((log)=>!log.contractAddress.equals(AztecAddress.ZERO)));
|
|
541
630
|
return Promise.resolve(result);
|
|
542
631
|
}
|
|
543
632
|
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, _sideEffectCounter, isStaticCall, isTeardown = false) {
|
|
@@ -548,9 +637,11 @@ export class TXE {
|
|
|
548
637
|
this.setMsgSender(this.contractAddress);
|
|
549
638
|
this.setContractAddress(targetContractAddress);
|
|
550
639
|
this.setFunctionSelector(functionSelector);
|
|
551
|
-
const callContext = new CallContext(
|
|
552
|
-
|
|
553
|
-
|
|
640
|
+
const callContext = new CallContext(/* msgSender */ currentContractAddress, targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), isStaticCall);
|
|
641
|
+
const args = [
|
|
642
|
+
this.functionSelector.toField(),
|
|
643
|
+
...this.executionCache.getPreimage(argsHash)
|
|
644
|
+
];
|
|
554
645
|
const newArgsHash = await this.executionCache.store(args);
|
|
555
646
|
const executionResult = await this.executePublicFunction(args, callContext, isTeardown);
|
|
556
647
|
// Poor man's revert handling
|
|
@@ -558,8 +649,7 @@ export class TXE {
|
|
|
558
649
|
if (executionResult.revertReason && executionResult.revertReason instanceof SimulationError) {
|
|
559
650
|
await enrichPublicSimulationError(executionResult.revertReason, this.contractDataOracle, this.txeDatabase, this.logger);
|
|
560
651
|
throw new Error(executionResult.revertReason.message);
|
|
561
|
-
}
|
|
562
|
-
else {
|
|
652
|
+
} else {
|
|
563
653
|
throw new Error(`Enqueued public function call reverted: ${executionResult.revertReason}`);
|
|
564
654
|
}
|
|
565
655
|
}
|
|
@@ -567,7 +657,7 @@ export class TXE {
|
|
|
567
657
|
const sideEffects = executionResult.avmProvingRequest.inputs.publicInputs.accumulatedData;
|
|
568
658
|
const { usedTxRequestHashForNonces } = this.noteCache.finish();
|
|
569
659
|
const firstNullifier = usedTxRequestHashForNonces ? this.getTxRequestHash() : this.noteCache.getAllNullifiers()[0];
|
|
570
|
-
const nullifiers = sideEffects.nullifiers.filter(s
|
|
660
|
+
const nullifiers = sideEffects.nullifiers.filter((s)=>!s.isEmpty()).filter((s)=>!s.equals(firstNullifier));
|
|
571
661
|
// For some reason we cannot move this up to 'executePublicFunction'. It gives us an error of trying to modify the same nullifier twice.
|
|
572
662
|
this.addSiloedNullifiersFromPublic(nullifiers);
|
|
573
663
|
this.setContractAddress(currentContractAddress);
|
|
@@ -578,28 +668,47 @@ export class TXE {
|
|
|
578
668
|
async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
579
669
|
// Definitely not right, in that the teardown should always be last.
|
|
580
670
|
// But useful for executing flows.
|
|
581
|
-
return await this.enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall,
|
|
582
|
-
/*isTeardown=*/ true);
|
|
671
|
+
return await this.enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, /*isTeardown=*/ true);
|
|
583
672
|
}
|
|
584
673
|
async notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
585
674
|
await this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
586
675
|
}
|
|
587
676
|
debugLog(message, fields) {
|
|
588
|
-
this.logger.verbose(`${applyStringFormatting(message, fields)}`, {
|
|
677
|
+
this.logger.verbose(`${applyStringFormatting(message, fields)}`, {
|
|
678
|
+
module: `${this.logger.module}:debug_log`
|
|
679
|
+
});
|
|
589
680
|
}
|
|
590
681
|
async incrementAppTaggingSecretIndexAsSender(sender, recipient) {
|
|
591
|
-
const appSecret = await
|
|
592
|
-
const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
|
|
593
|
-
|
|
682
|
+
const appSecret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
683
|
+
const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
|
|
684
|
+
appSecret
|
|
685
|
+
]);
|
|
686
|
+
await this.txeDatabase.setTaggingSecretsIndexesAsSender([
|
|
687
|
+
new IndexedTaggingSecret(appSecret, index + 1)
|
|
688
|
+
]);
|
|
594
689
|
}
|
|
595
690
|
async getIndexedTaggingSecretAsSender(sender, recipient) {
|
|
596
|
-
const secret = await
|
|
597
|
-
const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
|
|
691
|
+
const secret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
692
|
+
const [index] = await this.txeDatabase.getTaggingSecretsIndexesAsSender([
|
|
693
|
+
secret
|
|
694
|
+
]);
|
|
598
695
|
return new IndexedTaggingSecret(secret, index);
|
|
599
696
|
}
|
|
697
|
+
async #calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
698
|
+
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
699
|
+
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
700
|
+
const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
701
|
+
// Silo the secret to the app so it can't be used to track other app's notes
|
|
702
|
+
const appSecret = poseidon2Hash([
|
|
703
|
+
secretPoint.x,
|
|
704
|
+
secretPoint.y,
|
|
705
|
+
contractAddress
|
|
706
|
+
]);
|
|
707
|
+
return appSecret;
|
|
708
|
+
}
|
|
600
709
|
async syncNotes() {
|
|
601
710
|
const taggedLogsByRecipient = await this.simulatorOracle.syncTaggedLogs(this.contractAddress, await this.getBlockNumber(), undefined);
|
|
602
|
-
for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries())
|
|
711
|
+
for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()){
|
|
603
712
|
await this.simulatorOracle.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
|
|
604
713
|
}
|
|
605
714
|
await this.simulatorOracle.removeNullifiedNotes(this.contractAddress);
|
|
@@ -608,6 +717,9 @@ export class TXE {
|
|
|
608
717
|
deliverNote(_contractAddress, _storageSlot, _nonce, _content, _noteHash, _nullifier, _txHash, _recipient) {
|
|
609
718
|
throw new Error('deliverNote');
|
|
610
719
|
}
|
|
720
|
+
async getLogByTag(tag) {
|
|
721
|
+
return await this.simulatorOracle.getLogByTag(tag);
|
|
722
|
+
}
|
|
611
723
|
// AVM oracles
|
|
612
724
|
async avmOpcodeCall(targetContractAddress, args, isStaticCall) {
|
|
613
725
|
// Store and modify env
|
|
@@ -615,21 +727,18 @@ export class TXE {
|
|
|
615
727
|
const currentMessageSender = this.msgSender;
|
|
616
728
|
this.setMsgSender(this.contractAddress);
|
|
617
729
|
this.setContractAddress(targetContractAddress);
|
|
618
|
-
const callContext = new CallContext(
|
|
619
|
-
/* msgSender */ currentContractAddress, targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), isStaticCall);
|
|
730
|
+
const callContext = new CallContext(/* msgSender */ currentContractAddress, targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), isStaticCall);
|
|
620
731
|
const executionResult = await this.executePublicFunction(args, callContext);
|
|
621
732
|
// Save return/revert data for later.
|
|
622
733
|
this.nestedCallReturndata = executionResult.processedPhases[0].returnValues[0].values;
|
|
623
734
|
// Apply side effects
|
|
624
735
|
if (executionResult.revertCode.isOK()) {
|
|
625
736
|
const sideEffects = executionResult.avmProvingRequest.inputs.publicInputs.accumulatedData;
|
|
626
|
-
const publicDataWrites = sideEffects.publicDataWrites.filter(s
|
|
627
|
-
const noteHashes = sideEffects.noteHashes.filter(s
|
|
737
|
+
const publicDataWrites = sideEffects.publicDataWrites.filter((s)=>!s.isEmpty());
|
|
738
|
+
const noteHashes = sideEffects.noteHashes.filter((s)=>!s.isEmpty());
|
|
628
739
|
const { usedTxRequestHashForNonces } = this.noteCache.finish();
|
|
629
|
-
const firstNullifier = usedTxRequestHashForNonces
|
|
630
|
-
|
|
631
|
-
: this.noteCache.getAllNullifiers()[0];
|
|
632
|
-
const nullifiers = sideEffects.nullifiers.filter(s => !s.isEmpty()).filter(s => !s.equals(firstNullifier));
|
|
740
|
+
const firstNullifier = usedTxRequestHashForNonces ? this.getTxRequestHash() : this.noteCache.getAllNullifiers()[0];
|
|
741
|
+
const nullifiers = sideEffects.nullifiers.filter((s)=>!s.isEmpty()).filter((s)=>!s.equals(firstNullifier));
|
|
633
742
|
await this.addPublicDataWrites(publicDataWrites);
|
|
634
743
|
this.addUniqueNoteHashesFromPublic(noteHashes);
|
|
635
744
|
this.addSiloedNullifiersFromPublic(nullifiers);
|
|
@@ -647,18 +756,24 @@ export class TXE {
|
|
|
647
756
|
async avmOpcodeNullifierExists(innerNullifier, targetAddress) {
|
|
648
757
|
const nullifier = await siloNullifier(targetAddress, innerNullifier);
|
|
649
758
|
const db = this.baseFork;
|
|
650
|
-
const index = (await db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
759
|
+
const index = (await db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
|
|
760
|
+
nullifier.toBuffer()
|
|
761
|
+
]))[0];
|
|
651
762
|
return index !== undefined;
|
|
652
763
|
}
|
|
653
764
|
async avmOpcodeEmitNullifier(nullifier) {
|
|
654
765
|
const siloedNullifier = await siloNullifier(this.contractAddress, nullifier);
|
|
655
|
-
this.addSiloedNullifiersFromPublic([
|
|
766
|
+
this.addSiloedNullifiersFromPublic([
|
|
767
|
+
siloedNullifier
|
|
768
|
+
]);
|
|
656
769
|
return Promise.resolve();
|
|
657
770
|
}
|
|
658
771
|
// Doesn't this need to get hashed w/ the nonce ?
|
|
659
772
|
async avmOpcodeEmitNoteHash(noteHash) {
|
|
660
773
|
const siloedNoteHash = await siloNoteHash(this.contractAddress, noteHash);
|
|
661
|
-
this.addUniqueNoteHashesFromPublic([
|
|
774
|
+
this.addUniqueNoteHashesFromPublic([
|
|
775
|
+
siloedNoteHash
|
|
776
|
+
]);
|
|
662
777
|
return Promise.resolve();
|
|
663
778
|
}
|
|
664
779
|
async avmOpcodeStorageRead(slot) {
|
|
@@ -667,7 +782,7 @@ export class TXE {
|
|
|
667
782
|
if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
|
|
668
783
|
return Fr.ZERO;
|
|
669
784
|
}
|
|
670
|
-
const preimage =
|
|
785
|
+
const preimage = await this.baseFork.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
|
|
671
786
|
return preimage.value;
|
|
672
787
|
}
|
|
673
788
|
storeCapsule(contractAddress, slot, capsule) {
|
|
@@ -702,12 +817,3 @@ export class TXE {
|
|
|
702
817
|
return this.viewDataOracle.aes128Decrypt(ciphertext, iv, symKey);
|
|
703
818
|
}
|
|
704
819
|
}
|
|
705
|
-
_TXE_instances = new WeakSet(), _TXE_calculateAppTaggingSecret = async function _TXE_calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
706
|
-
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
707
|
-
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
708
|
-
const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
709
|
-
// Silo the secret to the app so it can't be used to track other app's notes
|
|
710
|
-
const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
|
|
711
|
-
return appSecret;
|
|
712
|
-
};
|
|
713
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_oracle.js","sourceRoot":"","sources":["../../src/oracle/txe_oracle.ts"],"names":[],"mappings":"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"}
|