@aztec/pxe 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/config/index.js +18 -21
- package/dest/config/package_info.js +4 -2
- package/dest/contract_data_oracle/index.js +69 -79
- package/dest/contract_data_oracle/private_functions_tree.js +44 -50
- package/dest/database/contracts/contract_artifact_db.js +3 -2
- package/dest/database/contracts/contract_instance_db.js +3 -2
- package/dest/database/index.js +0 -1
- package/dest/database/kv_pxe_database.js +243 -259
- package/dest/database/note_dao.js +28 -43
- package/dest/database/outgoing_note_dao.js +20 -34
- package/dest/database/pxe_database.js +4 -2
- package/dest/database/pxe_database_test_suite.js +296 -151
- package/dest/index.js +0 -1
- package/dest/kernel_oracle/index.js +9 -6
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +68 -66
- package/dest/kernel_prover/hints/index.js +0 -1
- package/dest/kernel_prover/index.js +0 -1
- package/dest/kernel_prover/kernel_prover.js +60 -65
- package/dest/kernel_prover/proving_data_oracle.js +4 -2
- package/dest/note_decryption_utils/add_public_values_to_payload.js +8 -9
- package/dest/pxe_http/index.js +0 -1
- package/dest/pxe_http/pxe_http_server.js +8 -6
- package/dest/pxe_service/error_enriching.js +10 -13
- package/dest/pxe_service/index.js +0 -1
- package/dest/pxe_service/pxe_service.js +282 -290
- package/dest/pxe_service/test/pxe_test_suite.js +40 -27
- package/dest/simulator/index.js +1 -3
- package/dest/simulator_oracle/index.js +266 -231
- package/dest/simulator_oracle/tagging_utils.js +4 -6
- package/dest/synchronizer/index.js +0 -1
- package/dest/synchronizer/synchronizer.js +42 -42
- package/dest/utils/create_pxe_service.js +9 -9
- package/package.json +15 -15
- package/src/pxe_service/pxe_service.ts +6 -11
- package/dest/bin/index.d.ts +0 -3
- package/dest/bin/index.d.ts.map +0 -1
- package/dest/config/index.d.ts +0 -46
- package/dest/config/index.d.ts.map +0 -1
- package/dest/config/package_info.d.ts +0 -5
- package/dest/config/package_info.d.ts.map +0 -1
- package/dest/contract_data_oracle/index.d.ts +0 -104
- package/dest/contract_data_oracle/index.d.ts.map +0 -1
- package/dest/contract_data_oracle/private_functions_tree.d.ts +0 -65
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +0 -1
- package/dest/database/contracts/contract_artifact_db.d.ts +0 -20
- package/dest/database/contracts/contract_artifact_db.d.ts.map +0 -1
- package/dest/database/contracts/contract_instance_db.d.ts +0 -19
- package/dest/database/contracts/contract_instance_db.d.ts.map +0 -1
- package/dest/database/index.d.ts +0 -3
- package/dest/database/index.d.ts.map +0 -1
- package/dest/database/kv_pxe_database.d.ts +0 -55
- package/dest/database/kv_pxe_database.d.ts.map +0 -1
- package/dest/database/note_dao.d.ts +0 -103
- package/dest/database/note_dao.d.ts.map +0 -1
- package/dest/database/outgoing_note_dao.d.ts +0 -73
- package/dest/database/outgoing_note_dao.d.ts.map +0 -1
- package/dest/database/pxe_database.d.ts +0 -216
- package/dest/database/pxe_database.d.ts.map +0 -1
- package/dest/database/pxe_database_test_suite.d.ts +0 -7
- package/dest/database/pxe_database_test_suite.d.ts.map +0 -1
- package/dest/index.d.ts +0 -15
- package/dest/index.d.ts.map +0 -1
- package/dest/kernel_oracle/index.d.ts +0 -34
- package/dest/kernel_oracle/index.d.ts.map +0 -1
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts +0 -28
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts.map +0 -1
- package/dest/kernel_prover/hints/index.d.ts +0 -2
- package/dest/kernel_prover/hints/index.d.ts.map +0 -1
- package/dest/kernel_prover/index.d.ts +0 -3
- package/dest/kernel_prover/index.d.ts.map +0 -1
- package/dest/kernel_prover/kernel_prover.d.ts +0 -38
- package/dest/kernel_prover/kernel_prover.d.ts.map +0 -1
- package/dest/kernel_prover/proving_data_oracle.d.ts +0 -65
- package/dest/kernel_prover/proving_data_oracle.d.ts.map +0 -1
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts +0 -10
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts.map +0 -1
- package/dest/pxe_http/index.d.ts +0 -2
- package/dest/pxe_http/index.d.ts.map +0 -1
- package/dest/pxe_http/pxe_http_server.d.ts +0 -16
- package/dest/pxe_http/pxe_http_server.d.ts.map +0 -1
- package/dest/pxe_service/error_enriching.d.ts +0 -11
- package/dest/pxe_service/error_enriching.d.ts.map +0 -1
- package/dest/pxe_service/index.d.ts +0 -4
- package/dest/pxe_service/index.d.ts.map +0 -1
- package/dest/pxe_service/pxe_service.d.ts +0 -98
- package/dest/pxe_service/pxe_service.d.ts.map +0 -1
- package/dest/pxe_service/test/pxe_test_suite.d.ts +0 -3
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +0 -1
- package/dest/simulator/index.d.ts +0 -10
- package/dest/simulator/index.d.ts.map +0 -1
- package/dest/simulator_oracle/index.d.ts +0 -129
- package/dest/simulator_oracle/index.d.ts.map +0 -1
- package/dest/simulator_oracle/tagging_utils.d.ts +0 -16
- package/dest/simulator_oracle/tagging_utils.d.ts.map +0 -1
- package/dest/synchronizer/index.d.ts +0 -2
- package/dest/synchronizer/index.d.ts.map +0 -1
- package/dest/synchronizer/synchronizer.d.ts +0 -30
- package/dest/synchronizer/synchronizer.d.ts.map +0 -1
- package/dest/utils/create_pxe_service.d.ts +0 -16
- package/dest/utils/create_pxe_service.d.ts.map +0 -1
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { L1NotePayload, MerkleTreeId, Note, TxHash, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
|
|
4
|
-
import { Fr, FunctionSelector, IndexedTaggingSecret, MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS, PrivateLog, PublicLog, computeAddressSecret, computeTaggingSecretPoint, } from '@aztec/circuits.js';
|
|
1
|
+
import { L1NotePayload, MerkleTreeId, Note, TxHash, getNonNullifiedL1ToL2MessageWitness } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr, FunctionSelector, IndexedTaggingSecret, MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS, PrivateLog, PublicLog, computeAddressSecret, computeTaggingSecretPoint } from '@aztec/circuits.js';
|
|
5
3
|
import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
|
|
6
|
-
import { FunctionType, NoteSelector, encodeArguments, getFunctionArtifact
|
|
4
|
+
import { FunctionType, NoteSelector, encodeArguments, getFunctionArtifact } from '@aztec/foundation/abi';
|
|
7
5
|
import { timesParallel } from '@aztec/foundation/collection';
|
|
8
6
|
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
9
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
10
|
-
import { MessageLoadOracleInputs
|
|
8
|
+
import { MessageLoadOracleInputs } from '@aztec/simulator/client';
|
|
11
9
|
import { ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
12
10
|
import { NoteDao } from '../database/note_dao.js';
|
|
13
11
|
import { getOrderedNoteItems } from '../note_decryption_utils/add_public_values_to_payload.js';
|
|
@@ -15,10 +13,14 @@ import { getAcirSimulator } from '../simulator/index.js';
|
|
|
15
13
|
import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
|
|
16
14
|
/**
|
|
17
15
|
* A data oracle that provides information needed for simulating a transaction.
|
|
18
|
-
*/
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
16
|
+
*/ export class SimulatorOracle {
|
|
17
|
+
contractDataOracle;
|
|
18
|
+
db;
|
|
19
|
+
keyStore;
|
|
20
|
+
aztecNode;
|
|
21
|
+
simulationProvider;
|
|
22
|
+
log;
|
|
23
|
+
constructor(contractDataOracle, db, keyStore, aztecNode, simulationProvider, log = createLogger('pxe:simulator_oracle')){
|
|
22
24
|
this.contractDataOracle = contractDataOracle;
|
|
23
25
|
this.db = db;
|
|
24
26
|
this.keyStore = keyStore;
|
|
@@ -63,25 +65,25 @@ export class SimulatorOracle {
|
|
|
63
65
|
contractAddress,
|
|
64
66
|
storageSlot,
|
|
65
67
|
status,
|
|
66
|
-
scopes
|
|
68
|
+
scopes
|
|
67
69
|
});
|
|
68
|
-
return noteDaos.map(({ contractAddress, storageSlot, nonce, note, noteHash, siloedNullifier, index })
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
70
|
+
return noteDaos.map(({ contractAddress, storageSlot, nonce, note, noteHash, siloedNullifier, index })=>({
|
|
71
|
+
contractAddress,
|
|
72
|
+
storageSlot,
|
|
73
|
+
nonce,
|
|
74
|
+
note,
|
|
75
|
+
noteHash,
|
|
76
|
+
siloedNullifier,
|
|
77
|
+
// PXE can use this index to get full MembershipWitness
|
|
78
|
+
index
|
|
79
|
+
}));
|
|
78
80
|
}
|
|
79
81
|
async getFunctionArtifact(contractAddress, selector) {
|
|
80
82
|
const artifact = await this.contractDataOracle.getFunctionArtifact(contractAddress, selector);
|
|
81
83
|
const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, selector);
|
|
82
84
|
return {
|
|
83
85
|
...artifact,
|
|
84
|
-
debug
|
|
86
|
+
debug
|
|
85
87
|
};
|
|
86
88
|
}
|
|
87
89
|
async getFunctionArtifactByName(contractAddress, functionName) {
|
|
@@ -90,14 +92,13 @@ export class SimulatorOracle {
|
|
|
90
92
|
return artifact && getFunctionArtifact(artifact, functionName);
|
|
91
93
|
}
|
|
92
94
|
/**
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
95
|
+
* Fetches a message from the db, given its key.
|
|
96
|
+
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
97
|
+
* @param messageHash - Hash of the message.
|
|
98
|
+
* @param secret - Secret used to compute a nullifier.
|
|
99
|
+
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
100
|
+
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
101
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
101
102
|
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
102
103
|
// Assuming messageIndex is what you intended to use for the index in MessageLoadOracleInputs
|
|
103
104
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
@@ -107,27 +108,49 @@ export class SimulatorOracle {
|
|
|
107
108
|
throw new Error('Unimplemented in private!');
|
|
108
109
|
}
|
|
109
110
|
/**
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
return await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_findLeafIndex).call(this, 'latest', MerkleTreeId.NOTE_HASH_TREE, commitment);
|
|
111
|
+
* Gets the index of a commitment in the note hash tree.
|
|
112
|
+
* @param commitment - The commitment.
|
|
113
|
+
* @returns - The index of the commitment. Undefined if it does not exist in the tree.
|
|
114
|
+
*/ async getCommitmentIndex(commitment) {
|
|
115
|
+
return await this.#findLeafIndex('latest', MerkleTreeId.NOTE_HASH_TREE, commitment);
|
|
116
116
|
}
|
|
117
117
|
// We need this in public as part of the EXISTS calls - but isn't used in private
|
|
118
118
|
getCommitmentValue(_leafIndex) {
|
|
119
119
|
throw new Error('Unimplemented in private!');
|
|
120
120
|
}
|
|
121
121
|
async getNullifierIndex(nullifier) {
|
|
122
|
-
return await
|
|
122
|
+
return await this.#findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
|
|
123
|
+
}
|
|
124
|
+
async #findLeafIndex(blockNumber, treeId, leafValue) {
|
|
125
|
+
const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [
|
|
126
|
+
leafValue
|
|
127
|
+
]);
|
|
128
|
+
return leafIndex;
|
|
123
129
|
}
|
|
124
130
|
async getMembershipWitness(blockNumber, treeId, leafValue) {
|
|
125
|
-
const leafIndex = await
|
|
131
|
+
const leafIndex = await this.#findLeafIndex(blockNumber, treeId, leafValue);
|
|
126
132
|
if (!leafIndex) {
|
|
127
133
|
throw new Error(`Leaf value: ${leafValue} not found in ${MerkleTreeId[treeId]}`);
|
|
128
134
|
}
|
|
129
|
-
const siblingPath = await
|
|
130
|
-
return [
|
|
135
|
+
const siblingPath = await this.#getSiblingPath(blockNumber, treeId, leafIndex);
|
|
136
|
+
return [
|
|
137
|
+
new Fr(leafIndex),
|
|
138
|
+
...siblingPath
|
|
139
|
+
];
|
|
140
|
+
}
|
|
141
|
+
async #getSiblingPath(blockNumber, treeId, leafIndex) {
|
|
142
|
+
switch(treeId){
|
|
143
|
+
case MerkleTreeId.NULLIFIER_TREE:
|
|
144
|
+
return (await this.aztecNode.getNullifierSiblingPath(blockNumber, leafIndex)).toFields();
|
|
145
|
+
case MerkleTreeId.NOTE_HASH_TREE:
|
|
146
|
+
return (await this.aztecNode.getNoteHashSiblingPath(blockNumber, leafIndex)).toFields();
|
|
147
|
+
case MerkleTreeId.PUBLIC_DATA_TREE:
|
|
148
|
+
return (await this.aztecNode.getPublicDataSiblingPath(blockNumber, leafIndex)).toFields();
|
|
149
|
+
case MerkleTreeId.ARCHIVE:
|
|
150
|
+
return (await this.aztecNode.getArchiveSiblingPath(blockNumber, leafIndex)).toFields();
|
|
151
|
+
default:
|
|
152
|
+
throw new Error('Not implemented');
|
|
153
|
+
}
|
|
131
154
|
}
|
|
132
155
|
async getNullifierMembershipWitnessAtLatestBlock(nullifier) {
|
|
133
156
|
return this.getNullifierMembershipWitness(await this.getBlockNumber(), nullifier);
|
|
@@ -145,76 +168,118 @@ export class SimulatorOracle {
|
|
|
145
168
|
return await this.aztecNode.getPublicDataTreeWitness(blockNumber, leafSlot);
|
|
146
169
|
}
|
|
147
170
|
/**
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
getBlockHeader() {
|
|
171
|
+
* Retrieve the databases view of the Block Header object.
|
|
172
|
+
* This structure is fed into the circuits simulator and is used to prove against certain historical roots.
|
|
173
|
+
*
|
|
174
|
+
* @returns A Promise that resolves to a BlockHeader object.
|
|
175
|
+
*/ getBlockHeader() {
|
|
154
176
|
return this.db.getBlockHeader();
|
|
155
177
|
}
|
|
156
178
|
/**
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
async getBlockNumber() {
|
|
179
|
+
* Fetches the current block number.
|
|
180
|
+
* @returns The block number.
|
|
181
|
+
*/ async getBlockNumber() {
|
|
161
182
|
return await this.aztecNode.getBlockNumber();
|
|
162
183
|
}
|
|
163
184
|
getDebugFunctionName(contractAddress, selector) {
|
|
164
185
|
return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
|
|
165
186
|
}
|
|
166
187
|
/**
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
getSenders() {
|
|
188
|
+
* Returns the full contents of your address book.
|
|
189
|
+
* This is used when calculating tags for incoming notes by deriving the shared secret, the contract-siloed tagging secret, and
|
|
190
|
+
* finally the index specified tag. We will then query the node with this tag for each address in the address book.
|
|
191
|
+
* @returns The full list of the users contact addresses.
|
|
192
|
+
*/ getSenders() {
|
|
173
193
|
return this.db.getSenderAddresses();
|
|
174
194
|
}
|
|
175
195
|
/**
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
async getIndexedTaggingSecretAsSender(contractAddress, sender, recipient) {
|
|
196
|
+
* Returns the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
|
|
197
|
+
* Includes the next index to be used used for tagging with this secret.
|
|
198
|
+
* @param contractAddress - The contract address to silo the secret for
|
|
199
|
+
* @param sender - The address sending the note
|
|
200
|
+
* @param recipient - The address receiving the note
|
|
201
|
+
* @returns An indexed tagging secret that can be used to tag notes.
|
|
202
|
+
*/ async getIndexedTaggingSecretAsSender(contractAddress, sender, recipient) {
|
|
184
203
|
await this.syncTaggedLogsAsSender(contractAddress, sender, recipient);
|
|
185
|
-
const appTaggingSecret = await
|
|
186
|
-
const [index] = await this.db.getTaggingSecretsIndexesAsSender([
|
|
204
|
+
const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
|
|
205
|
+
const [index] = await this.db.getTaggingSecretsIndexesAsSender([
|
|
206
|
+
appTaggingSecret
|
|
207
|
+
]);
|
|
187
208
|
return new IndexedTaggingSecret(appTaggingSecret, index);
|
|
188
209
|
}
|
|
189
210
|
/**
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
|
|
211
|
+
* Increments the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
|
|
212
|
+
* @param contractAddress - The contract address to silo the secret for
|
|
213
|
+
* @param sender - The address sending the note
|
|
214
|
+
* @param recipient - The address receiving the note
|
|
215
|
+
*/ async incrementAppTaggingSecretIndexAsSender(contractAddress, sender, recipient) {
|
|
216
|
+
const secret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
|
|
197
217
|
const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
|
|
198
218
|
this.log.debug(`Incrementing app tagging secret at ${contractName}(${contractAddress})`, {
|
|
199
219
|
secret,
|
|
200
220
|
sender,
|
|
201
221
|
recipient,
|
|
202
222
|
contractName,
|
|
203
|
-
contractAddress
|
|
223
|
+
contractAddress
|
|
204
224
|
});
|
|
205
|
-
const [index] = await this.db.getTaggingSecretsIndexesAsSender([
|
|
206
|
-
|
|
225
|
+
const [index] = await this.db.getTaggingSecretsIndexesAsSender([
|
|
226
|
+
secret
|
|
227
|
+
]);
|
|
228
|
+
await this.db.setTaggingSecretsIndexesAsSender([
|
|
229
|
+
new IndexedTaggingSecret(secret, index + 1)
|
|
230
|
+
]);
|
|
231
|
+
}
|
|
232
|
+
async #calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
233
|
+
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
234
|
+
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
235
|
+
const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
236
|
+
// Silo the secret so it can't be used to track other app's notes
|
|
237
|
+
const appSecret = poseidon2Hash([
|
|
238
|
+
secretPoint.x,
|
|
239
|
+
secretPoint.y,
|
|
240
|
+
contractAddress
|
|
241
|
+
]);
|
|
242
|
+
return appSecret;
|
|
207
243
|
}
|
|
208
244
|
/**
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
const
|
|
245
|
+
* Returns the indexed tagging secrets for a given recipient and all the senders in the address book
|
|
246
|
+
* This method should be exposed as an oracle call to allow aztec.nr to perform the orchestration
|
|
247
|
+
* of the syncTaggedLogs and processTaggedLogs methods. However, it is not possible to do so at the moment,
|
|
248
|
+
* so we're keeping it private for now.
|
|
249
|
+
* @param contractAddress - The contract address to silo the secret for
|
|
250
|
+
* @param recipient - The address receiving the notes
|
|
251
|
+
* @returns A list of indexed tagging secrets
|
|
252
|
+
*/ async #getIndexedTaggingSecretsForSenders(contractAddress, recipient) {
|
|
253
|
+
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
254
|
+
const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
|
|
255
|
+
// We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
|
|
256
|
+
// (recipient = us, sender = us)
|
|
257
|
+
const senders = [
|
|
258
|
+
...await this.db.getSenderAddresses(),
|
|
259
|
+
...await this.keyStore.getAccounts()
|
|
260
|
+
].filter((address, index, self)=>index === self.findIndex((otherAddress)=>otherAddress.equals(address)));
|
|
261
|
+
const appTaggingSecrets = await Promise.all(senders.map(async (contact)=>{
|
|
262
|
+
const sharedSecret = await computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
|
|
263
|
+
return poseidon2Hash([
|
|
264
|
+
sharedSecret.x,
|
|
265
|
+
sharedSecret.y,
|
|
266
|
+
contractAddress
|
|
267
|
+
]);
|
|
268
|
+
}));
|
|
269
|
+
const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
|
|
270
|
+
return appTaggingSecrets.map((secret, i)=>new IndexedTaggingSecret(secret, indexes[i]));
|
|
271
|
+
}
|
|
272
|
+
/**
|
|
273
|
+
* Updates the local index of the shared tagging secret of a sender / recipient pair
|
|
274
|
+
* if a log with a larger index is found from the node.
|
|
275
|
+
* @param contractAddress - The address of the contract that the logs are tagged for
|
|
276
|
+
* @param sender - The address of the sender, we must know the sender's ivsk_m.
|
|
277
|
+
* @param recipient - The address of the recipient.
|
|
278
|
+
*/ async syncTaggedLogsAsSender(contractAddress, sender, recipient) {
|
|
279
|
+
const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
|
|
280
|
+
const [oldIndex] = await this.db.getTaggingSecretsIndexesAsSender([
|
|
281
|
+
appTaggingSecret
|
|
282
|
+
]);
|
|
218
283
|
// This algorithm works such that:
|
|
219
284
|
// 1. If we find minimum consecutive empty logs in a window of logs we set the index to the index of the last log
|
|
220
285
|
// we found and quit.
|
|
@@ -222,51 +287,55 @@ export class SimulatorOracle {
|
|
|
222
287
|
// and repeat the process.
|
|
223
288
|
const MIN_CONSECUTIVE_EMPTY_LOGS = 10;
|
|
224
289
|
const WINDOW_SIZE = MIN_CONSECUTIVE_EMPTY_LOGS * 2;
|
|
225
|
-
let [numConsecutiveEmptyLogs, currentIndex] = [
|
|
290
|
+
let [numConsecutiveEmptyLogs, currentIndex] = [
|
|
291
|
+
0,
|
|
292
|
+
oldIndex
|
|
293
|
+
];
|
|
226
294
|
do {
|
|
227
295
|
// We compute the tags for the current window of indexes
|
|
228
|
-
const currentTags = await timesParallel(WINDOW_SIZE, i
|
|
296
|
+
const currentTags = await timesParallel(WINDOW_SIZE, (i)=>{
|
|
229
297
|
const indexedAppTaggingSecret = new IndexedTaggingSecret(appTaggingSecret, currentIndex + i);
|
|
230
298
|
return indexedAppTaggingSecret.computeSiloedTag(recipient, contractAddress);
|
|
231
299
|
});
|
|
232
300
|
// We fetch the logs for the tags
|
|
233
301
|
const possibleLogs = await this.aztecNode.getLogsByTags(currentTags);
|
|
234
302
|
// We find the index of the last log in the window that is not empty
|
|
235
|
-
const indexOfLastLog = possibleLogs.findLastIndex(possibleLog
|
|
303
|
+
const indexOfLastLog = possibleLogs.findLastIndex((possibleLog)=>possibleLog.length !== 0);
|
|
236
304
|
if (indexOfLastLog === -1) {
|
|
237
|
-
// We haven't found any logs in the current window so we stop looking
|
|
238
305
|
break;
|
|
239
306
|
}
|
|
240
307
|
// We move the current index to that of the last log we found
|
|
241
308
|
currentIndex += indexOfLastLog + 1;
|
|
242
309
|
// We compute the number of consecutive empty logs we found and repeat the process if we haven't found enough.
|
|
243
310
|
numConsecutiveEmptyLogs = WINDOW_SIZE - indexOfLastLog - 1;
|
|
244
|
-
}
|
|
311
|
+
}while (numConsecutiveEmptyLogs < MIN_CONSECUTIVE_EMPTY_LOGS)
|
|
245
312
|
const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
|
|
246
313
|
if (currentIndex !== oldIndex) {
|
|
247
|
-
await this.db.setTaggingSecretsIndexesAsSender([
|
|
314
|
+
await this.db.setTaggingSecretsIndexesAsSender([
|
|
315
|
+
new IndexedTaggingSecret(appTaggingSecret, currentIndex)
|
|
316
|
+
]);
|
|
248
317
|
this.log.debug(`Syncing logs for sender ${sender} at contract ${contractName}(${contractAddress})`, {
|
|
249
318
|
sender,
|
|
250
319
|
secret: appTaggingSecret,
|
|
251
320
|
index: currentIndex,
|
|
252
321
|
contractName,
|
|
253
|
-
contractAddress
|
|
322
|
+
contractAddress
|
|
254
323
|
});
|
|
255
|
-
}
|
|
256
|
-
else {
|
|
324
|
+
} else {
|
|
257
325
|
this.log.debug(`No new logs found for sender ${sender} at contract ${contractName}(${contractAddress})`);
|
|
258
326
|
}
|
|
259
327
|
}
|
|
260
328
|
/**
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
329
|
+
* Synchronizes the logs tagged with scoped addresses and all the senders in the address book.
|
|
330
|
+
* Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs
|
|
331
|
+
* to sync.
|
|
332
|
+
* @param contractAddress - The address of the contract that the logs are tagged for
|
|
333
|
+
* @param recipient - The address of the recipient
|
|
334
|
+
* @returns A list of encrypted logs tagged with the recipient's address
|
|
335
|
+
*/ async syncTaggedLogs(contractAddress, maxBlockNumber, scopes) {
|
|
336
|
+
this.log.verbose('Searching for tagged logs', {
|
|
337
|
+
contract: contractAddress
|
|
338
|
+
});
|
|
270
339
|
// Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
|
|
271
340
|
// However it is impossible at the moment due to the language not supporting nested slices.
|
|
272
341
|
// This nesting is necessary because for a given set of tags we don't
|
|
@@ -278,10 +347,10 @@ export class SimulatorOracle {
|
|
|
278
347
|
// that a logs will be received ordered by a given tax index and that the tags won't be reused).
|
|
279
348
|
const logsMap = new Map();
|
|
280
349
|
const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
|
|
281
|
-
for (const recipient of recipients)
|
|
350
|
+
for (const recipient of recipients){
|
|
282
351
|
const logsForRecipient = [];
|
|
283
352
|
// Get all the secrets for the recipient and sender pairs (#9365)
|
|
284
|
-
const secrets = await
|
|
353
|
+
const secrets = await this.#getIndexedTaggingSecretsForSenders(contractAddress, recipient);
|
|
285
354
|
// We fetch logs for a window of indexes in a range:
|
|
286
355
|
// <latest_log_index - WINDOW_HALF_SIZE, latest_log_index + WINDOW_HALF_SIZE>.
|
|
287
356
|
//
|
|
@@ -290,32 +359,32 @@ export class SimulatorOracle {
|
|
|
290
359
|
// for logs the first time we don't receive any logs for a tag, we might never receive anything from that sender again.
|
|
291
360
|
// Also there's a possibility that we have advanced our index, but the sender has reused it, so we might have missed
|
|
292
361
|
// some logs. For these reasons, we have to look both back and ahead of the stored index.
|
|
293
|
-
let secretsAndWindows = secrets.map(secret
|
|
362
|
+
let secretsAndWindows = secrets.map((secret)=>{
|
|
294
363
|
return {
|
|
295
364
|
appTaggingSecret: secret.appTaggingSecret,
|
|
296
365
|
leftMostIndex: Math.max(0, secret.index - WINDOW_HALF_SIZE),
|
|
297
|
-
rightMostIndex: secret.index + WINDOW_HALF_SIZE
|
|
366
|
+
rightMostIndex: secret.index + WINDOW_HALF_SIZE
|
|
298
367
|
};
|
|
299
368
|
});
|
|
300
369
|
// As we iterate we store the largest index we have seen for a given secret to later on store it in the db.
|
|
301
370
|
const newLargestIndexMapToStore = {};
|
|
302
371
|
// The initial/unmodified indexes of the secrets stored in a key-value map where key is the app tagging secret.
|
|
303
372
|
const initialIndexesMap = getInitialIndexesMap(secrets);
|
|
304
|
-
while
|
|
373
|
+
while(secretsAndWindows.length > 0){
|
|
305
374
|
const secretsForTheWholeWindow = getIndexedTaggingSecretsForTheWindow(secretsAndWindows);
|
|
306
|
-
const tagsForTheWholeWindow = await Promise.all(secretsForTheWholeWindow.map(secret
|
|
375
|
+
const tagsForTheWholeWindow = await Promise.all(secretsForTheWholeWindow.map((secret)=>secret.computeSiloedTag(recipient, contractAddress)));
|
|
307
376
|
// We store the new largest indexes we find in the iteration in the following map to later on construct
|
|
308
377
|
// a new set of secrets and windows to fetch logs for.
|
|
309
378
|
const newLargestIndexMapForIteration = {};
|
|
310
379
|
// Fetch the logs for the tags and iterate over them
|
|
311
380
|
const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
|
|
312
|
-
logsByTags.forEach((logsByTag, logIndex)
|
|
381
|
+
logsByTags.forEach((logsByTag, logIndex)=>{
|
|
313
382
|
if (logsByTag.length > 0) {
|
|
314
383
|
// Check that public logs have the correct contract address
|
|
315
|
-
const checkedLogsbyTag = logsByTag.filter(l
|
|
384
|
+
const checkedLogsbyTag = logsByTag.filter((l)=>!l.isFromPublic || PublicLog.fromBuffer(l.logData).contractAddress.equals(contractAddress));
|
|
316
385
|
if (checkedLogsbyTag.length < logsByTag.length) {
|
|
317
|
-
const discarded = logsByTag.filter(log
|
|
318
|
-
this.log.warn(`Discarded ${logsByTag.length - checkedLogsbyTag.length} public logs with mismatched contract address ${contractAddress}:`, discarded.map(l
|
|
386
|
+
const discarded = logsByTag.filter((log)=>checkedLogsbyTag.find((filteredLog)=>filteredLog.equals(log)) === undefined);
|
|
387
|
+
this.log.warn(`Discarded ${logsByTag.length - checkedLogsbyTag.length} public logs with mismatched contract address ${contractAddress}:`, discarded.map((l)=>PublicLog.fromBuffer(l.logData)));
|
|
319
388
|
}
|
|
320
389
|
// The logs for the given tag exist so we store them for later processing
|
|
321
390
|
logsForRecipient.push(...checkedLogsbyTag);
|
|
@@ -327,16 +396,12 @@ export class SimulatorOracle {
|
|
|
327
396
|
recipient,
|
|
328
397
|
secret: secretCorrespondingToLog.appTaggingSecret,
|
|
329
398
|
contractName,
|
|
330
|
-
contractAddress
|
|
399
|
+
contractAddress
|
|
331
400
|
});
|
|
332
|
-
if (secretCorrespondingToLog.index >= initialIndex &&
|
|
333
|
-
(newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] === undefined ||
|
|
334
|
-
secretCorrespondingToLog.index >=
|
|
335
|
-
newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()])) {
|
|
401
|
+
if (secretCorrespondingToLog.index >= initialIndex && (newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] === undefined || secretCorrespondingToLog.index >= newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()])) {
|
|
336
402
|
// We have found a new largest index so we store it for later processing (storing it in the db + fetching
|
|
337
403
|
// the difference of the window sets of current and the next iteration)
|
|
338
|
-
newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] =
|
|
339
|
-
secretCorrespondingToLog.index + 1;
|
|
404
|
+
newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] = secretCorrespondingToLog.index + 1;
|
|
340
405
|
this.log.debug(`Incrementing index to ${secretCorrespondingToLog.index + 1} at contract ${contractName}(${contractAddress})`);
|
|
341
406
|
}
|
|
342
407
|
}
|
|
@@ -345,19 +410,18 @@ export class SimulatorOracle {
|
|
|
345
410
|
// for. Note that it's very unlikely that a new log from the current window would appear between the iterations
|
|
346
411
|
// so we fetch the logs only for the difference of the window sets.
|
|
347
412
|
const newSecretsAndWindows = [];
|
|
348
|
-
for (const [appTaggingSecret, newIndex] of Object.entries(newLargestIndexMapForIteration))
|
|
349
|
-
const secret = secrets.find(secret
|
|
413
|
+
for (const [appTaggingSecret, newIndex] of Object.entries(newLargestIndexMapForIteration)){
|
|
414
|
+
const secret = secrets.find((secret)=>secret.appTaggingSecret.toString() === appTaggingSecret);
|
|
350
415
|
if (secret) {
|
|
351
416
|
newSecretsAndWindows.push({
|
|
352
417
|
appTaggingSecret: secret.appTaggingSecret,
|
|
353
418
|
// We set the left most index to the new index to avoid fetching the same logs again
|
|
354
419
|
leftMostIndex: newIndex,
|
|
355
|
-
rightMostIndex: newIndex + WINDOW_HALF_SIZE
|
|
420
|
+
rightMostIndex: newIndex + WINDOW_HALF_SIZE
|
|
356
421
|
});
|
|
357
422
|
// We store the new largest index in the map to later store it in the db.
|
|
358
423
|
newLargestIndexMapToStore[appTaggingSecret] = newIndex;
|
|
359
|
-
}
|
|
360
|
-
else {
|
|
424
|
+
} else {
|
|
361
425
|
throw new Error(`Secret not found for appTaggingSecret ${appTaggingSecret}. This is a bug as it should never happen!`);
|
|
362
426
|
}
|
|
363
427
|
}
|
|
@@ -365,24 +429,59 @@ export class SimulatorOracle {
|
|
|
365
429
|
secretsAndWindows = newSecretsAndWindows;
|
|
366
430
|
}
|
|
367
431
|
// We filter the logs by block number and store them in the map.
|
|
368
|
-
logsMap.set(recipient.toString(), logsForRecipient.filter(log
|
|
432
|
+
logsMap.set(recipient.toString(), logsForRecipient.filter((log)=>log.blockNumber <= maxBlockNumber));
|
|
369
433
|
// At this point we have processed all the logs for the recipient so we store the new largest indexes in the db.
|
|
370
|
-
await this.db.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index])
|
|
434
|
+
await this.db.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index])=>new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index)));
|
|
371
435
|
}
|
|
372
436
|
return logsMap;
|
|
373
437
|
}
|
|
374
438
|
/**
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
const
|
|
439
|
+
* Decrypts logs tagged for a recipient and returns them.
|
|
440
|
+
* @param scopedLogs - The logs to decrypt.
|
|
441
|
+
* @param recipient - The recipient of the logs.
|
|
442
|
+
* @returns The decrypted notes.
|
|
443
|
+
*/ async #decryptTaggedLogs(scopedLogs, recipient) {
|
|
444
|
+
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
445
|
+
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
446
|
+
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
447
|
+
// Since we could have notes with the same index for different txs, we need
|
|
448
|
+
// to keep track of them scoping by txHash
|
|
449
|
+
const excludedIndices = new Map();
|
|
450
|
+
const decrypted = [];
|
|
451
|
+
for (const scopedLog of scopedLogs){
|
|
452
|
+
const payload = scopedLog.isFromPublic ? await L1NotePayload.decryptAsIncomingFromPublic(PublicLog.fromBuffer(scopedLog.logData), addressSecret) : await L1NotePayload.decryptAsIncoming(PrivateLog.fromBuffer(scopedLog.logData), addressSecret);
|
|
453
|
+
if (!payload) {
|
|
454
|
+
this.log.verbose('Unable to decrypt log');
|
|
455
|
+
continue;
|
|
456
|
+
}
|
|
457
|
+
if (!excludedIndices.has(scopedLog.txHash.toString())) {
|
|
458
|
+
excludedIndices.set(scopedLog.txHash.toString(), new Set());
|
|
459
|
+
}
|
|
460
|
+
const note = await getOrderedNoteItems(this.db, payload);
|
|
461
|
+
const plaintext = [
|
|
462
|
+
payload.storageSlot,
|
|
463
|
+
payload.noteTypeId.toField(),
|
|
464
|
+
...note.items
|
|
465
|
+
];
|
|
466
|
+
decrypted.push({
|
|
467
|
+
plaintext,
|
|
468
|
+
txHash: scopedLog.txHash,
|
|
469
|
+
contractAddress: payload.contractAddress
|
|
470
|
+
});
|
|
471
|
+
}
|
|
472
|
+
return decrypted;
|
|
473
|
+
}
|
|
474
|
+
/**
|
|
475
|
+
* Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
|
|
476
|
+
* @param logs - The logs to process.
|
|
477
|
+
* @param recipient - The recipient of the logs.
|
|
478
|
+
*/ async processTaggedLogs(logs, recipient, simulator) {
|
|
479
|
+
const decryptedLogs = await this.#decryptTaggedLogs(logs, recipient);
|
|
381
480
|
// We've produced the full NoteDao, which we'd be able to simply insert into the database. However, this is
|
|
382
481
|
// only a temporary measure as we migrate from the PXE-driven discovery into the new contract-driven approach. We
|
|
383
482
|
// discard most of the work done up to this point and reconstruct the note plaintext to then hand over to the
|
|
384
483
|
// contract for further processing.
|
|
385
|
-
for (const decryptedLog of decryptedLogs)
|
|
484
|
+
for (const decryptedLog of decryptedLogs){
|
|
386
485
|
// Log processing requires the note hashes in the tx in which the note was created. We are now assuming that the
|
|
387
486
|
// note was included in the same block in which the log was delivered - note that partial notes will not work this
|
|
388
487
|
// way.
|
|
@@ -398,32 +497,42 @@ export class SimulatorOracle {
|
|
|
398
497
|
// Called when notes are delivered, usually as a result to a call to the process_log contract function
|
|
399
498
|
async deliverNote(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient) {
|
|
400
499
|
const noteDao = await this.produceNoteDao(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient);
|
|
401
|
-
await this.db.addNotes([
|
|
500
|
+
await this.db.addNotes([
|
|
501
|
+
noteDao
|
|
502
|
+
], recipient);
|
|
402
503
|
this.log.verbose('Added note', {
|
|
403
504
|
contract: noteDao.contractAddress,
|
|
404
505
|
slot: noteDao.storageSlot,
|
|
405
|
-
nullifier: noteDao.siloedNullifier.toString
|
|
506
|
+
nullifier: noteDao.siloedNullifier.toString
|
|
406
507
|
});
|
|
407
508
|
}
|
|
408
509
|
async removeNullifiedNotes(contractAddress) {
|
|
409
|
-
this.log.verbose('Removing nullified notes', {
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
510
|
+
this.log.verbose('Removing nullified notes', {
|
|
511
|
+
contract: contractAddress
|
|
512
|
+
});
|
|
513
|
+
for (const recipient of (await this.keyStore.getAccounts())){
|
|
514
|
+
const currentNotesForRecipient = await this.db.getNotes({
|
|
515
|
+
contractAddress,
|
|
516
|
+
owner: recipient
|
|
517
|
+
});
|
|
518
|
+
const nullifiersToCheck = currentNotesForRecipient.map((note)=>note.siloedNullifier);
|
|
413
519
|
const nullifierIndexes = await this.aztecNode.findNullifiersIndexesWithBlock('latest', nullifiersToCheck);
|
|
414
|
-
const foundNullifiers = nullifiersToCheck
|
|
415
|
-
.map((nullifier, i) => {
|
|
520
|
+
const foundNullifiers = nullifiersToCheck.map((nullifier, i)=>{
|
|
416
521
|
if (nullifierIndexes[i] !== undefined) {
|
|
417
|
-
return {
|
|
522
|
+
return {
|
|
523
|
+
...nullifierIndexes[i],
|
|
524
|
+
...{
|
|
525
|
+
data: nullifier
|
|
526
|
+
}
|
|
527
|
+
};
|
|
418
528
|
}
|
|
419
|
-
})
|
|
420
|
-
.filter(nullifier => nullifier !== undefined);
|
|
529
|
+
}).filter((nullifier)=>nullifier !== undefined);
|
|
421
530
|
const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, await recipient.toAddressPoint());
|
|
422
|
-
nullifiedNotes.forEach(noteDao
|
|
531
|
+
nullifiedNotes.forEach((noteDao)=>{
|
|
423
532
|
this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
|
|
424
533
|
contract: noteDao.contractAddress,
|
|
425
534
|
slot: noteDao.storageSlot,
|
|
426
|
-
nullifier: noteDao.siloedNullifier.toString()
|
|
535
|
+
nullifier: noteDao.siloedNullifier.toString()
|
|
427
536
|
});
|
|
428
537
|
});
|
|
429
538
|
}
|
|
@@ -444,7 +553,9 @@ export class SimulatorOracle {
|
|
|
444
553
|
// locally synced block number which *should* be recent enough to be available. We avoid querying at 'latest' since
|
|
445
554
|
// we want to avoid accidentally processing notes that only exist ahead in time of the locally synced state.
|
|
446
555
|
const syncedBlockNumber = await this.db.getBlockNumber();
|
|
447
|
-
const uniqueNoteHashTreeIndex = (await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [
|
|
556
|
+
const uniqueNoteHashTreeIndex = (await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [
|
|
557
|
+
uniqueNoteHash
|
|
558
|
+
]))[0];
|
|
448
559
|
if (uniqueNoteHashTreeIndex === undefined) {
|
|
449
560
|
throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present on the tree at block ${syncedBlockNumber} (from tx ${txHash})`);
|
|
450
561
|
}
|
|
@@ -466,12 +577,11 @@ export class SimulatorOracle {
|
|
|
466
577
|
txHash.toString(),
|
|
467
578
|
toBoundedVec(noteHashes, MAX_NOTE_HASHES_PER_TX),
|
|
468
579
|
firstNullifier,
|
|
469
|
-
recipient
|
|
580
|
+
recipient
|
|
470
581
|
]),
|
|
471
|
-
returnTypes: artifact.returnTypes
|
|
582
|
+
returnTypes: artifact.returnTypes
|
|
472
583
|
};
|
|
473
|
-
await (simulator ??
|
|
474
|
-
getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.simulationProvider, this.contractDataOracle)).runUnconstrained(execRequest, artifact, contractAddress, []);
|
|
584
|
+
await (simulator ?? getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.simulationProvider, this.contractDataOracle)).runUnconstrained(execRequest, artifact, contractAddress, []);
|
|
475
585
|
}
|
|
476
586
|
dbStore(contractAddress, slot, values) {
|
|
477
587
|
return this.db.dbStore(contractAddress, slot, values);
|
|
@@ -486,84 +596,9 @@ export class SimulatorOracle {
|
|
|
486
596
|
return this.db.dbCopy(contractAddress, srcSlot, dstSlot, numEntries);
|
|
487
597
|
}
|
|
488
598
|
}
|
|
489
|
-
_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_findLeafIndex = async function _SimulatorOracle_findLeafIndex(blockNumber, treeId, leafValue) {
|
|
490
|
-
const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [leafValue]);
|
|
491
|
-
return leafIndex;
|
|
492
|
-
}, _SimulatorOracle_getSiblingPath = async function _SimulatorOracle_getSiblingPath(blockNumber, treeId, leafIndex) {
|
|
493
|
-
switch (treeId) {
|
|
494
|
-
case MerkleTreeId.NULLIFIER_TREE:
|
|
495
|
-
return (await this.aztecNode.getNullifierSiblingPath(blockNumber, leafIndex)).toFields();
|
|
496
|
-
case MerkleTreeId.NOTE_HASH_TREE:
|
|
497
|
-
return (await this.aztecNode.getNoteHashSiblingPath(blockNumber, leafIndex)).toFields();
|
|
498
|
-
case MerkleTreeId.PUBLIC_DATA_TREE:
|
|
499
|
-
return (await this.aztecNode.getPublicDataSiblingPath(blockNumber, leafIndex)).toFields();
|
|
500
|
-
case MerkleTreeId.ARCHIVE:
|
|
501
|
-
return (await this.aztecNode.getArchiveSiblingPath(blockNumber, leafIndex)).toFields();
|
|
502
|
-
default:
|
|
503
|
-
throw new Error('Not implemented');
|
|
504
|
-
}
|
|
505
|
-
}, _SimulatorOracle_calculateAppTaggingSecret = async function _SimulatorOracle_calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
506
|
-
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
507
|
-
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
508
|
-
const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
509
|
-
// Silo the secret so it can't be used to track other app's notes
|
|
510
|
-
const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
|
|
511
|
-
return appSecret;
|
|
512
|
-
}, _SimulatorOracle_getIndexedTaggingSecretsForSenders =
|
|
513
|
-
/**
|
|
514
|
-
* Returns the indexed tagging secrets for a given recipient and all the senders in the address book
|
|
515
|
-
* This method should be exposed as an oracle call to allow aztec.nr to perform the orchestration
|
|
516
|
-
* of the syncTaggedLogs and processTaggedLogs methods. However, it is not possible to do so at the moment,
|
|
517
|
-
* so we're keeping it private for now.
|
|
518
|
-
* @param contractAddress - The contract address to silo the secret for
|
|
519
|
-
* @param recipient - The address receiving the notes
|
|
520
|
-
* @returns A list of indexed tagging secrets
|
|
521
|
-
*/
|
|
522
|
-
async function _SimulatorOracle_getIndexedTaggingSecretsForSenders(contractAddress, recipient) {
|
|
523
|
-
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
524
|
-
const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
|
|
525
|
-
// We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
|
|
526
|
-
// (recipient = us, sender = us)
|
|
527
|
-
const senders = [...(await this.db.getSenderAddresses()), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
|
|
528
|
-
const appTaggingSecrets = await Promise.all(senders.map(async (contact) => {
|
|
529
|
-
const sharedSecret = await computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
|
|
530
|
-
return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
|
|
531
|
-
}));
|
|
532
|
-
const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
|
|
533
|
-
return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
|
|
534
|
-
}, _SimulatorOracle_decryptTaggedLogs =
|
|
535
|
-
/**
|
|
536
|
-
* Decrypts logs tagged for a recipient and returns them.
|
|
537
|
-
* @param scopedLogs - The logs to decrypt.
|
|
538
|
-
* @param recipient - The recipient of the logs.
|
|
539
|
-
* @returns The decrypted notes.
|
|
540
|
-
*/
|
|
541
|
-
async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient) {
|
|
542
|
-
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
543
|
-
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
544
|
-
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
545
|
-
// Since we could have notes with the same index for different txs, we need
|
|
546
|
-
// to keep track of them scoping by txHash
|
|
547
|
-
const excludedIndices = new Map();
|
|
548
|
-
const decrypted = [];
|
|
549
|
-
for (const scopedLog of scopedLogs) {
|
|
550
|
-
const payload = scopedLog.isFromPublic
|
|
551
|
-
? await L1NotePayload.decryptAsIncomingFromPublic(PublicLog.fromBuffer(scopedLog.logData), addressSecret)
|
|
552
|
-
: await L1NotePayload.decryptAsIncoming(PrivateLog.fromBuffer(scopedLog.logData), addressSecret);
|
|
553
|
-
if (!payload) {
|
|
554
|
-
this.log.verbose('Unable to decrypt log');
|
|
555
|
-
continue;
|
|
556
|
-
}
|
|
557
|
-
if (!excludedIndices.has(scopedLog.txHash.toString())) {
|
|
558
|
-
excludedIndices.set(scopedLog.txHash.toString(), new Set());
|
|
559
|
-
}
|
|
560
|
-
const note = await getOrderedNoteItems(this.db, payload);
|
|
561
|
-
const plaintext = [payload.storageSlot, payload.noteTypeId.toField(), ...note.items];
|
|
562
|
-
decrypted.push({ plaintext, txHash: scopedLog.txHash, contractAddress: payload.contractAddress });
|
|
563
|
-
}
|
|
564
|
-
return decrypted;
|
|
565
|
-
};
|
|
566
599
|
function toBoundedVec(array, maxLength) {
|
|
567
|
-
return {
|
|
600
|
+
return {
|
|
601
|
+
storage: array.concat(Array(maxLength - array.length).fill(new Fr(0))),
|
|
602
|
+
len: array.length
|
|
603
|
+
};
|
|
568
604
|
}
|
|
569
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
|