@aztec/pxe 0.70.0 → 0.72.1
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/config/index.d.ts.map +1 -1
- package/dest/config/index.js +3 -3
- package/dest/database/kv_pxe_database.d.ts +7 -5
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +33 -11
- package/dest/database/note_dao.d.ts +2 -4
- package/dest/database/note_dao.d.ts.map +1 -1
- package/dest/database/note_dao.js +3 -7
- package/dest/database/outgoing_note_dao.d.ts +2 -4
- package/dest/database/outgoing_note_dao.d.ts.map +1 -1
- package/dest/database/outgoing_note_dao.js +3 -7
- package/dest/database/pxe_database.d.ts +29 -12
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.js +162 -67
- package/dest/note_decryption_utils/add_public_values_to_payload.js +2 -2
- package/dest/pxe_service/pxe_service.d.ts +6 -6
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +31 -28
- package/dest/pxe_service/test/pxe_test_suite.js +9 -9
- package/dest/simulator_oracle/index.d.ts +12 -20
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +123 -69
- package/package.json +15 -15
- package/src/config/index.ts +2 -1
- package/src/database/kv_pxe_database.ts +46 -12
- package/src/database/note_dao.ts +6 -34
- package/src/database/outgoing_note_dao.ts +6 -33
- package/src/database/pxe_database.ts +31 -12
- package/src/database/pxe_database_test_suite.ts +189 -75
- package/src/note_decryption_utils/add_public_values_to_payload.ts +1 -1
- package/src/pxe_service/pxe_service.ts +47 -46
- package/src/pxe_service/test/pxe_test_suite.ts +8 -8
- package/src/simulator_oracle/index.ts +237 -88
- package/dest/note_decryption_utils/brute_force_note_info.d.ts +0 -31
- package/dest/note_decryption_utils/brute_force_note_info.d.ts.map +0 -1
- package/dest/note_decryption_utils/brute_force_note_info.js +0 -54
- package/dest/note_decryption_utils/index.d.ts +0 -3
- package/dest/note_decryption_utils/index.d.ts.map +0 -1
- package/dest/note_decryption_utils/index.js +0 -2
- package/dest/note_decryption_utils/produce_note_daos.d.ts +0 -28
- package/dest/note_decryption_utils/produce_note_daos.d.ts.map +0 -1
- package/dest/note_decryption_utils/produce_note_daos.js +0 -33
- package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts +0 -8
- package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts.map +0 -1
- package/dest/note_decryption_utils/produce_note_daos_for_key.js +0 -17
- package/src/note_decryption_utils/brute_force_note_info.ts +0 -90
- package/src/note_decryption_utils/index.ts +0 -2
- package/src/note_decryption_utils/produce_note_daos.ts +0 -69
- package/src/note_decryption_utils/produce_note_daos_for_key.ts +0 -59
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
var _SimulatorOracle_instances, _SimulatorOracle_findLeafIndex, _SimulatorOracle_getSiblingPath, _SimulatorOracle_calculateAppTaggingSecret, _SimulatorOracle_getIndexedTaggingSecretsForSenders, _SimulatorOracle_decryptTaggedLogs;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { L1NotePayload, MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
|
|
4
|
-
import { Fr, IndexedTaggingSecret, PrivateLog, computeAddressSecret, computeTaggingSecretPoint, } from '@aztec/circuits.js';
|
|
5
|
-
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';
|
|
5
|
+
import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
|
|
6
|
+
import { FunctionType, NoteSelector, encodeArguments, getFunctionArtifact, } from '@aztec/foundation/abi';
|
|
6
7
|
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
7
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
9
|
import { MessageLoadOracleInputs, } from '@aztec/simulator/client';
|
|
9
|
-
import {
|
|
10
|
+
import { ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
11
|
+
import { NoteDao } from '../database/note_dao.js';
|
|
12
|
+
import { getOrderedNoteItems } from '../note_decryption_utils/add_public_values_to_payload.js';
|
|
10
13
|
import { getAcirSimulator } from '../simulator/index.js';
|
|
11
14
|
import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
|
|
12
15
|
/**
|
|
@@ -262,6 +265,7 @@ export class SimulatorOracle {
|
|
|
262
265
|
* @returns A list of encrypted logs tagged with the recipient's address
|
|
263
266
|
*/
|
|
264
267
|
async syncTaggedLogs(contractAddress, maxBlockNumber, scopes) {
|
|
268
|
+
this.log.verbose('Searching for tagged logs', { contract: contractAddress });
|
|
265
269
|
// Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
|
|
266
270
|
// However it is impossible at the moment due to the language not supporting nested slices.
|
|
267
271
|
// This nesting is necessary because for a given set of tags we don't
|
|
@@ -306,13 +310,19 @@ export class SimulatorOracle {
|
|
|
306
310
|
const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
|
|
307
311
|
logsByTags.forEach((logsByTag, logIndex) => {
|
|
308
312
|
if (logsByTag.length > 0) {
|
|
313
|
+
// Check that public logs have the correct contract address
|
|
314
|
+
const checkedLogsbyTag = logsByTag.filter(l => !l.isFromPublic || PublicLog.fromBuffer(l.logData).contractAddress.equals(contractAddress));
|
|
315
|
+
if (checkedLogsbyTag.length < logsByTag.length) {
|
|
316
|
+
const discarded = logsByTag.filter(log => checkedLogsbyTag.find(filteredLog => filteredLog.equals(log)) === undefined);
|
|
317
|
+
this.log.warn(`Discarded ${logsByTag.length - checkedLogsbyTag.length} public logs with mismatched contract address ${contractAddress}:`, discarded.map(l => PublicLog.fromBuffer(l.logData)));
|
|
318
|
+
}
|
|
309
319
|
// The logs for the given tag exist so we store them for later processing
|
|
310
|
-
logsForRecipient.push(...
|
|
320
|
+
logsForRecipient.push(...checkedLogsbyTag);
|
|
311
321
|
// We retrieve the indexed tagging secret corresponding to the log as I need that to evaluate whether
|
|
312
322
|
// a new largest index have been found.
|
|
313
323
|
const secretCorrespondingToLog = secretsForTheWholeWindow[logIndex];
|
|
314
324
|
const initialIndex = initialIndexesMap[secretCorrespondingToLog.appTaggingSecret.toString()];
|
|
315
|
-
this.log.debug(`Found ${
|
|
325
|
+
this.log.debug(`Found ${checkedLogsbyTag.length} logs as recipient ${recipient}`, {
|
|
316
326
|
recipient,
|
|
317
327
|
secret: secretCorrespondingToLog.appTaggingSecret,
|
|
318
328
|
contractName,
|
|
@@ -366,19 +376,36 @@ export class SimulatorOracle {
|
|
|
366
376
|
* @param recipient - The recipient of the logs.
|
|
367
377
|
*/
|
|
368
378
|
async processTaggedLogs(logs, recipient, simulator) {
|
|
369
|
-
const
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
+
const decryptedLogs = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_decryptTaggedLogs).call(this, logs, recipient);
|
|
380
|
+
// We've produced the full NoteDao, which we'd be able to simply insert into the database. However, this is
|
|
381
|
+
// only a temporary measure as we migrate from the PXE-driven discovery into the new contract-driven approach. We
|
|
382
|
+
// discard most of the work done up to this point and reconstruct the note plaintext to then hand over to the
|
|
383
|
+
// contract for further processing.
|
|
384
|
+
for (const decryptedLog of decryptedLogs) {
|
|
385
|
+
// Log processing requires the note hashes in the tx in which the note was created. We are now assuming that the
|
|
386
|
+
// note was included in the same block in which the log was delivered - note that partial notes will not work this
|
|
387
|
+
// way.
|
|
388
|
+
const txEffect = await this.aztecNode.getTxEffect(decryptedLog.txHash);
|
|
389
|
+
if (!txEffect) {
|
|
390
|
+
throw new Error(`Could not find tx effect for tx hash ${decryptedLog.txHash}`);
|
|
391
|
+
}
|
|
392
|
+
// This will trigger calls to the deliverNote oracle
|
|
393
|
+
await this.callProcessLog(decryptedLog.contractAddress, decryptedLog.plaintext, decryptedLog.txHash, txEffect.data.noteHashes, txEffect.data.nullifiers[0], recipient, simulator);
|
|
379
394
|
}
|
|
395
|
+
return;
|
|
396
|
+
}
|
|
397
|
+
// Called when notes are delivered, usually as a result to a call to the process_log contract function
|
|
398
|
+
async deliverNote(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient) {
|
|
399
|
+
const noteDao = await this.produceNoteDao(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient);
|
|
400
|
+
await this.db.addNotes([noteDao], recipient);
|
|
401
|
+
this.log.verbose('Added note', {
|
|
402
|
+
contract: noteDao.contractAddress,
|
|
403
|
+
slot: noteDao.storageSlot,
|
|
404
|
+
nullifier: noteDao.siloedNullifier.toString,
|
|
405
|
+
});
|
|
380
406
|
}
|
|
381
407
|
async removeNullifiedNotes(contractAddress) {
|
|
408
|
+
this.log.verbose('Removing nullified notes', { contract: contractAddress });
|
|
382
409
|
for (const recipient of await this.keyStore.getAccounts()) {
|
|
383
410
|
const currentNotesForRecipient = await this.db.getNotes({ contractAddress, owner: recipient });
|
|
384
411
|
const nullifiersToCheck = currentNotesForRecipient.map(note => note.siloedNullifier);
|
|
@@ -390,7 +417,7 @@ export class SimulatorOracle {
|
|
|
390
417
|
}
|
|
391
418
|
})
|
|
392
419
|
.filter(nullifier => nullifier !== undefined);
|
|
393
|
-
const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, recipient.toAddressPoint());
|
|
420
|
+
const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, await recipient.toAddressPoint());
|
|
394
421
|
nullifiedNotes.forEach(noteDao => {
|
|
395
422
|
this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
|
|
396
423
|
contract: noteDao.contractAddress,
|
|
@@ -400,25 +427,62 @@ export class SimulatorOracle {
|
|
|
400
427
|
});
|
|
401
428
|
}
|
|
402
429
|
}
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
430
|
+
async produceNoteDao(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient) {
|
|
431
|
+
// We need to validate that the note does indeed exist in the world state to avoid adding notes that are then
|
|
432
|
+
// impossible to prove.
|
|
433
|
+
const receipt = await this.aztecNode.getTxReceipt(new TxHash(txHash));
|
|
434
|
+
if (receipt === undefined) {
|
|
435
|
+
throw new Error(`Failed to fetch tx receipt for tx hash ${txHash} when searching for note hashes`);
|
|
436
|
+
}
|
|
437
|
+
// Siloed and unique hashes are computed by us instead of relying on values sent by the contract to make sure
|
|
438
|
+
// we're not e.g. storing notes that belong to some other contract, which would constitute a security breach.
|
|
439
|
+
const uniqueNoteHash = computeUniqueNoteHash(nonce, siloNoteHash(contractAddress, noteHash));
|
|
440
|
+
const siloedNullifier = siloNullifier(contractAddress, nullifier);
|
|
441
|
+
// We store notes by their index in the global note hash tree, which has the convenient side effect of validating
|
|
442
|
+
// note existence in said tree. Note that while this is technically a historical query, we perform it at the latest
|
|
443
|
+
// locally synced block number which *should* be recent enough to be available. We avoid querying at 'latest' since
|
|
444
|
+
// we want to avoid accidentally processing notes that only exist ahead in time of the locally synced state.
|
|
445
|
+
const syncedBlockNumber = await this.db.getBlockNumber();
|
|
446
|
+
const uniqueNoteHashTreeIndex = (await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [uniqueNoteHash]))[0];
|
|
447
|
+
if (uniqueNoteHashTreeIndex === undefined) {
|
|
448
|
+
throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present on the tree at block ${syncedBlockNumber} (from tx ${txHash})`);
|
|
449
|
+
}
|
|
450
|
+
return new NoteDao(new Note(content), contractAddress, storageSlot, nonce, noteHash, siloedNullifier, new TxHash(txHash), receipt.blockNumber, receipt.blockHash.toString(), uniqueNoteHashTreeIndex, await recipient.toAddressPoint(), NoteSelector.empty());
|
|
412
451
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
452
|
+
async callProcessLog(contractAddress, logPlaintext, txHash, noteHashes, firstNullifier, recipient, simulator) {
|
|
453
|
+
const artifact = await new ContractDataOracle(this.db).getFunctionArtifactByName(contractAddress, 'process_log');
|
|
454
|
+
if (!artifact) {
|
|
455
|
+
throw new Error(`Mandatory implementation of "process_log" missing in noir contract ${contractAddress.toString()}.`);
|
|
456
|
+
}
|
|
457
|
+
const execRequest = {
|
|
458
|
+
name: artifact.name,
|
|
459
|
+
to: contractAddress,
|
|
460
|
+
selector: FunctionSelector.fromNameAndParameters(artifact),
|
|
461
|
+
type: FunctionType.UNCONSTRAINED,
|
|
462
|
+
isStatic: artifact.isStatic,
|
|
463
|
+
args: encodeArguments(artifact, [
|
|
464
|
+
toBoundedVec(logPlaintext, PRIVATE_LOG_SIZE_IN_FIELDS),
|
|
465
|
+
txHash.toString(),
|
|
466
|
+
toBoundedVec(noteHashes, MAX_NOTE_HASHES_PER_TX),
|
|
467
|
+
firstNullifier,
|
|
468
|
+
recipient,
|
|
469
|
+
]),
|
|
470
|
+
returnTypes: artifact.returnTypes,
|
|
471
|
+
};
|
|
472
|
+
await (simulator ??
|
|
473
|
+
getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.simulationProvider, this.contractDataOracle)).runUnconstrained(execRequest, artifact, contractAddress, []);
|
|
474
|
+
}
|
|
475
|
+
dbStore(contractAddress, slot, values) {
|
|
476
|
+
return this.db.dbStore(contractAddress, slot, values);
|
|
477
|
+
}
|
|
478
|
+
dbLoad(contractAddress, slot) {
|
|
479
|
+
return this.db.dbLoad(contractAddress, slot);
|
|
480
|
+
}
|
|
481
|
+
dbDelete(contractAddress, slot) {
|
|
482
|
+
return this.db.dbDelete(contractAddress, slot);
|
|
483
|
+
}
|
|
484
|
+
dbCopy(contractAddress, srcSlot, dstSlot, numEntries) {
|
|
485
|
+
return this.db.dbCopy(contractAddress, srcSlot, dstSlot, numEntries);
|
|
422
486
|
}
|
|
423
487
|
}
|
|
424
488
|
_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_findLeafIndex = async function _SimulatorOracle_findLeafIndex(blockNumber, treeId, leafValue) {
|
|
@@ -440,7 +504,7 @@ _SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_findLeafIndex = asy
|
|
|
440
504
|
}, _SimulatorOracle_calculateAppTaggingSecret = async function _SimulatorOracle_calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
441
505
|
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
442
506
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
443
|
-
const secretPoint = computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
507
|
+
const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
|
|
444
508
|
// Silo the secret so it can't be used to track other app's notes
|
|
445
509
|
const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
|
|
446
510
|
return appSecret;
|
|
@@ -460,10 +524,10 @@ async function _SimulatorOracle_getIndexedTaggingSecretsForSenders(contractAddre
|
|
|
460
524
|
// We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
|
|
461
525
|
// (recipient = us, sender = us)
|
|
462
526
|
const senders = [...(await this.db.getSenderAddresses()), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
|
|
463
|
-
const appTaggingSecrets = senders.map(contact => {
|
|
464
|
-
const sharedSecret = computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
|
|
527
|
+
const appTaggingSecrets = await Promise.all(senders.map(async (contact) => {
|
|
528
|
+
const sharedSecret = await computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
|
|
465
529
|
return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
|
|
466
|
-
});
|
|
530
|
+
}));
|
|
467
531
|
const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
|
|
468
532
|
return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
|
|
469
533
|
}, _SimulatorOracle_decryptTaggedLogs =
|
|
@@ -471,44 +535,34 @@ async function _SimulatorOracle_getIndexedTaggingSecretsForSenders(contractAddre
|
|
|
471
535
|
* Decrypts logs tagged for a recipient and returns them.
|
|
472
536
|
* @param scopedLogs - The logs to decrypt.
|
|
473
537
|
* @param recipient - The recipient of the logs.
|
|
474
|
-
* @param simulator - The simulator to use for decryption.
|
|
475
538
|
* @returns The decrypted notes.
|
|
476
539
|
*/
|
|
477
|
-
async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient
|
|
540
|
+
async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient) {
|
|
478
541
|
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
479
542
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
480
|
-
const addressSecret = computeAddressSecret(recipientCompleteAddress.getPreaddress(), ivskM);
|
|
543
|
+
const addressSecret = await computeAddressSecret(recipientCompleteAddress.getPreaddress(), ivskM);
|
|
481
544
|
// Since we could have notes with the same index for different txs, we need
|
|
482
545
|
// to keep track of them scoping by txHash
|
|
483
546
|
const excludedIndices = new Map();
|
|
484
|
-
const
|
|
485
|
-
const txEffectsCache = new Map();
|
|
547
|
+
const decrypted = [];
|
|
486
548
|
for (const scopedLog of scopedLogs) {
|
|
487
|
-
const
|
|
488
|
-
? L1NotePayload.decryptAsIncomingFromPublic(scopedLog.logData, addressSecret)
|
|
489
|
-
: L1NotePayload.decryptAsIncoming(PrivateLog.fromBuffer(scopedLog.logData), addressSecret);
|
|
490
|
-
if (
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
}
|
|
497
|
-
txEffectsCache.set(scopedLog.txHash.toString(), txEffect);
|
|
498
|
-
if (!excludedIndices.has(scopedLog.txHash.toString())) {
|
|
499
|
-
excludedIndices.set(scopedLog.txHash.toString(), new Set());
|
|
500
|
-
}
|
|
501
|
-
const { note } = await produceNoteDaos(
|
|
502
|
-
// I don't like this at all, but we need a simulator to run `computeNoteHashAndOptionallyANullifier`. This generates
|
|
503
|
-
// a chicken-and-egg problem due to this oracle requiring a simulator, which in turn requires this oracle. Furthermore, since jest doesn't allow
|
|
504
|
-
// mocking ESM exports, we have to pollute the method even more by providing a simulator parameter so tests can inject a fake one.
|
|
505
|
-
simulator ??
|
|
506
|
-
getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.simulationProvider, this.contractDataOracle), this.db, notePayload ? recipient.toAddressPoint() : undefined, payload, txEffect.data.txHash, txEffect.data.nullifiers[0], txEffect.l2BlockNumber, txEffect.l2BlockHash, txEffect.data.noteHashes, scopedLog.dataStartIndexForTx, excludedIndices.get(scopedLog.txHash.toString()), this.log);
|
|
507
|
-
if (note) {
|
|
508
|
-
notes.push(note);
|
|
509
|
-
}
|
|
549
|
+
const payload = scopedLog.isFromPublic
|
|
550
|
+
? await L1NotePayload.decryptAsIncomingFromPublic(PublicLog.fromBuffer(scopedLog.logData), addressSecret)
|
|
551
|
+
: await L1NotePayload.decryptAsIncoming(PrivateLog.fromBuffer(scopedLog.logData), addressSecret);
|
|
552
|
+
if (!payload) {
|
|
553
|
+
this.log.verbose('Unable to decrypt log');
|
|
554
|
+
continue;
|
|
555
|
+
}
|
|
556
|
+
if (!excludedIndices.has(scopedLog.txHash.toString())) {
|
|
557
|
+
excludedIndices.set(scopedLog.txHash.toString(), new Set());
|
|
510
558
|
}
|
|
559
|
+
const note = await getOrderedNoteItems(this.db, payload);
|
|
560
|
+
const plaintext = [payload.storageSlot, payload.noteTypeId.toField(), ...note.items];
|
|
561
|
+
decrypted.push({ plaintext, txHash: scopedLog.txHash, contractAddress: payload.contractAddress });
|
|
511
562
|
}
|
|
512
|
-
return
|
|
563
|
+
return decrypted;
|
|
513
564
|
};
|
|
514
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
|
|
565
|
+
function toBoundedVec(array, maxLength) {
|
|
566
|
+
return { storage: array.concat(Array(maxLength - array.length).fill(new Fr(0))), len: array.length };
|
|
567
|
+
}
|
|
568
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":";;AAAA,OAAO,EAIL,aAAa,EAGb,YAAY,EACZ,IAAI,EAIJ,MAAM,EAEN,mCAAmC,GACpC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAKL,EAAE,EACF,gBAAgB,EAChB,oBAAoB,EAGpB,sBAAsB,EACtB,0BAA0B,EAC1B,UAAU,EACV,SAAS,EACT,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAEL,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAGL,uBAAuB,GAExB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,oCAAoC,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAElH;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B,YACU,kBAAsC,EACtC,EAAe,EACf,QAAkB,EAClB,SAAoB,EACpB,kBAAsC,EACtC,MAAM,YAAY,CAAC,sBAAsB,CAAC;;QAL1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,OAAE,GAAF,EAAE,CAAa;QACf,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QACpB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,QAAG,GAAH,GAAG,CAAuC;IACjD,CAAC;IAEJ,uBAAuB,CAAC,OAAW,EAAE,eAA6B;QAChE,OAAO,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAqB;QAC5C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO;8QACuN,CACvQ,CAAC;QACJ,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAqB;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAe;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,eAA6B,EAAE,WAAe,EAAE,MAAkB,EAAE,MAAuB;QACxG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC;YACtC,eAAe;YACf,WAAW;YACX,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACxG,eAAe;YACf,WAAW;YACX,KAAK;YACL,IAAI;YACJ,QAAQ;YACR,eAAe;YACf,uDAAuD;YACvD,KAAK;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,eAA6B,EAAE,QAA0B;QACjF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC9F,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAChG,OAAO;YACL,GAAG,QAAQ;YACX,KAAK;SACN,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,eAA6B,EAC7B,YAAoB;QAEpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACpF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC7F,OAAO,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,0BAA0B,CAC9B,eAA6B,EAC7B,WAAe,EACf,MAAU;QAEV,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,mCAAmC,CAC3E,IAAI,CAAC,SAAS,EACd,eAAe,EACf,WAAW,EACX,MAAM,CACP,CAAC;QAEF,6FAA6F;QAC7F,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,uBAAuB;IAChB,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,kBAAkB,CAAC,UAAc;QACrC,OAAO,MAAM,uBAAA,IAAI,kEAAe,MAAnB,IAAI,EAAgB,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IACtF,CAAC;IAED,iFAAiF;IAC1E,kBAAkB,CAAC,UAAkB;QAC1C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAa;QACnC,OAAO,MAAM,uBAAA,IAAI,kEAAe,MAAnB,IAAI,EAAgB,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACrF,CAAC;IAOM,KAAK,CAAC,oBAAoB,CAAC,WAAmB,EAAE,MAAoB,EAAE,SAAa;QACxF,MAAM,SAAS,GAAG,MAAM,uBAAA,IAAI,kEAAe,MAAnB,IAAI,EAAgB,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,eAAe,SAAS,iBAAiB,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,mEAAgB,MAApB,IAAI,EAAiB,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAE/E,OAAO,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC;IAC7C,CAAC;IAiBM,KAAK,CAAC,0CAA0C,CAAC,SAAa;QACnE,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,6BAA6B,CAClC,WAAmB,EACnB,SAAa;QAEb,OAAO,IAAI,CAAC,SAAS,CAAC,6BAA6B,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAEM,gCAAgC,CACrC,WAAmB,EACnB,SAAa;QAEb,OAAO,IAAI,CAAC,SAAS,CAAC,gCAAgC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,WAAmB;QACvC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,WAAmB,EAAE,QAAY;QACrE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,cAAc;QACzB,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IAC/C,CAAC;IAEM,oBAAoB,CAAC,eAA6B,EAAE,QAA0B;QACnF,OAAO,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED;;;;;OAKG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,+BAA+B,CAC1C,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnG,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnF,OAAO,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,sCAAsC,CACjD,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,YAAY,IAAI,eAAe,GAAG,EAAE;YACvF,MAAM;YACN,MAAM;YACN,SAAS;YACT,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IA0CD;;;;;;OAMG;IACI,KAAK,CAAC,sBAAsB,CACjC,eAA6B,EAC7B,MAAoB,EACpB,SAAuB;QAEvB,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,8EAA2B,MAA/B,IAAI,EAA4B,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACnG,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEtF,kCAAkC;QAClC,iHAAiH;QACjH,qBAAqB;QACrB,iHAAiH;QACjH,0BAA0B;QAC1B,MAAM,0BAA0B,GAAG,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,0BAA0B,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,uBAAuB,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5D,GAAG,CAAC;YACF,wDAAwD;YACxD,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC3D,MAAM,uBAAuB,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;gBAC7F,OAAO,uBAAuB,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YAEH,iCAAiC;YACjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAErE,oEAAoE;YACpE,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;YAE3F,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC1B,qEAAqE;gBACrE,MAAM;YACR,CAAC;YAED,6DAA6D;YAC7D,YAAY,IAAI,cAAc,GAAG,CAAC,CAAC;YAEnC,8GAA8G;YAC9G,uBAAuB,GAAG,WAAW,GAAG,cAAc,GAAG,CAAC,CAAC;QAC7D,CAAC,QAAQ,uBAAuB,GAAG,0BAA0B,EAAE;QAE/D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,CAAC,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;YAE3G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,MAAM,gBAAgB,YAAY,IAAI,eAAe,GAAG,EAAE;gBAClG,MAAM;gBACN,MAAM,EAAE,gBAAgB;gBACxB,KAAK,EAAE,YAAY;gBACnB,YAAY;gBACZ,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,MAAM,gBAAgB,YAAY,IAAI,eAAe,GAAG,CAAC,CAAC;QAC3G,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,cAAc,CACzB,eAA6B,EAC7B,cAAsB,EACtB,MAAuB;QAEvB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAE7E,gGAAgG;QAChG,2FAA2F;QAC3F,qEAAqE;QACrE,mFAAmF;QACnF,wFAAwF;QAExF,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACvE,0GAA0G;QAC1G,+GAA+G;QAC/G,gGAAgG;QAChG,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;QACnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACzF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAoB,EAAE,CAAC;YAE7C,iEAAiE;YACjE,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,uFAAoC,MAAxC,IAAI,EAAqC,eAAe,EAAE,SAAS,CAAC,CAAC;YAE3F,oDAAoD;YACpD,iFAAiF;YACjF,EAAE;YACF,2GAA2G;YAC3G,gHAAgH;YAChH,uHAAuH;YACvH,uHAAuH;YACvH,yFAAyF;YACzF,IAAI,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC3C,OAAO;oBACL,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC;oBAC3D,cAAc,EAAE,MAAM,CAAC,KAAK,GAAG,gBAAgB;iBAChD,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,2GAA2G;YAC3G,MAAM,yBAAyB,GAA4B,EAAE,CAAC;YAE9D,+GAA+G;YAC/G,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAExD,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,wBAAwB,GAAG,oCAAoC,CAAC,iBAAiB,CAAC,CAAC;gBACzF,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAClE,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CACpD,CAAC;gBAEF,uGAAuG;gBACvG,sDAAsD;gBACtD,MAAM,8BAA8B,GAA4B,EAAE,CAAC;gBAEnE,oDAAoD;gBACpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;gBAE7E,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;oBACzC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzB,2DAA2D;wBAC3D,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM,CACvC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,CAChG,CAAC;wBACF,IAAI,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;4BAC/C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAChC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,CACnF,CAAC;4BACF,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,aACE,SAAS,CAAC,MAAM,GAAG,gBAAgB,CAAC,MACtC,iDAAiD,eAAe,GAAG,EACnE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CACpD,CAAC;wBACJ,CAAC;wBAED,yEAAyE;wBACzE,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;wBAE3C,qGAAqG;wBACrG,uCAAuC;wBACvC,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;wBACpE,MAAM,YAAY,GAAG,iBAAiB,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAE7F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,gBAAgB,CAAC,MAAM,sBAAsB,SAAS,EAAE,EAAE;4BAChF,SAAS;4BACT,MAAM,EAAE,wBAAwB,CAAC,gBAAgB;4BACjD,YAAY;4BACZ,eAAe;yBAChB,CAAC,CAAC;wBAEH,IACE,wBAAwB,CAAC,KAAK,IAAI,YAAY;4BAC9C,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,KAAK,SAAS;gCACjG,wBAAwB,CAAC,KAAK;oCAC5B,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,EACzF,CAAC;4BACD,yGAAyG;4BACzG,uEAAuE;4BACvE,8BAA8B,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gCAClF,wBAAwB,CAAC,KAAK,GAAG,CAAC,CAAC;4BAErC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,yBACE,wBAAwB,CAAC,KAAK,GAAG,CACnC,gBAAgB,YAAY,IAAI,eAAe,GAAG,CACnD,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,+GAA+G;gBAC/G,+GAA+G;gBAC/G,mEAAmE;gBACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC;gBAChC,KAAK,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,EAAE,CAAC;oBAC1F,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,gBAAgB,CAAC,CAAC;oBAC/F,IAAI,MAAM,EAAE,CAAC;wBACX,oBAAoB,CAAC,IAAI,CAAC;4BACxB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;4BACzC,oFAAoF;4BACpF,aAAa,EAAE,QAAQ;4BACvB,cAAc,EAAE,QAAQ,GAAG,gBAAgB;yBAC5C,CAAC,CAAC;wBAEH,yEAAyE;wBACzE,yBAAyB,CAAC,gBAAgB,CAAC,GAAG,QAAQ,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,KAAK,CACb,yCAAyC,gBAAgB,4CAA4C,CACtG,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,4EAA4E;gBAC5E,iBAAiB,GAAG,oBAAoB,CAAC;YAC3C,CAAC;YAED,gEAAgE;YAChE,OAAO,CAAC,GAAG,CACT,SAAS,CAAC,QAAQ,EAAE,EACpB,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,cAAc,CAAC,CAClE,CAAC;YAEF,gHAAgH;YAChH,MAAM,IAAI,CAAC,EAAE,CAAC,mCAAmC,CAC/C,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAC3C,CAAC,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CACnG,CACF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IA2CD;;;;OAIG;IACI,KAAK,CAAC,iBAAiB,CAC5B,IAAqB,EACrB,SAAuB,EACvB,SAAyB;QAEzB,MAAM,aAAa,GAAG,MAAM,uBAAA,IAAI,sEAAmB,MAAvB,IAAI,EAAoB,IAAI,EAAE,SAAS,CAAC,CAAC;QAErE,2GAA2G;QAC3G,iHAAiH;QACjH,6GAA6G;QAC7G,mCAAmC;QACnC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,gHAAgH;YAChH,kHAAkH;YAClH,OAAO;YACP,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACvE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,wCAAwC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;YACjF,CAAC;YAED,oDAAoD;YACpD,MAAM,IAAI,CAAC,cAAc,CACvB,YAAY,CAAC,eAAe,EAC5B,YAAY,CAAC,SAAS,EACtB,YAAY,CAAC,MAAM,EACnB,QAAQ,CAAC,IAAI,CAAC,UAAU,EACxB,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAC3B,SAAS,EACT,SAAS,CACV,CAAC;QACJ,CAAC;QACD,OAAO;IACT,CAAC;IAED,sGAAsG;IAC/F,KAAK,CAAC,WAAW,CACtB,eAA6B,EAC7B,WAAe,EACf,KAAS,EACT,OAAa,EACb,QAAY,EACZ,SAAa,EACb,MAAU,EACV,SAAuB;QAEvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CACvC,eAAe,EACf,WAAW,EACX,KAAK,EACL,OAAO,EACP,QAAQ,EACR,SAAS,EACT,MAAM,EACN,SAAS,CACV,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE;YAC7B,QAAQ,EAAE,OAAO,CAAC,eAAe;YACjC,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,QAAQ;SAC5C,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,eAA6B;QAC7D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAE5E,KAAK,MAAM,SAAS,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1D,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/F,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,8BAA8B,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YAE1G,MAAM,eAAe,GAAG,iBAAiB;iBACtC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;gBACpB,IAAI,gBAAgB,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;oBACtC,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,EAAiB,CAAC;gBAC3E,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,KAAK,SAAS,CAAkB,CAAC;YAEjE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;YAC7G,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,6BAA6B,OAAO,CAAC,eAAe,YAAY,OAAO,CAAC,WAAW,EAAE,EAAE;oBACtG,QAAQ,EAAE,OAAO,CAAC,eAAe;oBACjC,IAAI,EAAE,OAAO,CAAC,WAAW;oBACzB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE;iBAC9C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,eAA6B,EAC7B,WAAe,EACf,KAAS,EACT,OAAa,EACb,QAAY,EACZ,SAAa,EACb,MAAU,EACV,SAAuB;QAEvB,6GAA6G;QAC7G,uBAAuB;QAEvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,iCAAiC,CAAC,CAAC;QACrG,CAAC;QAED,6GAA6G;QAC7G,6GAA6G;QAC7G,MAAM,cAAc,GAAG,qBAAqB,CAAC,KAAK,EAAE,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC7F,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAElE,iHAAiH;QACjH,mHAAmH;QACnH,mHAAmH;QACnH,4GAA4G;QAC5G,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC;QACzD,MAAM,uBAAuB,GAAG,CAC9B,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,iBAAkB,EAAE,YAAY,CAAC,cAAc,EAAE,CAAC,cAAc,CAAC,CAAC,CAC1G,CAAC,CAAC,CAAC,CAAC;QACL,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,gBAAgB,cAAc,yCAAyC,iBAAiB,aAAa,MAAM,GAAG,CACpI,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,OAAO,CAChB,IAAI,IAAI,CAAC,OAAO,CAAC,EACjB,eAAe,EACf,WAAW,EACX,KAAK,EACL,QAAQ,EACR,eAAe,EACf,IAAI,MAAM,CAAC,MAAM,CAAC,EAClB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,SAAU,CAAC,QAAQ,EAAE,EAC7B,uBAAuB,EACvB,MAAM,SAAS,CAAC,cAAc,EAAE,EAChC,YAAY,CAAC,KAAK,EAAE,CACrB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,eAA6B,EAC7B,YAAkB,EAClB,MAAc,EACd,UAAgB,EAChB,cAAkB,EAClB,SAAuB,EACvB,SAAyB;QAEzB,MAAM,QAAQ,GAAiC,MAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,yBAAyB,CAC5G,eAAe,EACf,aAAa,CACd,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,sEAAsE,eAAe,CAAC,QAAQ,EAAE,GAAG,CACpG,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAiB;YAChC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,EAAE,EAAE,eAAe;YACnB,QAAQ,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC;YAC1D,IAAI,EAAE,YAAY,CAAC,aAAa;YAChC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE;gBAC9B,YAAY,CAAC,YAAY,EAAE,0BAA0B,CAAC;gBACtD,MAAM,CAAC,QAAQ,EAAE;gBACjB,YAAY,CAAC,UAAU,EAAE,sBAAsB,CAAC;gBAChD,cAAc;gBACd,SAAS;aACV,CAAC;YACF,WAAW,EAAE,QAAQ,CAAC,WAAW;SAClC,CAAC;QAEF,MAAM,CACJ,SAAS;YACT,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAC3G,CAAC,gBAAgB,CAChB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,EAAE,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,eAA6B,EAAE,IAAQ,EAAE,MAAY;QAC3D,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,eAA6B,EAAE,IAAQ;QAC5C,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,QAAQ,CAAC,eAA6B,EAAE,IAAQ;QAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,eAA6B,EAAE,OAAW,EAAE,OAAW,EAAE,UAAkB;QAChF,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;CACF;6EA/oBC,KAAK,yCAAgB,WAA0B,EAAE,MAAoB,EAAE,SAAa;IAClF,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7F,OAAO,SAAS,CAAC;AACnB,CAAC,oCAaD,KAAK,0CAAiB,WAAmB,EAAE,MAAoB,EAAE,SAAiB;IAChF,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,YAAY,CAAC,cAAc;YAC9B,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3F,KAAK,YAAY,CAAC,cAAc;YAC9B,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1F,KAAK,YAAY,CAAC,gBAAgB;YAChC,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5F,KAAK,YAAY,CAAC,OAAO;YACvB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzF;YACE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,+CA0GD,KAAK,qDAA4B,eAA6B,EAAE,MAAoB,EAAE,SAAuB;IAC3G,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,WAAW,GAAG,MAAM,yBAAyB,CAAC,qBAAqB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAClG,iEAAiE;IACjE,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IACjF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,8DACH,eAA6B,EAC7B,SAAuB;IAEvB,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IAEvF,+GAA+G;IAC/G,gCAAgC;IAChC,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CACtG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACjG,CAAC;IACF,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QAC1B,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAAC,wBAAwB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACvG,OAAO,aAAa,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CACH,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mCAAmC,CAAC,iBAAiB,CAAC,CAAC;IACrF,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC;AAuOD;;;;;GAKG;AACH,KAAK,6CAAoB,UAA2B,EAAE,SAAuB;IAC3E,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAClD,wBAAwB,CAAC,UAAU,CAAC,8BAA8B,CACnE,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,wBAAwB,CAAC,aAAa,EAAE,EAAE,KAAK,CAAC,CAAC;IAElG,2EAA2E;IAC3E,0CAA0C;IAC1C,MAAM,eAAe,GAA6B,IAAI,GAAG,EAAE,CAAC;IAC5D,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY;YACpC,CAAC,CAAC,MAAM,aAAa,CAAC,2BAA2B,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YACzG,CAAC,CAAC,MAAM,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;QAEnG,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YAC1C,SAAS;QACX,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACtD,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAErF,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACpG,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAsNH,SAAS,YAAY,CAAC,KAAW,EAAE,SAAiB;IAClD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AACvG,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/pxe",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.72.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -66,19 +66,19 @@
|
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@aztec/bb-prover": "0.
|
|
70
|
-
"@aztec/bb.js": "0.
|
|
71
|
-
"@aztec/builder": "0.
|
|
72
|
-
"@aztec/circuit-types": "0.
|
|
73
|
-
"@aztec/circuits.js": "0.
|
|
74
|
-
"@aztec/ethereum": "0.
|
|
75
|
-
"@aztec/foundation": "0.
|
|
76
|
-
"@aztec/key-store": "0.
|
|
77
|
-
"@aztec/kv-store": "0.
|
|
78
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
79
|
-
"@aztec/protocol-contracts": "0.
|
|
80
|
-
"@aztec/simulator": "0.
|
|
81
|
-
"@aztec/types": "0.
|
|
69
|
+
"@aztec/bb-prover": "0.72.1",
|
|
70
|
+
"@aztec/bb.js": "0.72.1",
|
|
71
|
+
"@aztec/builder": "0.72.1",
|
|
72
|
+
"@aztec/circuit-types": "0.72.1",
|
|
73
|
+
"@aztec/circuits.js": "0.72.1",
|
|
74
|
+
"@aztec/ethereum": "0.72.1",
|
|
75
|
+
"@aztec/foundation": "0.72.1",
|
|
76
|
+
"@aztec/key-store": "0.72.1",
|
|
77
|
+
"@aztec/kv-store": "0.72.1",
|
|
78
|
+
"@aztec/noir-protocol-circuits-types": "0.72.1",
|
|
79
|
+
"@aztec/protocol-contracts": "0.72.1",
|
|
80
|
+
"@aztec/simulator": "0.72.1",
|
|
81
|
+
"@aztec/types": "0.72.1",
|
|
82
82
|
"@msgpack/msgpack": "^3.0.0-beta2",
|
|
83
83
|
"@noir-lang/types": "workspace:*",
|
|
84
84
|
"koa": "^2.14.2",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"lodash.omit": "^4.5.0",
|
|
87
87
|
"sha3": "^2.1.4",
|
|
88
88
|
"tslib": "^2.4.0",
|
|
89
|
-
"viem": "
|
|
89
|
+
"viem": "2.22.8"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@aztec/noir-contracts.js": "workspace:^",
|
package/src/config/index.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
booleanConfigHelper,
|
|
5
5
|
getConfigFromMappings,
|
|
6
6
|
numberConfigHelper,
|
|
7
|
+
parseBooleanEnv,
|
|
7
8
|
} from '@aztec/foundation/config';
|
|
8
9
|
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
|
|
9
10
|
import { type Network } from '@aztec/types/network';
|
|
@@ -99,7 +100,7 @@ export const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PXEService
|
|
|
99
100
|
...dataConfigMappings,
|
|
100
101
|
proverEnabled: {
|
|
101
102
|
env: 'PXE_PROVER_ENABLED',
|
|
102
|
-
parseEnv: (val: string) =>
|
|
103
|
+
parseEnv: (val: string) => parseBooleanEnv(val) || !!process.env.NETWORK,
|
|
103
104
|
description: 'Enable real proofs',
|
|
104
105
|
isBoolean: true,
|
|
105
106
|
},
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
} from '@aztec/circuits.js';
|
|
11
11
|
import { type ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
|
|
12
12
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
13
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
13
|
+
import { Fr, type Point } from '@aztec/foundation/fields';
|
|
14
14
|
import { toArray } from '@aztec/foundation/iterable';
|
|
15
15
|
import { type LogFn, createDebugOnlyLogger } from '@aztec/foundation/log';
|
|
16
16
|
import {
|
|
@@ -297,7 +297,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
297
297
|
}
|
|
298
298
|
|
|
299
299
|
async getNotes(filter: NotesFilter): Promise<NoteDao[]> {
|
|
300
|
-
const publicKey: PublicKey | undefined = filter.owner ? filter.owner.toAddressPoint() : undefined;
|
|
300
|
+
const publicKey: PublicKey | undefined = filter.owner ? await filter.owner.toAddressPoint() : undefined;
|
|
301
301
|
|
|
302
302
|
filter.status = filter.status ?? NoteStatus.ACTIVE;
|
|
303
303
|
|
|
@@ -394,7 +394,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
394
394
|
return result;
|
|
395
395
|
}
|
|
396
396
|
|
|
397
|
-
removeNullifiedNotes(nullifiers: InBlock<Fr>[], accountAddressPoint:
|
|
397
|
+
removeNullifiedNotes(nullifiers: InBlock<Fr>[], accountAddressPoint: Point): Promise<NoteDao[]> {
|
|
398
398
|
if (nullifiers.length === 0) {
|
|
399
399
|
return Promise.resolve([]);
|
|
400
400
|
}
|
|
@@ -545,7 +545,9 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
545
545
|
}
|
|
546
546
|
|
|
547
547
|
async getCompleteAddresses(): Promise<CompleteAddress[]> {
|
|
548
|
-
return
|
|
548
|
+
return await Promise.all(
|
|
549
|
+
(await toArray(this.#completeAddresses.valuesAsync())).map(v => CompleteAddress.fromBuffer(v)),
|
|
550
|
+
);
|
|
549
551
|
}
|
|
550
552
|
|
|
551
553
|
async addSenderAddress(address: AztecAddress): Promise<boolean> {
|
|
@@ -622,17 +624,17 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
622
624
|
});
|
|
623
625
|
}
|
|
624
626
|
|
|
625
|
-
async
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
627
|
+
async dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void> {
|
|
628
|
+
await this.#contractStore.set(
|
|
629
|
+
dbSlotToKey(contractAddress, slot),
|
|
630
|
+
Buffer.concat(values.map(value => value.toBuffer())),
|
|
631
|
+
);
|
|
629
632
|
}
|
|
630
633
|
|
|
631
|
-
async
|
|
632
|
-
const
|
|
633
|
-
const dataBuffer = await this.#contractStore.getAsync(dataKey);
|
|
634
|
+
async dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null> {
|
|
635
|
+
const dataBuffer = await this.#contractStore.getAsync(dbSlotToKey(contractAddress, slot));
|
|
634
636
|
if (!dataBuffer) {
|
|
635
|
-
this.debug(`Data not found for contract ${
|
|
637
|
+
this.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
|
|
636
638
|
return null;
|
|
637
639
|
}
|
|
638
640
|
const values: Fr[] = [];
|
|
@@ -641,4 +643,36 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
641
643
|
}
|
|
642
644
|
return values;
|
|
643
645
|
}
|
|
646
|
+
|
|
647
|
+
async dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void> {
|
|
648
|
+
await this.#contractStore.delete(dbSlotToKey(contractAddress, slot));
|
|
649
|
+
}
|
|
650
|
+
|
|
651
|
+
async dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
|
|
652
|
+
// In order to support overlaping source and destination regions we need to check the relative positions of source
|
|
653
|
+
// and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
|
|
654
|
+
// indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
|
|
655
|
+
// indexes to avoid reading elements that've been overwritten.
|
|
656
|
+
|
|
657
|
+
const indexes = Array.from(Array(numEntries).keys());
|
|
658
|
+
if (srcSlot.lt(dstSlot)) {
|
|
659
|
+
indexes.reverse();
|
|
660
|
+
}
|
|
661
|
+
|
|
662
|
+
for (const i of indexes) {
|
|
663
|
+
const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
|
|
664
|
+
const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
|
|
665
|
+
|
|
666
|
+
const toCopy = await this.#contractStore.getAsync(currentSrcSlot);
|
|
667
|
+
if (!toCopy) {
|
|
668
|
+
throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
|
|
669
|
+
}
|
|
670
|
+
|
|
671
|
+
await this.#contractStore.set(currentDstSlot, toCopy);
|
|
672
|
+
}
|
|
673
|
+
}
|
|
674
|
+
}
|
|
675
|
+
|
|
676
|
+
function dbSlotToKey(contractAddress: AztecAddress, slot: Fr): string {
|
|
677
|
+
return `${contractAddress.toString()}:${slot.toString()}`;
|
|
644
678
|
}
|