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