@aztec/pxe 0.0.1-commit.9ee6fcc6 → 0.0.1-commit.9ef841308
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/block_synchronizer/block_synchronizer.d.ts +1 -1
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +6 -0
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +4 -3
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +2 -3
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +2 -5
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -3
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +2 -5
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +19 -19
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +18 -22
- package/dest/contract_function_simulator/oracle/oracle.d.ts +38 -19
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +60 -39
- package/dest/contract_function_simulator/oracle/private_execution.js +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +6 -6
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +7 -7
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +28 -26
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +108 -69
- package/dest/contract_logging.d.ts +9 -4
- package/dest/contract_logging.d.ts.map +1 -1
- package/dest/contract_logging.js +21 -6
- package/dest/contract_sync/contract_sync_service.d.ts +3 -2
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +12 -2
- package/dest/contract_sync/helpers.d.ts +2 -2
- package/dest/contract_sync/helpers.d.ts.map +1 -1
- package/dest/contract_sync/helpers.js +7 -2
- package/dest/events/event_service.d.ts +3 -2
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +16 -4
- package/dest/logs/log_service.d.ts +6 -7
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +24 -28
- package/dest/messages/message_context_service.d.ts +3 -3
- package/dest/messages/message_context_service.d.ts.map +1 -1
- package/dest/messages/message_context_service.js +3 -3
- package/dest/notes/note_service.d.ts +2 -2
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +14 -5
- package/dest/oracle_version.d.ts +2 -2
- package/dest/oracle_version.js +2 -2
- package/dest/pxe.d.ts +1 -1
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +4 -2
- package/dest/storage/capsule_store/capsule_service.d.ts +22 -0
- package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
- package/dest/storage/capsule_store/capsule_service.js +50 -0
- package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
- package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_store.js +33 -28
- package/dest/storage/capsule_store/index.d.ts +2 -1
- package/dest/storage/capsule_store/index.d.ts.map +1 -1
- package/dest/storage/capsule_store/index.js +1 -0
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/package.json +16 -16
- package/src/block_synchronizer/block_synchronizer.ts +6 -0
- package/src/contract_function_simulator/contract_function_simulator.ts +4 -3
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +0 -3
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +0 -3
- package/src/contract_function_simulator/oracle/interfaces.ts +26 -17
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +13 -50
- package/src/contract_function_simulator/oracle/oracle.ts +79 -33
- package/src/contract_function_simulator/oracle/private_execution.ts +1 -1
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +7 -7
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +195 -78
- package/src/contract_logging.ts +18 -5
- package/src/contract_sync/contract_sync_service.ts +22 -11
- package/src/contract_sync/helpers.ts +3 -2
- package/src/events/event_service.ts +17 -4
- package/src/logs/log_service.ts +51 -46
- package/src/messages/message_context_service.ts +3 -4
- package/src/notes/note_service.ts +16 -5
- package/src/oracle_version.ts +2 -2
- package/src/pxe.ts +4 -1
- package/src/storage/capsule_store/capsule_service.ts +91 -0
- package/src/storage/capsule_store/capsule_store.ts +34 -26
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/metadata.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +0 -16
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +0 -1
- package/dest/contract_function_simulator/noir-structs/message_tx_context.js +0 -57
- package/src/contract_function_simulator/noir-structs/message_tx_context.ts +0 -55
|
@@ -4,10 +4,10 @@ import { LogLevels, createLogger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { isProtocolContract } from '@aztec/protocol-contracts';
|
|
5
5
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
6
6
|
import { computeAddressSecret } from '@aztec/stdlib/keys';
|
|
7
|
-
import {
|
|
7
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
8
8
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
9
9
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
10
|
-
import { createContractLogger, logContractMessage } from '../../contract_logging.js';
|
|
10
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
11
11
|
import { EventService } from '../../events/event_service.js';
|
|
12
12
|
import { LogService } from '../../logs/log_service.js';
|
|
13
13
|
import { NoteService } from '../../notes/note_service.js';
|
|
@@ -15,7 +15,6 @@ import { ORACLE_VERSION } from '../../oracle_version.js';
|
|
|
15
15
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
16
16
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
17
17
|
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
18
|
-
import { MessageTxContext } from '../noir-structs/message_tx_context.js';
|
|
19
18
|
import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
|
|
20
19
|
import { UtilityContext } from '../noir-structs/utility_context.js';
|
|
21
20
|
import { pickNotes } from '../pick_notes.js';
|
|
@@ -26,6 +25,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
26
25
|
isMisc = true;
|
|
27
26
|
isUtility = true;
|
|
28
27
|
contractLogger;
|
|
28
|
+
aztecnrLogger;
|
|
29
29
|
offchainEffects = [];
|
|
30
30
|
contractAddress;
|
|
31
31
|
authWitnesses;
|
|
@@ -38,7 +38,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
38
38
|
aztecNode;
|
|
39
39
|
recipientTaggingStore;
|
|
40
40
|
senderAddressBookStore;
|
|
41
|
-
|
|
41
|
+
capsuleService;
|
|
42
42
|
privateEventStore;
|
|
43
43
|
messageContextService;
|
|
44
44
|
contractSyncService;
|
|
@@ -57,7 +57,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
57
57
|
this.aztecNode = args.aztecNode;
|
|
58
58
|
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
59
59
|
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
60
|
-
this.
|
|
60
|
+
this.capsuleService = args.capsuleService;
|
|
61
61
|
this.privateEventStore = args.privateEventStore;
|
|
62
62
|
this.messageContextService = args.messageContextService;
|
|
63
63
|
this.contractSyncService = args.contractSyncService;
|
|
@@ -74,12 +74,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
74
74
|
const LEGACY_ORACLE_VERSION = 12;
|
|
75
75
|
if (isProtocolContract(this.contractAddress)) {
|
|
76
76
|
if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
|
|
77
|
-
|
|
77
|
+
const hint = version > ORACLE_VERSION ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
|
|
78
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION}, got ${version})`);
|
|
78
79
|
}
|
|
79
80
|
return;
|
|
80
81
|
}
|
|
81
82
|
if (version !== ORACLE_VERSION) {
|
|
82
|
-
|
|
83
|
+
const hint = version > ORACLE_VERSION ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
|
|
84
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle version ${ORACLE_VERSION}, got ${version})`);
|
|
83
85
|
}
|
|
84
86
|
}
|
|
85
87
|
getRandomField() {
|
|
@@ -111,12 +113,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
111
113
|
}
|
|
112
114
|
/**
|
|
113
115
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
114
|
-
* @param
|
|
115
|
-
* witness.
|
|
116
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
117
|
+
* membership witness.
|
|
116
118
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
117
119
|
* @returns The membership witness containing the leaf index and sibling path
|
|
118
|
-
*/ getNoteHashMembershipWitness(
|
|
119
|
-
return this.aztecNode.getNoteHashMembershipWitness(
|
|
120
|
+
*/ getNoteHashMembershipWitness(blockHash, noteHash) {
|
|
121
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
|
|
120
122
|
}
|
|
121
123
|
/**
|
|
122
124
|
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
@@ -124,12 +126,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
124
126
|
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
125
127
|
* its block hash is appended as a new leaf to the archive tree.
|
|
126
128
|
*
|
|
127
|
-
* @param
|
|
129
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
128
130
|
* witness.
|
|
129
131
|
* @param blockHash - The block hash to find in the archive tree.
|
|
130
132
|
* @returns The membership witness containing the leaf index and sibling path
|
|
131
|
-
*/ getBlockHashMembershipWitness(
|
|
132
|
-
|
|
133
|
+
*/ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
|
|
134
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
135
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
136
|
+
// membership witness as there is none.
|
|
137
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
|
|
133
138
|
}
|
|
134
139
|
/**
|
|
135
140
|
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
@@ -137,7 +142,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
137
142
|
* @param nullifier - Nullifier we try to find witness for.
|
|
138
143
|
* @returns The nullifier membership witness (if found).
|
|
139
144
|
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
140
|
-
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
145
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
|
|
141
146
|
}
|
|
142
147
|
/**
|
|
143
148
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
@@ -148,7 +153,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
148
153
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
149
154
|
* we are trying to prove non-inclusion for.
|
|
150
155
|
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
151
|
-
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
156
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
|
|
152
157
|
}
|
|
153
158
|
/**
|
|
154
159
|
* Returns a public data tree witness for a given leaf slot at a given block.
|
|
@@ -156,7 +161,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
156
161
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
157
162
|
* @returns - The witness
|
|
158
163
|
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
159
|
-
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
164
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
|
|
160
165
|
}
|
|
161
166
|
/**
|
|
162
167
|
* Fetches a block header of a given block.
|
|
@@ -174,7 +179,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
174
179
|
* Retrieve the public keys and partial address associated to a given address.
|
|
175
180
|
* @param account - The account address.
|
|
176
181
|
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
177
|
-
*/ async
|
|
182
|
+
*/ async getPublicKeysAndPartialAddress(account) {
|
|
178
183
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
179
184
|
if (!completeAddress) {
|
|
180
185
|
return undefined;
|
|
@@ -261,7 +266,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
261
266
|
* Check if a nullifier exists in the nullifier tree.
|
|
262
267
|
* @param innerNullifier - The inner nullifier.
|
|
263
268
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
264
|
-
*/ async
|
|
269
|
+
*/ async doesNullifierExist(innerNullifier) {
|
|
265
270
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
266
271
|
siloNullifier(this.contractAddress, innerNullifier),
|
|
267
272
|
this.anchorBlockHeader.hash()
|
|
@@ -272,14 +277,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
272
277
|
return leafIndex?.data !== undefined;
|
|
273
278
|
}
|
|
274
279
|
/**
|
|
275
|
-
*
|
|
280
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
276
281
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
277
282
|
* @param messageHash - Hash of the message.
|
|
278
283
|
* @param secret - Secret used to compute a nullifier.
|
|
279
284
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
280
285
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
281
286
|
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
282
|
-
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
287
|
+
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
|
|
283
288
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
284
289
|
}
|
|
285
290
|
/**
|
|
@@ -288,34 +293,49 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
288
293
|
* @param contractAddress - The address to read storage from.
|
|
289
294
|
* @param startStorageSlot - The starting storage slot.
|
|
290
295
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
291
|
-
*/
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
+
*/ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
297
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
|
|
298
|
+
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
299
|
+
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
300
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
301
|
+
return values;
|
|
302
|
+
});
|
|
296
303
|
}
|
|
297
304
|
/**
|
|
298
|
-
* Returns a per-contract logger whose output is prefixed with `
|
|
305
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
299
306
|
*/ async #getContractLogger() {
|
|
300
307
|
if (!this.contractLogger) {
|
|
301
308
|
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
302
309
|
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
303
|
-
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
|
|
310
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
|
|
304
311
|
instanceId: this.jobId
|
|
305
312
|
});
|
|
306
313
|
}
|
|
307
314
|
return this.contractLogger;
|
|
308
315
|
}
|
|
316
|
+
/**
|
|
317
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
318
|
+
*/ async #getAztecnrLogger() {
|
|
319
|
+
if (!this.aztecnrLogger) {
|
|
320
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
321
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
322
|
+
this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
|
|
323
|
+
instanceId: this.jobId
|
|
324
|
+
});
|
|
325
|
+
}
|
|
326
|
+
return this.aztecnrLogger;
|
|
327
|
+
}
|
|
309
328
|
async log(level, message, fields) {
|
|
310
329
|
if (!LogLevels[level]) {
|
|
311
330
|
throw new Error(`Invalid log level: ${level}`);
|
|
312
331
|
}
|
|
313
|
-
const
|
|
314
|
-
|
|
332
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
333
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
334
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
315
335
|
}
|
|
316
|
-
async
|
|
317
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.
|
|
318
|
-
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot,
|
|
336
|
+
async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
|
|
337
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleService, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
338
|
+
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, scope);
|
|
319
339
|
}
|
|
320
340
|
/**
|
|
321
341
|
* Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
|
|
@@ -326,117 +346,121 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
326
346
|
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
327
347
|
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
328
348
|
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
329
|
-
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen) {
|
|
349
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
330
350
|
// TODO(#10727): allow other contracts to store notes
|
|
331
351
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
332
352
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
333
353
|
}
|
|
334
354
|
// We read all note and event validation requests and process them all concurrently. This makes the process much
|
|
335
355
|
// faster as we don't need to wait for the network round-trip.
|
|
336
|
-
const noteValidationRequests = (await this.
|
|
337
|
-
const eventValidationRequests = (await this.
|
|
356
|
+
const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
357
|
+
const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
338
358
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
339
|
-
const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash,
|
|
359
|
+
const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, scope));
|
|
340
360
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
341
|
-
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash,
|
|
361
|
+
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
|
|
342
362
|
await Promise.all([
|
|
343
363
|
...noteStorePromises,
|
|
344
364
|
...eventStorePromises
|
|
345
365
|
]);
|
|
346
366
|
// Requests are cleared once we're done.
|
|
347
|
-
await this.
|
|
348
|
-
await this.
|
|
367
|
+
await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
368
|
+
await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
349
369
|
}
|
|
350
|
-
async
|
|
370
|
+
async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
|
|
351
371
|
// TODO(#10727): allow other contracts to process partial notes
|
|
352
372
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
353
373
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
354
374
|
}
|
|
355
375
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
356
376
|
// don't need to wait for the network round-trip.
|
|
357
|
-
const logRetrievalRequests = (await this.
|
|
358
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.
|
|
359
|
-
const maybeLogRetrievalResponses = await logService.
|
|
377
|
+
const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
|
|
378
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleService, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
379
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
|
|
360
380
|
// Requests are cleared once we're done.
|
|
361
|
-
await this.
|
|
381
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
362
382
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
363
|
-
await this.
|
|
383
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
|
|
364
384
|
}
|
|
365
|
-
async
|
|
385
|
+
async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
|
|
366
386
|
try {
|
|
367
387
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
368
388
|
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
369
389
|
}
|
|
370
|
-
|
|
390
|
+
// TODO(@mverzilli): this is a prime example of where using a volatile array would make much more sense, we don't
|
|
391
|
+
// need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
|
|
392
|
+
// At the same time, we don't want to allow any global scope access other than where backwards compatibility
|
|
393
|
+
// forces us to. Hence we need the scope here to be artificial.
|
|
394
|
+
const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
|
|
371
395
|
const txHashes = requestCapsules.map((fields, i)=>{
|
|
372
396
|
if (fields.length !== 1) {
|
|
373
397
|
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
374
398
|
}
|
|
375
399
|
return fields[0];
|
|
376
400
|
});
|
|
377
|
-
const maybeMessageContexts = await this.messageContextService.
|
|
401
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
378
402
|
// Leave response in response capsule array.
|
|
379
|
-
await this.
|
|
403
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
|
|
380
404
|
} finally{
|
|
381
|
-
await this.
|
|
405
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
382
406
|
}
|
|
383
407
|
}
|
|
384
|
-
|
|
408
|
+
setCapsule(contractAddress, slot, capsule, scope) {
|
|
385
409
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
386
410
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
387
411
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
388
412
|
}
|
|
389
|
-
this.
|
|
390
|
-
return Promise.resolve();
|
|
413
|
+
this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
391
414
|
}
|
|
392
|
-
|
|
415
|
+
getCapsule(contractAddress, slot, scope) {
|
|
393
416
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
394
417
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
395
418
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
396
419
|
}
|
|
397
|
-
return
|
|
398
|
-
this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
|
|
420
|
+
return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
|
|
399
421
|
}
|
|
400
|
-
deleteCapsule(contractAddress, slot) {
|
|
422
|
+
deleteCapsule(contractAddress, slot, scope) {
|
|
401
423
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
402
424
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
403
425
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
404
426
|
}
|
|
405
|
-
this.
|
|
406
|
-
return Promise.resolve();
|
|
427
|
+
this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
407
428
|
}
|
|
408
|
-
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
|
|
429
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
|
|
409
430
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
410
431
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
411
432
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
412
433
|
}
|
|
413
|
-
return this.
|
|
434
|
+
return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
414
435
|
}
|
|
415
436
|
/**
|
|
416
437
|
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
417
438
|
* stored notes or events are discovered.
|
|
418
|
-
*/
|
|
439
|
+
*/ setContractSyncCacheInvalid(contractAddress, scopes) {
|
|
419
440
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
420
441
|
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
421
442
|
}
|
|
422
443
|
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
423
444
|
}
|
|
424
445
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
425
|
-
|
|
446
|
+
decryptAes128(ciphertext, iv, symKey) {
|
|
426
447
|
const aes128 = new Aes128();
|
|
427
448
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
428
449
|
}
|
|
429
450
|
/**
|
|
430
|
-
* Retrieves the shared secret for a given address and ephemeral public key.
|
|
451
|
+
* Retrieves the app-siloed shared secret for a given address and ephemeral public key.
|
|
431
452
|
* @param address - The address to get the secret for.
|
|
432
453
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
433
|
-
* @
|
|
434
|
-
|
|
435
|
-
|
|
454
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
455
|
+
* @returns The app-siloed shared secret as a Field.
|
|
456
|
+
*/ async getSharedSecret(address, ephPk, contractAddress) {
|
|
457
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
458
|
+
throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
|
|
459
|
+
}
|
|
436
460
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
437
461
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
438
462
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
439
|
-
return
|
|
463
|
+
return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
|
|
440
464
|
}
|
|
441
465
|
emitOffchainEffect(data) {
|
|
442
466
|
this.offchainEffects.push({
|
|
@@ -448,4 +472,19 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
448
472
|
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
449
473
|
return this.offchainEffects;
|
|
450
474
|
}
|
|
475
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
|
|
476
|
+
const [response] = await Promise.all([
|
|
477
|
+
query(),
|
|
478
|
+
(async ()=>{
|
|
479
|
+
const header = await this.aztecNode.getBlockHeader(blockHash);
|
|
480
|
+
if (!header) {
|
|
481
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
482
|
+
}
|
|
483
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
484
|
+
throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${await this.anchorBlockHeader.hash()}).`);
|
|
485
|
+
}
|
|
486
|
+
})()
|
|
487
|
+
]);
|
|
488
|
+
return response;
|
|
489
|
+
}
|
|
451
490
|
}
|
|
@@ -4,10 +4,11 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
|
4
4
|
import type { DebugLog } from '@aztec/stdlib/logs';
|
|
5
5
|
/** Resolves a contract address to a human-readable name, if available. */
|
|
6
6
|
export type ContractNameResolver = (address: AztecAddress) => Promise<string | undefined>;
|
|
7
|
+
export type CONTRACT_LOG_KIND = 'aztecnr' | 'user';
|
|
7
8
|
/**
|
|
8
|
-
* Creates a logger whose output is prefixed with `
|
|
9
|
+
* Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
9
10
|
*/
|
|
10
|
-
export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, options?: {
|
|
11
|
+
export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, kind: CONTRACT_LOG_KIND, options?: {
|
|
11
12
|
instanceId?: string;
|
|
12
13
|
}): Promise<Logger>;
|
|
13
14
|
/**
|
|
@@ -16,7 +17,11 @@ export declare function createContractLogger(contractAddress: AztecAddress, getC
|
|
|
16
17
|
export declare function logContractMessage(logger: Logger, level: LogLevel, message: string, fields: Fr[]): void;
|
|
17
18
|
/**
|
|
18
19
|
* Displays debug logs collected during public function simulation,
|
|
19
|
-
* using the `
|
|
20
|
+
* using the `contract:` prefixed logger format.
|
|
20
21
|
*/
|
|
21
22
|
export declare function displayDebugLogs(debugLogs: DebugLog[], getContractName: ContractNameResolver): Promise<void>;
|
|
22
|
-
|
|
23
|
+
export declare function stripAztecnrLogPrefix(message: string): {
|
|
24
|
+
kind: CONTRACT_LOG_KIND;
|
|
25
|
+
message: string;
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFDMUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHLFNBQVMsR0FBRyxNQUFNLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsSUFBSSxFQUFFLGlCQUFpQixFQUN2QixPQUFPLENBQUMsRUFBRTtJQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ2hDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FPakI7QUFFRDs7R0FFRztBQUNILHdCQUFnQixrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUV2RztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsZUFBZSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNbEg7QUFFRCx3QkFBZ0IscUJBQXFCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRztJQUFFLElBQUksRUFBRSxpQkFBaUIsQ0FBQztJQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7Q0FBRSxDQU1uRyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_logging.d.ts","sourceRoot":"","sources":["../src/contract_logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAuC,MAAM,uBAAuB,CAAC;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"contract_logging.d.ts","sourceRoot":"","sources":["../src/contract_logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAuC,MAAM,uBAAuB,CAAC;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAC1F,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC;AAEnD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,oBAAoB,EACrC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAEvG;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlH;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAMnG"}
|
package/dest/contract_logging.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
|
|
2
2
|
/**
|
|
3
|
-
* Creates a logger whose output is prefixed with `
|
|
4
|
-
*/ export async function createContractLogger(contractAddress, getContractName, options) {
|
|
3
|
+
* Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
4
|
+
*/ export async function createContractLogger(contractAddress, getContractName, kind, options) {
|
|
5
5
|
const addrAbbrev = contractAddress.toString().slice(0, 10);
|
|
6
6
|
const name = await getContractName(contractAddress);
|
|
7
|
-
const
|
|
7
|
+
const prefix = kind == 'aztecnr' ? 'aztecnr' : 'contract';
|
|
8
|
+
const module = name ? `${prefix}:${name}(${addrAbbrev})` : `${prefix}:Unknown(${addrAbbrev})`;
|
|
8
9
|
return createLogger(module, options);
|
|
9
10
|
}
|
|
10
11
|
/**
|
|
@@ -14,10 +15,24 @@ import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
|
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
17
|
* Displays debug logs collected during public function simulation,
|
|
17
|
-
* using the `
|
|
18
|
+
* using the `contract:` prefixed logger format.
|
|
18
19
|
*/ export async function displayDebugLogs(debugLogs, getContractName) {
|
|
19
20
|
for (const log of debugLogs){
|
|
20
|
-
const
|
|
21
|
-
|
|
21
|
+
const { kind, message } = stripAztecnrLogPrefix(log.message);
|
|
22
|
+
const logger = await createContractLogger(log.contractAddress, getContractName, kind);
|
|
23
|
+
logContractMessage(logger, log.level, message, log.fields);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function stripAztecnrLogPrefix(message) {
|
|
27
|
+
if (message.startsWith('[aztec-nr] ')) {
|
|
28
|
+
return {
|
|
29
|
+
kind: 'aztecnr',
|
|
30
|
+
message: message.slice('[aztec-nr] '.length)
|
|
31
|
+
};
|
|
32
|
+
} else {
|
|
33
|
+
return {
|
|
34
|
+
kind: 'user',
|
|
35
|
+
message
|
|
36
|
+
};
|
|
22
37
|
}
|
|
23
38
|
}
|
|
@@ -18,11 +18,12 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
18
18
|
private aztecNode;
|
|
19
19
|
private contractStore;
|
|
20
20
|
private noteStore;
|
|
21
|
+
private getRegisteredAccounts;
|
|
21
22
|
private log;
|
|
22
23
|
readonly storeName = "contract_sync";
|
|
23
24
|
private syncedContracts;
|
|
24
25
|
private excludedFromSync;
|
|
25
|
-
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
|
|
26
|
+
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, getRegisteredAccounts: () => Promise<AztecAddress[]>, log: Logger);
|
|
26
27
|
/** Sets contracts that should be skipped during sync for a specific job. */
|
|
27
28
|
setExcludedFromSync(jobId: string, addresses: Set<string>): void;
|
|
28
29
|
/**
|
|
@@ -42,4 +43,4 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
42
43
|
commit(jobId: string): Promise<void>;
|
|
43
44
|
discardStaged(jobId: string): Promise<void>;
|
|
44
45
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMscUJBQXFCO0lBQzdCLE9BQU8sQ0FBQyxHQUFHO0lBZmIsUUFBUSxDQUFDLFNBQVMsbUJBQW1CO0lBS3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlDO0lBR2hFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBdUM7SUFFL0QsWUFDVSxTQUFTLEVBQUUsU0FBUyxFQUNwQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsU0FBUyxFQUNwQixxQkFBcUIsRUFBRSxNQUFNLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUNwRCxHQUFHLEVBQUUsTUFBTSxFQUNqQjtJQUVKLDRFQUE0RTtJQUM1RSxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUUvRDtJQUVEOzs7Ozs7OztPQVFHO0lBQ0csb0JBQW9CLENBQ3hCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDM0UsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxZQUFZLEdBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQmY7SUFFRCxzR0FBc0c7SUFDdEcsMkJBQTJCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsSUFBSSxDQU12RjtJQXNDRCxnRkFBZ0Y7SUFDaEYsSUFBSSxJQUFJLElBQUksQ0FHWDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJbkM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTFDO0NBMkNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;IAYnD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;IAYnD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,GAAG;IAfb,QAAQ,CAAC,SAAS,mBAAmB;IAKrC,OAAO,CAAC,eAAe,CAAyC;IAGhE,OAAO,CAAC,gBAAgB,CAAuC;IAE/D,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,qBAAqB,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACpD,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAE/D;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAC3E,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiBf;IAED,sGAAsG;IACtG,2BAA2B,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAMvF;IAsCD,gFAAgF;IAChF,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1C;CA2CF"}
|
|
@@ -8,6 +8,7 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
|
|
|
8
8
|
aztecNode;
|
|
9
9
|
contractStore;
|
|
10
10
|
noteStore;
|
|
11
|
+
getRegisteredAccounts;
|
|
11
12
|
log;
|
|
12
13
|
storeName;
|
|
13
14
|
// Tracks contracts synced since last wipe. The cache is keyed per individual scope address
|
|
@@ -16,10 +17,11 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
|
|
|
16
17
|
syncedContracts;
|
|
17
18
|
// Per-job excluded contract addresses - these contracts should not be synced.
|
|
18
19
|
excludedFromSync;
|
|
19
|
-
constructor(aztecNode, contractStore, noteStore, log){
|
|
20
|
+
constructor(aztecNode, contractStore, noteStore, getRegisteredAccounts, log){
|
|
20
21
|
this.aztecNode = aztecNode;
|
|
21
22
|
this.contractStore = contractStore;
|
|
22
23
|
this.noteStore = noteStore;
|
|
24
|
+
this.getRegisteredAccounts = getRegisteredAccounts;
|
|
23
25
|
this.log = log;
|
|
24
26
|
this.storeName = 'contract_sync';
|
|
25
27
|
this.syncedContracts = new Map();
|
|
@@ -52,8 +54,16 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
|
|
|
52
54
|
}
|
|
53
55
|
async #syncContract(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId, scopes) {
|
|
54
56
|
this.log.debug(`Syncing contract ${contractAddress}`);
|
|
57
|
+
// Resolve ALL_SCOPES to actual registered accounts, since sync_state must be called once per account.
|
|
58
|
+
const scopeAddresses = scopes === 'ALL_SCOPES' ? await this.getRegisteredAccounts() : scopes;
|
|
55
59
|
await Promise.all([
|
|
56
|
-
|
|
60
|
+
// Call sync_state sequentially for each scope address — each invocation synchronizes one account's private
|
|
61
|
+
// state using scoped capsule arrays.
|
|
62
|
+
(async ()=>{
|
|
63
|
+
for (const scope of scopeAddresses){
|
|
64
|
+
await syncState(contractAddress, this.contractStore, functionToInvokeAfterSync, utilityExecutor, this.noteStore, this.aztecNode, anchorBlockHeader, jobId, scope);
|
|
65
|
+
}
|
|
66
|
+
})(),
|
|
57
67
|
verifyCurrentClassId(contractAddress, this.aztecNode, this.contractStore, anchorBlockHeader)
|
|
58
68
|
]);
|
|
59
69
|
this.log.debug(`Contract ${contractAddress} synced`);
|
|
@@ -16,7 +16,7 @@ import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
|
16
16
|
* @returns The current class id.
|
|
17
17
|
*/
|
|
18
18
|
export declare function readCurrentClassId(contractAddress: AztecAddress, instance: ContractInstance, aztecNode: AztecNode, header: BlockHeader): Promise<import("@aztec/foundation/schemas").Fr>;
|
|
19
|
-
export declare function syncState(contractAddress: AztecAddress, contractStore: ContractStore, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall, scopes: AccessScopes) => Promise<any>, noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string,
|
|
19
|
+
export declare function syncState(contractAddress: AztecAddress, contractStore: ContractStore, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall, scopes: AccessScopes) => Promise<any>, noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string, scope: AztecAddress): Promise<void>;
|
|
20
20
|
/**
|
|
21
21
|
* Verify that the current class id of a contract obtained from AztecNode is the same as the one in contract data
|
|
22
22
|
* provider (i.e. PXE's own storage).
|
|
@@ -26,4 +26,4 @@ export declare function syncState(contractAddress: AztecAddress, contractStore:
|
|
|
26
26
|
* @param header - The header of the block at which to verify the current class id.
|
|
27
27
|
*/
|
|
28
28
|
export declare function verifyCurrentClassId(contractAddress: AztecAddress, aztecNode: AztecNode, contractStore: ContractStore, header: BlockHeader): Promise<void>;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X3N5bmMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxXQUFXLG1EQWFwQjtBQUVELHdCQUFzQixTQUFTLENBQzdCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDdEYsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLEtBQUssRUFBRSxZQUFZLGlCQXFCcEI7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLG9CQUFvQixDQUN4QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixTQUFTLEVBQUUsU0FBUyxFQUNwQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsV0FBVyxpQkFhcEIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/contract_sync/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,mDAapB;AAED,wBAAsB,SAAS,CAC7B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EACtF,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/contract_sync/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,mDAapB;AAED,wBAAsB,SAAS,CAC7B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EACtF,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,YAAY,iBAqBpB;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,WAAW,iBAapB"}
|