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