@aztec/txe 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 +3 -5
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +106 -106
- package/dest/node/txe_node.d.ts +19 -6
- package/dest/node/txe_node.d.ts.map +1 -1
- package/dest/node/txe_node.js +303 -334
- package/dest/oracle/txe_oracle.d.ts +25 -16
- package/dest/oracle/txe_oracle.d.ts.map +1 -1
- package/dest/oracle/txe_oracle.js +249 -143
- package/dest/txe_service/txe_service.d.ts +3 -3
- package/dest/txe_service/txe_service.d.ts.map +1 -1
- package/dest/txe_service/txe_service.js +205 -105
- package/dest/util/encoding.d.ts +39 -25
- package/dest/util/encoding.d.ts.map +1 -1
- package/dest/util/encoding.js +45 -11
- package/dest/util/expected_failure_error.js +1 -2
- package/dest/util/txe_database.d.ts +3 -2
- package/dest/util/txe_database.d.ts.map +1 -1
- package/dest/util/txe_database.js +6 -10
- package/dest/util/txe_public_contract_data_source.d.ts +5 -3
- package/dest/util/txe_public_contract_data_source.d.ts.map +1 -1
- package/dest/util/txe_public_contract_data_source.js +25 -13
- package/dest/util/txe_world_state_db.d.ts +6 -8
- package/dest/util/txe_world_state_db.d.ts.map +1 -1
- package/dest/util/txe_world_state_db.js +10 -23
- package/package.json +14 -15
- package/src/index.ts +2 -2
- package/src/node/txe_node.ts +64 -42
- package/src/oracle/txe_oracle.ts +101 -86
- package/src/txe_service/txe_service.ts +25 -28
- package/src/util/encoding.ts +32 -5
- package/src/util/txe_database.ts +3 -2
- package/src/util/txe_public_contract_data_source.ts +8 -9
- package/src/util/txe_world_state_db.ts +9 -26
|
@@ -1,34 +1,41 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DEPLOYER_CONTRACT_ADDRESS
|
|
3
|
-
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
|
|
4
|
-
import { NoteSelector } from '@aztec/foundation/abi';
|
|
5
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
1
|
+
import { Fr } from '@aztec/aztec.js';
|
|
2
|
+
import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants';
|
|
6
3
|
import { KeyStore } from '@aztec/key-store';
|
|
7
|
-
import { openTmpStore } from '@aztec/kv-store/lmdb';
|
|
4
|
+
import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
|
|
8
5
|
import { protocolContractNames } from '@aztec/protocol-contracts';
|
|
9
|
-
import {
|
|
6
|
+
import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
|
|
10
7
|
import { enrichPublicSimulationError } from '@aztec/pxe';
|
|
11
|
-
import { HashedValuesCache } from '@aztec/simulator/
|
|
8
|
+
import { HashedValuesCache } from '@aztec/simulator/client';
|
|
9
|
+
import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
|
|
10
|
+
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
11
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import { computePartialAddress } from '@aztec/stdlib/contract';
|
|
13
|
+
import { SimulationError } from '@aztec/stdlib/errors';
|
|
14
|
+
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash';
|
|
15
|
+
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
12
16
|
import { NativeWorldStateService } from '@aztec/world-state';
|
|
13
17
|
import { TXE } from '../oracle/txe_oracle.js';
|
|
14
|
-
import { addressFromSingle, fromArray, fromSingle, fromUintArray, toArray, toForeignCallResult, toSingle
|
|
18
|
+
import { addressFromSingle, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, toArray, toForeignCallResult, toSingle } from '../util/encoding.js';
|
|
15
19
|
import { ExpectedFailureError } from '../util/expected_failure_error.js';
|
|
16
20
|
import { TXEDatabase } from '../util/txe_database.js';
|
|
17
21
|
export class TXEService {
|
|
18
|
-
|
|
22
|
+
logger;
|
|
23
|
+
typedOracle;
|
|
24
|
+
constructor(logger, typedOracle){
|
|
19
25
|
this.logger = logger;
|
|
20
26
|
this.typedOracle = typedOracle;
|
|
21
27
|
}
|
|
22
28
|
static async init(logger) {
|
|
23
|
-
const store = openTmpStore(
|
|
29
|
+
const store = await openTmpStore('test');
|
|
24
30
|
const executionCache = new HashedValuesCache();
|
|
25
31
|
const nativeWorldStateService = await NativeWorldStateService.tmp();
|
|
26
32
|
const baseFork = await nativeWorldStateService.fork();
|
|
27
33
|
const keyStore = new KeyStore(store);
|
|
28
34
|
const txeDatabase = new TXEDatabase(store);
|
|
29
35
|
// Register protocol contracts.
|
|
30
|
-
|
|
31
|
-
|
|
36
|
+
const provider = new BundledProtocolContractsProvider();
|
|
37
|
+
for (const name of protocolContractNames){
|
|
38
|
+
const { contractClass, instance, artifact } = await provider.getProtocolContractArtifact(name);
|
|
32
39
|
await txeDatabase.addContractArtifact(contractClass.id, artifact);
|
|
33
40
|
await txeDatabase.addContractInstance(instance);
|
|
34
41
|
}
|
|
@@ -46,7 +53,7 @@ export class TXEService {
|
|
|
46
53
|
async advanceBlocksBy(blocks) {
|
|
47
54
|
const nBlocks = fromSingle(blocks).toNumber();
|
|
48
55
|
this.logger.debug(`time traveling ${nBlocks} blocks`);
|
|
49
|
-
for
|
|
56
|
+
for(let i = 0; i < nBlocks; i++){
|
|
50
57
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
51
58
|
await this.typedOracle.commitState();
|
|
52
59
|
this.typedOracle.setBlockNumber(blockNumber + 1);
|
|
@@ -65,37 +72,38 @@ export class TXEService {
|
|
|
65
72
|
async deploy(artifact, instance, secret) {
|
|
66
73
|
// Emit deployment nullifier
|
|
67
74
|
this.typedOracle.addSiloedNullifiersFromPublic([
|
|
68
|
-
await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), instance.address.toField())
|
|
75
|
+
await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), instance.address.toField())
|
|
69
76
|
]);
|
|
70
77
|
if (!fromSingle(secret).equals(Fr.ZERO)) {
|
|
71
78
|
await this.addAccount(artifact, instance, secret);
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
79
|
+
} else {
|
|
74
80
|
await this.typedOracle.addContractInstance(instance);
|
|
75
|
-
await this.typedOracle.addContractArtifact(instance.
|
|
81
|
+
await this.typedOracle.addContractArtifact(instance.currentContractClassId, artifact);
|
|
76
82
|
this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
|
|
77
83
|
}
|
|
78
84
|
return toForeignCallResult([
|
|
79
85
|
toArray([
|
|
80
86
|
instance.salt,
|
|
81
87
|
instance.deployer.toField(),
|
|
82
|
-
instance.
|
|
88
|
+
instance.currentContractClassId,
|
|
83
89
|
instance.initializationHash,
|
|
84
|
-
...instance.publicKeys.toFields()
|
|
85
|
-
])
|
|
90
|
+
...instance.publicKeys.toFields()
|
|
91
|
+
])
|
|
86
92
|
]);
|
|
87
93
|
}
|
|
88
94
|
async directStorageWrite(contractAddress, startStorageSlot, values) {
|
|
89
95
|
const startStorageSlotFr = fromSingle(startStorageSlot);
|
|
90
96
|
const valuesFr = fromArray(values);
|
|
91
97
|
const contractAddressFr = addressFromSingle(contractAddress);
|
|
92
|
-
const publicDataWrites = await Promise.all(valuesFr.map(async (value, i)
|
|
98
|
+
const publicDataWrites = await Promise.all(valuesFr.map(async (value, i)=>{
|
|
93
99
|
const storageSlot = startStorageSlotFr.add(new Fr(i));
|
|
94
100
|
this.logger.debug(`Oracle storage write: slot=${storageSlot.toString()} value=${value}`);
|
|
95
101
|
return new PublicDataWrite(await computePublicDataTreeLeafSlot(contractAddressFr, storageSlot), value);
|
|
96
102
|
}));
|
|
97
103
|
await this.typedOracle.addPublicDataWrites(publicDataWrites);
|
|
98
|
-
return toForeignCallResult([
|
|
104
|
+
return toForeignCallResult([
|
|
105
|
+
toArray(publicDataWrites.map((write)=>write.value))
|
|
106
|
+
]);
|
|
99
107
|
}
|
|
100
108
|
async createAccount(secret) {
|
|
101
109
|
const keyStore = this.typedOracle.getKeyStore();
|
|
@@ -107,13 +115,13 @@ export class TXEService {
|
|
|
107
115
|
this.logger.debug(`Created account ${completeAddress.address}`);
|
|
108
116
|
return toForeignCallResult([
|
|
109
117
|
toSingle(completeAddress.address),
|
|
110
|
-
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
118
|
+
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
111
119
|
]);
|
|
112
120
|
}
|
|
113
121
|
async addAccount(artifact, instance, secret) {
|
|
114
122
|
this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
|
|
115
123
|
await this.typedOracle.addContractInstance(instance);
|
|
116
|
-
await this.typedOracle.addContractArtifact(instance.
|
|
124
|
+
await this.typedOracle.addContractArtifact(instance.currentContractClassId, artifact);
|
|
117
125
|
const keyStore = this.typedOracle.getKeyStore();
|
|
118
126
|
const completeAddress = await keyStore.addAccount(fromSingle(secret), await computePartialAddress(instance));
|
|
119
127
|
const accountStore = this.typedOracle.getTXEDatabase();
|
|
@@ -121,12 +129,14 @@ export class TXEService {
|
|
|
121
129
|
this.logger.debug(`Created account ${completeAddress.address}`);
|
|
122
130
|
return toForeignCallResult([
|
|
123
131
|
toSingle(completeAddress.address),
|
|
124
|
-
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
132
|
+
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
125
133
|
]);
|
|
126
134
|
}
|
|
127
135
|
getSideEffectsCounter() {
|
|
128
136
|
const counter = this.typedOracle.getSideEffectsCounter();
|
|
129
|
-
return toForeignCallResult([
|
|
137
|
+
return toForeignCallResult([
|
|
138
|
+
toSingle(new Fr(counter))
|
|
139
|
+
]);
|
|
130
140
|
}
|
|
131
141
|
async addAuthWitness(address, messageHash) {
|
|
132
142
|
await this.typedOracle.addAuthWitness(addressFromSingle(address), fromSingle(messageHash));
|
|
@@ -135,7 +145,10 @@ export class TXEService {
|
|
|
135
145
|
async assertPublicCallFails(address, functionSelector, _length, args) {
|
|
136
146
|
const parsedAddress = addressFromSingle(address);
|
|
137
147
|
const parsedSelector = fromSingle(functionSelector);
|
|
138
|
-
const extendedArgs = [
|
|
148
|
+
const extendedArgs = [
|
|
149
|
+
parsedSelector,
|
|
150
|
+
...fromArray(args)
|
|
151
|
+
];
|
|
139
152
|
const result = await this.typedOracle.avmOpcodeCall(parsedAddress, extendedArgs, false);
|
|
140
153
|
if (result.revertCode.isOK()) {
|
|
141
154
|
throw new ExpectedFailureError('Public call did not revert');
|
|
@@ -146,8 +159,7 @@ export class TXEService {
|
|
|
146
159
|
try {
|
|
147
160
|
await this.typedOracle.callPrivateFunction(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
148
161
|
throw new ExpectedFailureError('Private call did not fail');
|
|
149
|
-
}
|
|
150
|
-
catch (e) {
|
|
162
|
+
} catch (e) {
|
|
151
163
|
if (e instanceof ExpectedFailureError) {
|
|
152
164
|
throw e;
|
|
153
165
|
}
|
|
@@ -156,41 +168,53 @@ export class TXEService {
|
|
|
156
168
|
}
|
|
157
169
|
// PXE oracles
|
|
158
170
|
getRandomField() {
|
|
159
|
-
return toForeignCallResult([
|
|
171
|
+
return toForeignCallResult([
|
|
172
|
+
toSingle(this.typedOracle.getRandomField())
|
|
173
|
+
]);
|
|
160
174
|
}
|
|
161
175
|
async getContractAddress() {
|
|
162
176
|
const contractAddress = await this.typedOracle.getContractAddress();
|
|
163
|
-
return toForeignCallResult([
|
|
177
|
+
return toForeignCallResult([
|
|
178
|
+
toSingle(contractAddress.toField())
|
|
179
|
+
]);
|
|
164
180
|
}
|
|
165
181
|
async getBlockNumber() {
|
|
166
182
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
167
|
-
return toForeignCallResult([
|
|
183
|
+
return toForeignCallResult([
|
|
184
|
+
toSingle(new Fr(blockNumber))
|
|
185
|
+
]);
|
|
168
186
|
}
|
|
169
187
|
// Since the argument is a slice, noir automatically adds a length field to oracle call.
|
|
170
188
|
async storeInExecutionCache(_length, values) {
|
|
171
189
|
const returnsHash = await this.typedOracle.storeInExecutionCache(fromArray(values));
|
|
172
|
-
return toForeignCallResult([
|
|
190
|
+
return toForeignCallResult([
|
|
191
|
+
toSingle(returnsHash)
|
|
192
|
+
]);
|
|
173
193
|
}
|
|
174
194
|
async loadFromExecutionCache(hash) {
|
|
175
195
|
const returns = await this.typedOracle.loadFromExecutionCache(fromSingle(hash));
|
|
176
|
-
return toForeignCallResult([
|
|
196
|
+
return toForeignCallResult([
|
|
197
|
+
toArray(returns)
|
|
198
|
+
]);
|
|
177
199
|
}
|
|
178
200
|
// Since the argument is a slice, noir automatically adds a length field to oracle call.
|
|
179
201
|
debugLog(message, _length, fields) {
|
|
180
|
-
const messageStr = fromArray(message)
|
|
181
|
-
.map(field => String.fromCharCode(field.toNumber()))
|
|
182
|
-
.join('');
|
|
202
|
+
const messageStr = fromArray(message).map((field)=>String.fromCharCode(field.toNumber())).join('');
|
|
183
203
|
const fieldsFr = fromArray(fields);
|
|
184
204
|
this.typedOracle.debugLog(messageStr, fieldsFr);
|
|
185
205
|
return toForeignCallResult([]);
|
|
186
206
|
}
|
|
187
207
|
async storageRead(contractAddress, startStorageSlot, blockNumber, numberOfElements) {
|
|
188
208
|
const values = await this.typedOracle.storageRead(addressFromSingle(contractAddress), fromSingle(startStorageSlot), fromSingle(blockNumber).toNumber(), fromSingle(numberOfElements).toNumber());
|
|
189
|
-
return toForeignCallResult([
|
|
209
|
+
return toForeignCallResult([
|
|
210
|
+
toArray(values)
|
|
211
|
+
]);
|
|
190
212
|
}
|
|
191
213
|
async storageWrite(startStorageSlot, values) {
|
|
192
214
|
const newValues = await this.typedOracle.storageWrite(fromSingle(startStorageSlot), fromArray(values));
|
|
193
|
-
return toForeignCallResult([
|
|
215
|
+
return toForeignCallResult([
|
|
216
|
+
toArray(newValues)
|
|
217
|
+
]);
|
|
194
218
|
}
|
|
195
219
|
async getPublicDataTreeWitness(blockNumber, leafSlot) {
|
|
196
220
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -199,48 +223,67 @@ export class TXEService {
|
|
|
199
223
|
if (!witness) {
|
|
200
224
|
throw new Error(`Public data witness not found for slot ${parsedLeafSlot} at block ${parsedBlockNumber}.`);
|
|
201
225
|
}
|
|
202
|
-
return toForeignCallResult([
|
|
226
|
+
return toForeignCallResult([
|
|
227
|
+
toArray(witness.toFields())
|
|
228
|
+
]);
|
|
203
229
|
}
|
|
204
230
|
async getNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status, returnSize) {
|
|
205
|
-
const noteDatas = await this.typedOracle.getNotes(fromSingle(storageSlot), fromSingle(numSelects).toNumber(), fromArray(selectByIndexes).map(fr
|
|
231
|
+
const noteDatas = await this.typedOracle.getNotes(fromSingle(storageSlot), fromSingle(numSelects).toNumber(), fromArray(selectByIndexes).map((fr)=>fr.toNumber()), fromArray(selectByOffsets).map((fr)=>fr.toNumber()), fromArray(selectByLengths).map((fr)=>fr.toNumber()), fromArray(selectValues), fromArray(selectComparators).map((fr)=>fr.toNumber()), fromArray(sortByIndexes).map((fr)=>fr.toNumber()), fromArray(sortByOffsets).map((fr)=>fr.toNumber()), fromArray(sortByLengths).map((fr)=>fr.toNumber()), fromArray(sortOrder).map((fr)=>fr.toNumber()), fromSingle(limit).toNumber(), fromSingle(offset).toNumber(), fromSingle(status).toNumber());
|
|
206
232
|
const noteLength = noteDatas?.[0]?.note.items.length ?? 0;
|
|
207
|
-
if (!noteDatas.every(({ note })
|
|
233
|
+
if (!noteDatas.every(({ note })=>noteLength === note.items.length)) {
|
|
208
234
|
throw new Error('Notes should all be the same length.');
|
|
209
235
|
}
|
|
210
236
|
const contractAddress = noteDatas[0]?.contractAddress ?? Fr.ZERO;
|
|
211
237
|
// Values indicates whether the note is settled or transient.
|
|
212
238
|
const noteTypes = {
|
|
213
239
|
isSettled: new Fr(0),
|
|
214
|
-
isTransient: new Fr(1)
|
|
240
|
+
isTransient: new Fr(1)
|
|
215
241
|
};
|
|
216
|
-
const flattenData = noteDatas.flatMap(({ nonce, note, index })
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
242
|
+
const flattenData = noteDatas.flatMap(({ nonce, note, index })=>[
|
|
243
|
+
nonce,
|
|
244
|
+
index === undefined ? noteTypes.isTransient : noteTypes.isSettled,
|
|
245
|
+
...note.items
|
|
246
|
+
]);
|
|
221
247
|
const returnFieldSize = fromSingle(returnSize).toNumber();
|
|
222
|
-
const returnData = [
|
|
248
|
+
const returnData = [
|
|
249
|
+
noteDatas.length,
|
|
250
|
+
contractAddress.toField(),
|
|
251
|
+
...flattenData
|
|
252
|
+
].map((v)=>new Fr(v));
|
|
223
253
|
if (returnData.length > returnFieldSize) {
|
|
224
254
|
throw new Error(`Return data size too big. Maximum ${returnFieldSize} fields. Got ${flattenData.length}.`);
|
|
225
255
|
}
|
|
226
256
|
const paddedZeros = Array(returnFieldSize - returnData.length).fill(new Fr(0));
|
|
227
|
-
return toForeignCallResult([
|
|
257
|
+
return toForeignCallResult([
|
|
258
|
+
toArray([
|
|
259
|
+
...returnData,
|
|
260
|
+
...paddedZeros
|
|
261
|
+
])
|
|
262
|
+
]);
|
|
228
263
|
}
|
|
229
264
|
notifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter) {
|
|
230
265
|
this.typedOracle.notifyCreatedNote(fromSingle(storageSlot), NoteSelector.fromField(fromSingle(noteTypeId)), fromArray(note), fromSingle(noteHash), fromSingle(counter).toNumber());
|
|
231
|
-
return toForeignCallResult([
|
|
266
|
+
return toForeignCallResult([
|
|
267
|
+
toSingle(new Fr(0))
|
|
268
|
+
]);
|
|
232
269
|
}
|
|
233
270
|
async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
234
271
|
await this.typedOracle.notifyNullifiedNote(fromSingle(innerNullifier), fromSingle(noteHash), fromSingle(counter).toNumber());
|
|
235
|
-
return toForeignCallResult([
|
|
272
|
+
return toForeignCallResult([
|
|
273
|
+
toSingle(new Fr(0))
|
|
274
|
+
]);
|
|
236
275
|
}
|
|
237
276
|
async notifyCreatedNullifier(innerNullifier) {
|
|
238
277
|
await this.typedOracle.notifyCreatedNullifier(fromSingle(innerNullifier));
|
|
239
|
-
return toForeignCallResult([
|
|
278
|
+
return toForeignCallResult([
|
|
279
|
+
toSingle(new Fr(0))
|
|
280
|
+
]);
|
|
240
281
|
}
|
|
241
282
|
async checkNullifierExists(innerNullifier) {
|
|
242
283
|
const exists = await this.typedOracle.checkNullifierExists(fromSingle(innerNullifier));
|
|
243
|
-
return toForeignCallResult([
|
|
284
|
+
return toForeignCallResult([
|
|
285
|
+
toSingle(new Fr(exists))
|
|
286
|
+
]);
|
|
244
287
|
}
|
|
245
288
|
async getContractInstance(address) {
|
|
246
289
|
const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
|
|
@@ -248,24 +291,36 @@ export class TXEService {
|
|
|
248
291
|
toArray([
|
|
249
292
|
instance.salt,
|
|
250
293
|
instance.deployer.toField(),
|
|
251
|
-
instance.
|
|
294
|
+
instance.currentContractClassId,
|
|
252
295
|
instance.initializationHash,
|
|
253
|
-
...instance.publicKeys.toFields()
|
|
254
|
-
])
|
|
296
|
+
...instance.publicKeys.toFields()
|
|
297
|
+
])
|
|
255
298
|
]);
|
|
256
299
|
}
|
|
257
300
|
async getPublicKeysAndPartialAddress(address) {
|
|
258
301
|
const parsedAddress = addressFromSingle(address);
|
|
259
302
|
const { publicKeys, partialAddress } = await this.typedOracle.getCompleteAddress(parsedAddress);
|
|
260
|
-
return toForeignCallResult([
|
|
303
|
+
return toForeignCallResult([
|
|
304
|
+
toArray([
|
|
305
|
+
...publicKeys.toFields(),
|
|
306
|
+
partialAddress
|
|
307
|
+
])
|
|
308
|
+
]);
|
|
261
309
|
}
|
|
262
310
|
async getKeyValidationRequest(pkMHash) {
|
|
263
311
|
const keyValidationRequest = await this.typedOracle.getKeyValidationRequest(fromSingle(pkMHash));
|
|
264
|
-
return toForeignCallResult([
|
|
312
|
+
return toForeignCallResult([
|
|
313
|
+
toArray(keyValidationRequest.toFields())
|
|
314
|
+
]);
|
|
265
315
|
}
|
|
266
316
|
async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
267
317
|
const result = await this.typedOracle.callPrivateFunction(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
268
|
-
return toForeignCallResult([
|
|
318
|
+
return toForeignCallResult([
|
|
319
|
+
toArray([
|
|
320
|
+
result.endSideEffectCounter,
|
|
321
|
+
result.returnsHash
|
|
322
|
+
])
|
|
323
|
+
]);
|
|
269
324
|
}
|
|
270
325
|
async getNullifierMembershipWitness(blockNumber, nullifier) {
|
|
271
326
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -273,7 +328,9 @@ export class TXEService {
|
|
|
273
328
|
if (!witness) {
|
|
274
329
|
throw new Error(`Nullifier membership witness not found at block ${parsedBlockNumber}.`);
|
|
275
330
|
}
|
|
276
|
-
return toForeignCallResult([
|
|
331
|
+
return toForeignCallResult([
|
|
332
|
+
toArray(witness.toFields())
|
|
333
|
+
]);
|
|
277
334
|
}
|
|
278
335
|
async getAuthWitness(messageHash) {
|
|
279
336
|
const parsedMessageHash = fromSingle(messageHash);
|
|
@@ -281,31 +338,43 @@ export class TXEService {
|
|
|
281
338
|
if (!authWitness) {
|
|
282
339
|
throw new Error(`Auth witness not found for message hash ${parsedMessageHash}.`);
|
|
283
340
|
}
|
|
284
|
-
return toForeignCallResult([
|
|
341
|
+
return toForeignCallResult([
|
|
342
|
+
toArray(authWitness)
|
|
343
|
+
]);
|
|
285
344
|
}
|
|
286
345
|
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
287
346
|
const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
288
|
-
return toForeignCallResult([
|
|
347
|
+
return toForeignCallResult([
|
|
348
|
+
toSingle(newArgsHash)
|
|
349
|
+
]);
|
|
289
350
|
}
|
|
290
351
|
async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
291
352
|
const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
292
|
-
return toForeignCallResult([
|
|
353
|
+
return toForeignCallResult([
|
|
354
|
+
toSingle(newArgsHash)
|
|
355
|
+
]);
|
|
293
356
|
}
|
|
294
357
|
notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
295
358
|
this.typedOracle.notifySetMinRevertibleSideEffectCounter(fromSingle(minRevertibleSideEffectCounter).toNumber());
|
|
296
359
|
}
|
|
297
360
|
async getChainId() {
|
|
298
|
-
return toForeignCallResult([
|
|
361
|
+
return toForeignCallResult([
|
|
362
|
+
toSingle(await this.typedOracle.getChainId())
|
|
363
|
+
]);
|
|
299
364
|
}
|
|
300
365
|
async getVersion() {
|
|
301
|
-
return toForeignCallResult([
|
|
366
|
+
return toForeignCallResult([
|
|
367
|
+
toSingle(await this.typedOracle.getVersion())
|
|
368
|
+
]);
|
|
302
369
|
}
|
|
303
370
|
async getBlockHeader(blockNumber) {
|
|
304
371
|
const header = await this.typedOracle.getBlockHeader(fromSingle(blockNumber).toNumber());
|
|
305
372
|
if (!header) {
|
|
306
373
|
throw new Error(`Block header not found for block ${blockNumber}.`);
|
|
307
374
|
}
|
|
308
|
-
return toForeignCallResult([
|
|
375
|
+
return toForeignCallResult([
|
|
376
|
+
toArray(header.toFields())
|
|
377
|
+
]);
|
|
309
378
|
}
|
|
310
379
|
async getMembershipWitness(blockNumber, treeId, leafValue) {
|
|
311
380
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -315,7 +384,9 @@ export class TXEService {
|
|
|
315
384
|
if (!witness) {
|
|
316
385
|
throw new Error(`Membership witness in tree ${MerkleTreeId[parsedTreeId]} not found for value ${parsedLeafValue} at block ${parsedBlockNumber}.`);
|
|
317
386
|
}
|
|
318
|
-
return toForeignCallResult([
|
|
387
|
+
return toForeignCallResult([
|
|
388
|
+
toArray(witness)
|
|
389
|
+
]);
|
|
319
390
|
}
|
|
320
391
|
async getLowNullifierMembershipWitness(blockNumber, nullifier) {
|
|
321
392
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -323,11 +394,15 @@ export class TXEService {
|
|
|
323
394
|
if (!witness) {
|
|
324
395
|
throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${parsedBlockNumber}.`);
|
|
325
396
|
}
|
|
326
|
-
return toForeignCallResult([
|
|
397
|
+
return toForeignCallResult([
|
|
398
|
+
toArray(witness.toFields())
|
|
399
|
+
]);
|
|
327
400
|
}
|
|
328
401
|
async getIndexedTaggingSecretAsSender(sender, recipient) {
|
|
329
402
|
const secret = await this.typedOracle.getIndexedTaggingSecretAsSender(AztecAddress.fromField(fromSingle(sender)), AztecAddress.fromField(fromSingle(recipient)));
|
|
330
|
-
return toForeignCallResult([
|
|
403
|
+
return toForeignCallResult([
|
|
404
|
+
toArray(secret.toFields())
|
|
405
|
+
]);
|
|
331
406
|
}
|
|
332
407
|
async syncNotes() {
|
|
333
408
|
await this.typedOracle.syncNotes();
|
|
@@ -343,11 +418,16 @@ export class TXEService {
|
|
|
343
418
|
// with two fields: `some` (a boolean) and `value` (a field array in this case).
|
|
344
419
|
if (values === null) {
|
|
345
420
|
// No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
|
|
346
|
-
return toForeignCallResult([
|
|
347
|
-
|
|
348
|
-
|
|
421
|
+
return toForeignCallResult([
|
|
422
|
+
toSingle(new Fr(0)),
|
|
423
|
+
toArray(Array(fromSingle(tSize).toNumber()).fill(new Fr(0)))
|
|
424
|
+
]);
|
|
425
|
+
} else {
|
|
349
426
|
// Data was found so we set `some` to 1 and return it along with `value`.
|
|
350
|
-
return toForeignCallResult([
|
|
427
|
+
return toForeignCallResult([
|
|
428
|
+
toSingle(new Fr(1)),
|
|
429
|
+
toArray(values)
|
|
430
|
+
]);
|
|
351
431
|
}
|
|
352
432
|
}
|
|
353
433
|
async deleteCapsule(contractAddress, slot) {
|
|
@@ -363,10 +443,8 @@ export class TXEService {
|
|
|
363
443
|
const ciphertextBuffer = fromUintArray(ciphertext, 8);
|
|
364
444
|
const ivBuffer = fromUintArray(iv, 8);
|
|
365
445
|
const symKeyBuffer = fromUintArray(symKey, 8);
|
|
366
|
-
const
|
|
367
|
-
|
|
368
|
-
// function correctly receives [u8; N].
|
|
369
|
-
return toForeignCallResult([toArray(Array.from(paddedPlaintext).map(byte => new Fr(byte)))]);
|
|
446
|
+
const plaintextBuffer = await this.typedOracle.aes128Decrypt(ciphertextBuffer, ivBuffer, symKeyBuffer);
|
|
447
|
+
return toForeignCallResult(arrayToBoundedVec(bufferToU8Array(plaintextBuffer), ciphertextBuffer.length));
|
|
370
448
|
}
|
|
371
449
|
// AVM opcodes
|
|
372
450
|
avmOpcodeEmitUnencryptedLog(_message) {
|
|
@@ -375,10 +453,14 @@ export class TXEService {
|
|
|
375
453
|
}
|
|
376
454
|
async avmOpcodeStorageRead(slot) {
|
|
377
455
|
const value = await this.typedOracle.avmOpcodeStorageRead(fromSingle(slot));
|
|
378
|
-
return toForeignCallResult([
|
|
456
|
+
return toForeignCallResult([
|
|
457
|
+
toSingle(value)
|
|
458
|
+
]);
|
|
379
459
|
}
|
|
380
460
|
async avmOpcodeStorageWrite(slot, value) {
|
|
381
|
-
await this.typedOracle.storageWrite(fromSingle(slot), [
|
|
461
|
+
await this.typedOracle.storageWrite(fromSingle(slot), [
|
|
462
|
+
fromSingle(value)
|
|
463
|
+
]);
|
|
382
464
|
return toForeignCallResult([]);
|
|
383
465
|
}
|
|
384
466
|
async avmOpcodeGetContractInstanceDeployer(address) {
|
|
@@ -386,15 +468,15 @@ export class TXEService {
|
|
|
386
468
|
return toForeignCallResult([
|
|
387
469
|
toSingle(instance.deployer),
|
|
388
470
|
// AVM requires an extra boolean indicating the instance was found
|
|
389
|
-
toSingle(new Fr(1))
|
|
471
|
+
toSingle(new Fr(1))
|
|
390
472
|
]);
|
|
391
473
|
}
|
|
392
474
|
async avmOpcodeGetContractInstanceClassId(address) {
|
|
393
475
|
const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
|
|
394
476
|
return toForeignCallResult([
|
|
395
|
-
toSingle(instance.
|
|
477
|
+
toSingle(instance.currentContractClassId),
|
|
396
478
|
// AVM requires an extra boolean indicating the instance was found
|
|
397
|
-
toSingle(new Fr(1))
|
|
479
|
+
toSingle(new Fr(1))
|
|
398
480
|
]);
|
|
399
481
|
}
|
|
400
482
|
async avmOpcodeGetContractInstanceInitializationHash(address) {
|
|
@@ -402,12 +484,14 @@ export class TXEService {
|
|
|
402
484
|
return toForeignCallResult([
|
|
403
485
|
toSingle(instance.initializationHash),
|
|
404
486
|
// AVM requires an extra boolean indicating the instance was found
|
|
405
|
-
toSingle(new Fr(1))
|
|
487
|
+
toSingle(new Fr(1))
|
|
406
488
|
]);
|
|
407
489
|
}
|
|
408
490
|
avmOpcodeSender() {
|
|
409
491
|
const sender = this.typedOracle.getMsgSender();
|
|
410
|
-
return toForeignCallResult([
|
|
492
|
+
return toForeignCallResult([
|
|
493
|
+
toSingle(sender)
|
|
494
|
+
]);
|
|
411
495
|
}
|
|
412
496
|
async avmOpcodeEmitNullifier(nullifier) {
|
|
413
497
|
await this.typedOracle.avmOpcodeEmitNullifier(fromSingle(nullifier));
|
|
@@ -419,66 +503,82 @@ export class TXEService {
|
|
|
419
503
|
}
|
|
420
504
|
async avmOpcodeNullifierExists(innerNullifier, targetAddress) {
|
|
421
505
|
const exists = await this.typedOracle.avmOpcodeNullifierExists(fromSingle(innerNullifier), AztecAddress.fromField(fromSingle(targetAddress)));
|
|
422
|
-
return toForeignCallResult([
|
|
506
|
+
return toForeignCallResult([
|
|
507
|
+
toSingle(new Fr(exists))
|
|
508
|
+
]);
|
|
423
509
|
}
|
|
424
510
|
async avmOpcodeAddress() {
|
|
425
511
|
const contractAddress = await this.typedOracle.getContractAddress();
|
|
426
|
-
return toForeignCallResult([
|
|
512
|
+
return toForeignCallResult([
|
|
513
|
+
toSingle(contractAddress.toField())
|
|
514
|
+
]);
|
|
427
515
|
}
|
|
428
516
|
async avmOpcodeBlockNumber() {
|
|
429
517
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
430
|
-
return toForeignCallResult([
|
|
518
|
+
return toForeignCallResult([
|
|
519
|
+
toSingle(new Fr(blockNumber))
|
|
520
|
+
]);
|
|
431
521
|
}
|
|
432
522
|
avmOpcodeIsStaticCall() {
|
|
433
523
|
const isStaticCall = this.typedOracle.getIsStaticCall();
|
|
434
|
-
return toForeignCallResult([
|
|
524
|
+
return toForeignCallResult([
|
|
525
|
+
toSingle(new Fr(isStaticCall ? 1 : 0))
|
|
526
|
+
]);
|
|
435
527
|
}
|
|
436
528
|
async avmOpcodeChainId() {
|
|
437
529
|
const chainId = await this.typedOracle.getChainId();
|
|
438
|
-
return toForeignCallResult([
|
|
530
|
+
return toForeignCallResult([
|
|
531
|
+
toSingle(chainId)
|
|
532
|
+
]);
|
|
439
533
|
}
|
|
440
534
|
async avmOpcodeVersion() {
|
|
441
535
|
const version = await this.typedOracle.getVersion();
|
|
442
|
-
return toForeignCallResult([
|
|
536
|
+
return toForeignCallResult([
|
|
537
|
+
toSingle(version)
|
|
538
|
+
]);
|
|
443
539
|
}
|
|
444
540
|
avmOpcodeReturndataSize() {
|
|
445
541
|
const size = this.typedOracle.avmOpcodeReturndataSize();
|
|
446
|
-
return toForeignCallResult([
|
|
542
|
+
return toForeignCallResult([
|
|
543
|
+
toSingle(new Fr(size))
|
|
544
|
+
]);
|
|
447
545
|
}
|
|
448
546
|
avmOpcodeReturndataCopy(rdOffset, copySize) {
|
|
449
547
|
const returndata = this.typedOracle.avmOpcodeReturndataCopy(fromSingle(rdOffset).toNumber(), fromSingle(copySize).toNumber());
|
|
450
548
|
// This is a slice, so we need to return the length as well.
|
|
451
|
-
return toForeignCallResult([
|
|
549
|
+
return toForeignCallResult([
|
|
550
|
+
toSingle(new Fr(returndata.length)),
|
|
551
|
+
toArray(returndata)
|
|
552
|
+
]);
|
|
452
553
|
}
|
|
453
554
|
async avmOpcodeCall(_gas, address, _length, args) {
|
|
454
|
-
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args),
|
|
455
|
-
/* isStaticCall */ false);
|
|
555
|
+
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args), /* isStaticCall */ false);
|
|
456
556
|
// Poor man's revert handling
|
|
457
557
|
if (!result.revertCode.isOK()) {
|
|
458
558
|
if (result.revertReason && result.revertReason instanceof SimulationError) {
|
|
459
559
|
await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataOracle(), this.typedOracle.getTXEDatabase(), this.logger);
|
|
460
560
|
throw new Error(result.revertReason.message);
|
|
461
|
-
}
|
|
462
|
-
else {
|
|
561
|
+
} else {
|
|
463
562
|
throw new Error(`Public function call reverted: ${result.revertReason}`);
|
|
464
563
|
}
|
|
465
564
|
}
|
|
466
|
-
return toForeignCallResult([
|
|
565
|
+
return toForeignCallResult([
|
|
566
|
+
toSingle(new Fr(result.revertCode.isOK()))
|
|
567
|
+
]);
|
|
467
568
|
}
|
|
468
569
|
async avmOpcodeStaticCall(_gas, address, _length, args) {
|
|
469
|
-
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args),
|
|
470
|
-
/* isStaticCall */ true);
|
|
570
|
+
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args), /* isStaticCall */ true);
|
|
471
571
|
// Poor man's revert handling
|
|
472
572
|
if (!result.revertCode.isOK()) {
|
|
473
573
|
if (result.revertReason && result.revertReason instanceof SimulationError) {
|
|
474
574
|
await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataOracle(), this.typedOracle.getTXEDatabase(), this.logger);
|
|
475
575
|
throw new Error(result.revertReason.message);
|
|
476
|
-
}
|
|
477
|
-
else {
|
|
576
|
+
} else {
|
|
478
577
|
throw new Error(`Public function call reverted: ${result.revertReason}`);
|
|
479
578
|
}
|
|
480
579
|
}
|
|
481
|
-
return toForeignCallResult([
|
|
580
|
+
return toForeignCallResult([
|
|
581
|
+
toSingle(new Fr(result.revertCode.isOK()))
|
|
582
|
+
]);
|
|
482
583
|
}
|
|
483
584
|
}
|
|
484
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_service.js","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAEL,yBAAyB,EACzB,EAAE,EACF,gBAAgB,EAChB,eAAe,EACf,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACvF,OAAO,EAAyB,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAGL,iBAAiB,EACjB,SAAS,EACT,UAAU,EACV,aAAa,EACb,OAAO,EACP,mBAAmB,EACnB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,OAAO,UAAU;IACrB,YAAoB,MAAc,EAAU,WAAwB;QAAhD,WAAM,GAAN,MAAM,CAAQ;QAAU,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAExE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAc;QAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,cAAc,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAC/C,MAAM,uBAAuB,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,CAAC;QACpE,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAEtD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC;QAC3C,+BAA+B;QAC/B,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE,CAAC;YACzC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,CAAC;YACvF,MAAM,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAClE,MAAM,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QAC/G,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa;IAEb,KAAK,CAAC,uBAAuB,CAAC,WAA8B;QAC1D,MAAM,MAAM,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,uBAAuB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3G,OAAO,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAyB;QAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,OAAO,SAAS,CAAC,CAAC;QAEtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YAC5D,MAAO,IAAI,CAAC,WAAmB,CAAC,WAAW,EAAE,CAAC;YAC7C,IAAI,CAAC,WAAmB,CAAC,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,OAA0B;QAC3C,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAmB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAC3D,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAyB;QACxC,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAA0B,EAAE,QAAqC,EAAE,MAAyB;QACvG,4BAA4B;QAC3B,IAAI,CAAC,WAAmB,CAAC,6BAA6B,CAAC;YACtD,MAAM,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACpG,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,MAAO,IAAI,CAAC,WAAmB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAO,IAAI,CAAC,WAAmB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YACxF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,mBAAmB,CAAC;YACzB,OAAO,CAAC;gBACN,QAAQ,CAAC,IAAI;gBACb,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC3B,QAAQ,CAAC,eAAe;gBACxB,QAAQ,CAAC,kBAAkB;gBAC3B,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE;aAClC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,eAAkC,EAClC,gBAAmC,EACnC,MAAwB;QAExB,MAAM,kBAAkB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,WAAW,CAAC,QAAQ,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YACzF,OAAO,IAAI,eAAe,CAAC,MAAM,6BAA6B,CAAC,iBAAiB,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC;QACzG,CAAC,CAAC,CACH,CAAC;QAEF,MAAO,IAAI,CAAC,WAAmB,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QAEtE,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAyB;QAC3C,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAmB,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,sBAAsB;QACtB,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,YAAY,GAAI,IAAI,CAAC,WAAmB,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,OAAO,mBAAmB,CAAC;YACzB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;YACjC,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;SACvD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAA0B,EAAE,QAAqC,EAAE,MAAyB;QAC3G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACtE,MAAO,IAAI,CAAC,WAAmB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC9D,MAAO,IAAI,CAAC,WAAmB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAExF,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAmB,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7G,MAAM,YAAY,GAAI,IAAI,CAAC,WAAmB,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,OAAO,mBAAmB,CAAC;YACzB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;YACjC,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;SACvD,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB;QACnB,MAAM,OAAO,GAAI,IAAI,CAAC,WAAmB,CAAC,qBAAqB,EAAE,CAAC;QAClE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA0B,EAAE,WAA8B;QAC7E,MAAO,IAAI,CAAC,WAAmB,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;QACpG,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,OAA0B,EAC1B,gBAAmC,EACnC,OAA0B,EAC1B,IAAsB;QAEtB,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,aAAa,CAAC,aAAa,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,qBAAwC,EACxC,gBAAmC,EACnC,QAA2B,EAC3B,iBAAoC,EACpC,YAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACxC,iBAAiB,CAAC,qBAAqB,CAAC,EACxC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EACxD,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACxC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAClC,CAAC;YACF,MAAM,IAAI,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,oBAAoB,EAAE,CAAC;gBACtC,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,cAAc;IAEd,cAAc;QACZ,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QACpE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAC5D,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,wFAAwF;IACxF,KAAK,CAAC,qBAAqB,CAAC,OAA0B,EAAE,MAAwB;QAC9E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACpF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAuB;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,wFAAwF;IACxF,QAAQ,CAAC,OAAyB,EAAE,OAA0B,EAAE,MAAwB;QACtF,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC;aAClC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;aACnD,IAAI,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAChD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,eAAkC,EAClC,gBAAmC,EACnC,WAA8B,EAC9B,gBAAmC;QAEnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAC/C,iBAAiB,CAAC,eAAe,CAAC,EAClC,UAAU,CAAC,gBAAgB,CAAC,EAC5B,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EAClC,UAAU,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CACxC,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,gBAAmC,EAAE,MAAwB;QAC9E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACvG,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,WAA8B,EAAE,QAA2B;QACxF,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7D,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QACnG,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,0CAA0C,cAAc,aAAa,iBAAiB,GAAG,CAAC,CAAC;QAC7G,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,WAA8B,EAC9B,UAA6B,EAC7B,eAAiC,EACjC,eAAiC,EACjC,eAAiC,EACjC,YAA8B,EAC9B,iBAAmC,EACnC,aAA+B,EAC/B,aAA+B,EAC/B,aAA+B,EAC/B,SAA2B,EAC3B,KAAwB,EACxB,MAAyB,EACzB,MAAyB,EACzB,UAA6B;QAE7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAC/C,UAAU,CAAC,WAAW,CAAC,EACvB,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EACjC,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACnD,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACnD,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACnD,SAAS,CAAC,YAAY,CAAC,EACvB,SAAS,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACrD,SAAS,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACjD,SAAS,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACjD,SAAS,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EACjD,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAC7C,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAC5B,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAC7B,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAC9B,CAAC;QACF,MAAM,UAAU,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,IAAI,EAAE,CAAC,IAAI,CAAC;QAEjE,6DAA6D;QAC7D,MAAM,SAAS,GAAG;YAChB,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACpB,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;SACvB,CAAC;QACF,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YAChE,KAAK;YACL,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS;YACjE,GAAG,IAAI,CAAC,KAAK;SACd,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,EAAE,EAAE,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrG,IAAI,UAAU,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,qCAAqC,eAAe,gBAAgB,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7G,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,iBAAiB,CACf,WAA8B,EAC9B,UAA6B,EAC7B,IAAsB,EACtB,QAA2B,EAC3B,OAA0B;QAE1B,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAChC,UAAU,CAAC,WAAW,CAAC,EACvB,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAC9C,SAAS,CAAC,IAAI,CAAC,EACf,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAC/B,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,cAAiC,EACjC,QAA2B,EAC3B,OAA0B;QAE1B,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACxC,UAAU,CAAC,cAAc,CAAC,EAC1B,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAC/B,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,cAAiC;QAC5D,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;QAC1E,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,cAAiC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;QACvF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAA0B;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,mBAAmB,CAAC;YACzB,OAAO,CAAC;gBACN,QAAQ,CAAC,IAAI;gBACb,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC3B,QAAQ,CAAC,eAAe;gBACxB,QAAQ,CAAC,kBAAkB;gBAC3B,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE;aAClC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,OAA0B;QAC7D,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAChG,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,OAA0B;QACtD,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QACjG,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,qBAAwC,EACxC,gBAAmC,EACnC,QAA2B,EAC3B,iBAAoC,EACpC,YAA+B;QAE/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACvD,iBAAiB,CAAC,qBAAqB,CAAC,EACxC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EACxD,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACxC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAClC,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,WAA8B,EAAE,SAA4B;QAC9F,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,6BAA6B,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/G,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,mDAAmD,iBAAiB,GAAG,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAA8B;QACjD,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC7E,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,iBAAiB,GAAG,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,qBAAwC,EACxC,gBAAmC,EACnC,QAA2B,EAC3B,iBAAoC,EACpC,YAA+B;QAE/B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAClE,iBAAiB,CAAC,qBAAqB,CAAC,EACxC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EACxD,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACxC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAClC,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,6BAA6B,CACxC,qBAAwC,EACxC,gBAAmC,EACnC,QAA2B,EAC3B,iBAAoC,EACpC,YAA+B;QAE/B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,6BAA6B,CACtE,iBAAiB,CAAC,qBAAqB,CAAC,EACxC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,EACxD,UAAU,CAAC,QAAQ,CAAC,EACpB,UAAU,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACxC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAClC,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,uCAAuC,CAAC,8BAAiD;QAC9F,IAAI,CAAC,WAAW,CAAC,uCAAuC,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAA8B;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,GAAG,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,WAA8B,EAAE,MAAyB,EAAE,SAA4B;QAChH,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7D,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnD,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;QAC9G,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,YAAY,CAAC,wBAAwB,eAAe,aAAa,iBAAiB,GAAG,CACjI,CAAC;QACJ,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,WAA8B,EAAE,SAA4B;QACjG,MAAM,iBAAiB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE7D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iDAAiD,SAAS,aAAa,iBAAiB,GAAG,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,MAAyB,EAAE,SAA4B;QAC3F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+BAA+B,CACnE,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAC1C,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAC9C,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,eAAkC,EAAE,IAAuB,EAAE,OAAyB;QACvG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CACjC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EACnD,UAAU,CAAC,IAAI,CAAC,EAChB,SAAS,CAAC,OAAO,CAAC,CACnB,CAAC;QACF,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,eAAkC,EAAE,IAAuB,EAAE,KAAwB;QACrG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAC/C,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EACnD,UAAU,CAAC,IAAI,CAAC,CACjB,CAAC;QACF,gHAAgH;QAChH,gFAAgF;QAChF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,kGAAkG;YAClG,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClH,CAAC;aAAM,CAAC;YACN,yEAAyE;YACzE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,eAAkC,EAAE,IAAuB;QAC7E,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5G,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,eAAkC,EAClC,OAA0B,EAC1B,OAA0B,EAC1B,UAA6B;QAE7B,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAChC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EACnD,UAAU,CAAC,OAAO,CAAC,EACnB,UAAU,CAAC,OAAO,CAAC,EACnB,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAClC,CAAC;QAEF,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,gXAAgX;IAChX,KAAK,CAAC,aAAa,CAAC,UAA4B,EAAE,EAAoB,EAAE,MAAwB;QAC9F,MAAM,gBAAgB,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAE9C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,gBAAgB,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEvG,wEAAwE;QACxE,uCAAuC;QACvC,OAAO,mBAAmB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,cAAc;IAEd,2BAA2B,CAAC,QAA0B;QACpD,yBAAyB;QACzB,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAuB;QAChD,MAAM,KAAK,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACrF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAuB,EAAE,KAAwB;QAC3E,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3E,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,oCAAoC,CAAC,OAA0B;QACnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,mBAAmB,CAAC;YACzB,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,kEAAkE;YAClE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mCAAmC,CAAC,OAA0B;QAClE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,mBAAmB,CAAC;YACzB,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC;YAClC,kEAAkE;YAClE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,8CAA8C,CAAC,OAA0B;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,mBAAmB,CAAC;YACzB,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YACrC,kEAAkE;YAClE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,MAAM,GAAI,IAAI,CAAC,WAAmB,CAAC,YAAY,EAAE,CAAC;QACxD,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,SAA4B;QACvD,MAAO,IAAI,CAAC,WAAmB,CAAC,sBAAsB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9E,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,QAA2B;QACrD,MAAO,IAAI,CAAC,WAAmB,CAAC,qBAAqB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5E,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,cAAiC,EAAE,aAAgC;QAChG,MAAM,MAAM,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,wBAAwB,CACrE,UAAU,CAAC,cAAc,CAAC,EAC1B,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAClD,CAAC;QACF,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QACpE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAC5D,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,qBAAqB;QACnB,MAAM,YAAY,GAAI,IAAI,CAAC,WAAmB,CAAC,eAAe,EAAE,CAAC;QACjE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,OAAO,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,UAAU,EAAE,CAAC;QAC7D,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,OAAO,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,UAAU,EAAE,CAAC;QAC7D,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,uBAAuB;QACrB,MAAM,IAAI,GAAI,IAAI,CAAC,WAAmB,CAAC,uBAAuB,EAAE,CAAC;QACjE,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,uBAAuB,CAAC,QAA2B,EAAE,QAA2B;QAC9E,MAAM,UAAU,GAAI,IAAI,CAAC,WAAmB,CAAC,uBAAuB,CAClE,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAC/B,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAChC,CAAC;QACF,4DAA4D;QAC5D,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAsB,EACtB,OAA0B,EAC1B,OAA0B,EAC1B,IAAsB;QAEtB,MAAM,MAAM,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,aAAa,CAC1D,iBAAiB,CAAC,OAAO,CAAC,EAC1B,SAAS,CAAC,IAAI,CAAC;QACf,kBAAkB,CAAC,KAAK,CACzB,CAAC;QAEF,6BAA6B;QAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,YAAY,eAAe,EAAE,CAAC;gBAC1E,MAAM,2BAA2B,CAC/B,MAAM,CAAC,YAAY,EAClB,IAAI,CAAC,WAAmB,CAAC,qBAAqB,EAAE,EAChD,IAAI,CAAC,WAAmB,CAAC,cAAc,EAAE,EAC1C,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAED,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,IAAsB,EACtB,OAA0B,EAC1B,OAA0B,EAC1B,IAAsB;QAEtB,MAAM,MAAM,GAAG,MAAO,IAAI,CAAC,WAAmB,CAAC,aAAa,CAC1D,iBAAiB,CAAC,OAAO,CAAC,EAC1B,SAAS,CAAC,IAAI,CAAC;QACf,kBAAkB,CAAC,IAAI,CACxB,CAAC;QAEF,6BAA6B;QAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,YAAY,eAAe,EAAE,CAAC;gBAC1E,MAAM,2BAA2B,CAC/B,MAAM,CAAC,YAAY,EAClB,IAAI,CAAC,WAAmB,CAAC,qBAAqB,EAAE,EAChD,IAAI,CAAC,WAAmB,CAAC,cAAc,EAAE,EAC1C,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAED,OAAO,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;CACF"}
|