@aztec/bb-prover 0.46.2 → 0.46.4
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/bb/cli.d.ts.map +1 -1
- package/dest/bb/cli.js +22 -1
- package/dest/bb/execute.d.ts +25 -0
- package/dest/bb/execute.d.ts.map +1 -1
- package/dest/bb/execute.js +185 -7
- package/dest/prover/bb_private_kernel_prover.d.ts +49 -0
- package/dest/prover/bb_private_kernel_prover.d.ts.map +1 -0
- package/dest/prover/bb_private_kernel_prover.js +201 -0
- package/dest/prover/bb_prover.d.ts +20 -5
- package/dest/prover/bb_prover.d.ts.map +1 -1
- package/dest/prover/bb_prover.js +118 -15
- package/dest/prover/index.d.ts +1 -1
- package/dest/prover/index.d.ts.map +1 -1
- package/dest/prover/index.js +2 -2
- package/dest/stats.d.ts.map +1 -1
- package/dest/stats.js +3 -1
- package/dest/test/test_circuit_prover.d.ts +6 -1
- package/dest/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/test/test_circuit_prover.js +17 -3
- package/dest/verification_key/verification_key_data.d.ts.map +1 -1
- package/dest/verification_key/verification_key_data.js +2 -3
- package/dest/verifier/bb_verifier.d.ts.map +1 -1
- package/dest/verifier/bb_verifier.js +8 -7
- package/package.json +8 -7
- package/src/bb/cli.ts +32 -0
- package/src/bb/execute.ts +227 -7
- package/src/prover/{bb_native_proof_creator.ts → bb_private_kernel_prover.ts} +114 -114
- package/src/prover/bb_prover.ts +167 -17
- package/src/prover/index.ts +1 -1
- package/src/stats.ts +2 -0
- package/src/test/test_circuit_prover.ts +42 -0
- package/src/verification_key/verification_key_data.ts +1 -5
- package/src/verifier/bb_verifier.ts +7 -6
- package/dest/prover/bb_native_proof_creator.d.ts +0 -47
- package/dest/prover/bb_native_proof_creator.d.ts.map +0 -1
- package/dest/prover/bb_native_proof_creator.js +0 -198
|
@@ -1,198 +0,0 @@
|
|
|
1
|
-
import { AGGREGATION_OBJECT_LENGTH, Fr, NESTED_RECURSIVE_PROOF_LENGTH, Proof, RECURSIVE_PROOF_LENGTH, RecursiveProof, } from '@aztec/circuits.js';
|
|
2
|
-
import { siloNoteHash } from '@aztec/circuits.js/hash';
|
|
3
|
-
import { runInDirectory } from '@aztec/foundation/fs';
|
|
4
|
-
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { Timer } from '@aztec/foundation/timer';
|
|
6
|
-
import { ClientCircuitArtifacts, PrivateResetTagToArtifactName, ProtocolCircuitVks, convertPrivateKernelInitInputsToWitnessMap, convertPrivateKernelInitOutputsFromWitnessMap, convertPrivateKernelInnerInputsToWitnessMap, convertPrivateKernelInnerOutputsFromWitnessMap, convertPrivateKernelResetInputsToWitnessMap, convertPrivateKernelResetOutputsFromWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap, convertPrivateKernelTailInputsToWitnessMap, convertPrivateKernelTailOutputsFromWitnessMap, convertPrivateKernelTailToPublicInputsToWitnessMap, } from '@aztec/noir-protocol-circuits-types';
|
|
7
|
-
import { WASMSimulator } from '@aztec/simulator';
|
|
8
|
-
import { serializeWitness } from '@noir-lang/noirc_abi';
|
|
9
|
-
import * as fs from 'fs/promises';
|
|
10
|
-
import { join } from 'path';
|
|
11
|
-
import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, generateProof, verifyProof } from '../bb/execute.js';
|
|
12
|
-
import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
|
|
13
|
-
import { extractVkData } from '../verification_key/verification_key_data.js';
|
|
14
|
-
/**
|
|
15
|
-
* This proof creator implementation uses the native bb binary.
|
|
16
|
-
* This is a temporary implementation until we make the WASM version work.
|
|
17
|
-
*/
|
|
18
|
-
export class BBNativeProofCreator {
|
|
19
|
-
constructor(bbBinaryPath, bbWorkingDirectory, log = createDebugLogger('aztec:bb-native-prover')) {
|
|
20
|
-
this.bbBinaryPath = bbBinaryPath;
|
|
21
|
-
this.bbWorkingDirectory = bbWorkingDirectory;
|
|
22
|
-
this.log = log;
|
|
23
|
-
this.simulator = new WASMSimulator();
|
|
24
|
-
this.verificationKeys = new Map();
|
|
25
|
-
}
|
|
26
|
-
getSiloedCommitments(publicInputs) {
|
|
27
|
-
const contractAddress = publicInputs.callContext.storageContractAddress;
|
|
28
|
-
return Promise.resolve(publicInputs.noteHashes.map(commitment => siloNoteHash(contractAddress, commitment.value)));
|
|
29
|
-
}
|
|
30
|
-
async createProofInit(inputs) {
|
|
31
|
-
return await this.createSafeProof(inputs, 'PrivateKernelInitArtifact', convertPrivateKernelInitInputsToWitnessMap, convertPrivateKernelInitOutputsFromWitnessMap);
|
|
32
|
-
}
|
|
33
|
-
async createProofInner(inputs) {
|
|
34
|
-
return await this.createSafeProof(inputs, 'PrivateKernelInnerArtifact', convertPrivateKernelInnerInputsToWitnessMap, convertPrivateKernelInnerOutputsFromWitnessMap);
|
|
35
|
-
}
|
|
36
|
-
async createProofReset(inputs) {
|
|
37
|
-
return await this.createSafeProof(inputs, PrivateResetTagToArtifactName[inputs.sizeTag], convertPrivateKernelResetInputsToWitnessMap, output => convertPrivateKernelResetOutputsFromWitnessMap(output, inputs.sizeTag));
|
|
38
|
-
}
|
|
39
|
-
async createProofTail(inputs) {
|
|
40
|
-
if (!inputs.isForPublic()) {
|
|
41
|
-
return await this.createSafeProof(inputs, 'PrivateKernelTailArtifact', convertPrivateKernelTailInputsToWitnessMap, convertPrivateKernelTailOutputsFromWitnessMap);
|
|
42
|
-
}
|
|
43
|
-
return await this.createSafeProof(inputs, 'PrivateKernelTailToPublicArtifact', convertPrivateKernelTailToPublicInputsToWitnessMap, convertPrivateKernelTailForPublicOutputsFromWitnessMap);
|
|
44
|
-
}
|
|
45
|
-
async createAppCircuitProof(partialWitness, bytecode, appCircuitName) {
|
|
46
|
-
const operation = async (directory) => {
|
|
47
|
-
this.log.debug(`Proving app circuit`);
|
|
48
|
-
const proofOutput = await this.createProof(directory, partialWitness, bytecode, 'App', appCircuitName);
|
|
49
|
-
if (proofOutput.proof.proof.length != RECURSIVE_PROOF_LENGTH) {
|
|
50
|
-
throw new Error(`Incorrect proof length`);
|
|
51
|
-
}
|
|
52
|
-
const proof = proofOutput.proof;
|
|
53
|
-
const output = {
|
|
54
|
-
proof,
|
|
55
|
-
verificationKey: proofOutput.verificationKey,
|
|
56
|
-
};
|
|
57
|
-
return output;
|
|
58
|
-
};
|
|
59
|
-
return await runInDirectory(this.bbWorkingDirectory, operation);
|
|
60
|
-
}
|
|
61
|
-
/**
|
|
62
|
-
* Verifies a proof, will generate the verification key if one is not cached internally
|
|
63
|
-
* @param circuitType - The type of circuit whose proof is to be verified
|
|
64
|
-
* @param proof - The proof to be verified
|
|
65
|
-
*/
|
|
66
|
-
async verifyProofForProtocolCircuit(circuitType, proof) {
|
|
67
|
-
const verificationKey = ProtocolCircuitVks[circuitType];
|
|
68
|
-
this.log.debug(`Verifying with key: ${verificationKey.keyAsFields.hash.toString()}`);
|
|
69
|
-
const logFunction = (message) => {
|
|
70
|
-
this.log.debug(`${circuitType} BB out - ${message}`);
|
|
71
|
-
};
|
|
72
|
-
const result = await this.verifyProofFromKey(verificationKey.keyAsBytes, proof, logFunction);
|
|
73
|
-
if (result.status === BB_RESULT.FAILURE) {
|
|
74
|
-
const errorMessage = `Failed to verify ${circuitType} proof!`;
|
|
75
|
-
throw new Error(errorMessage);
|
|
76
|
-
}
|
|
77
|
-
this.log.info(`Successfully verified ${circuitType} proof in ${Math.ceil(result.durationMs)} ms`);
|
|
78
|
-
}
|
|
79
|
-
async verifyProofFromKey(verificationKey, proof, logFunction = () => { }) {
|
|
80
|
-
const operation = async (bbWorkingDirectory) => {
|
|
81
|
-
const proofFileName = `${bbWorkingDirectory}/proof`;
|
|
82
|
-
const verificationKeyPath = `${bbWorkingDirectory}/vk`;
|
|
83
|
-
await fs.writeFile(proofFileName, proof.buffer);
|
|
84
|
-
await fs.writeFile(verificationKeyPath, verificationKey);
|
|
85
|
-
return await verifyProof(this.bbBinaryPath, proofFileName, verificationKeyPath, logFunction);
|
|
86
|
-
};
|
|
87
|
-
return await runInDirectory(this.bbWorkingDirectory, operation);
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* Ensures our verification key cache includes the key data located at the specified directory
|
|
91
|
-
* @param filePath - The directory containing the verification key data files
|
|
92
|
-
* @param circuitType - The type of circuit to which the verification key corresponds
|
|
93
|
-
*/
|
|
94
|
-
async updateVerificationKeyAfterProof(filePath, circuitType) {
|
|
95
|
-
let promise = this.verificationKeys.get(circuitType);
|
|
96
|
-
if (!promise) {
|
|
97
|
-
promise = extractVkData(filePath);
|
|
98
|
-
this.log.debug(`Updated verification key for circuit: ${circuitType}`);
|
|
99
|
-
this.verificationKeys.set(circuitType, promise);
|
|
100
|
-
}
|
|
101
|
-
return await promise;
|
|
102
|
-
}
|
|
103
|
-
async createSafeProof(inputs, circuitType, convertInputs, convertOutputs) {
|
|
104
|
-
const operation = async (directory) => {
|
|
105
|
-
return await this.generateWitnessAndCreateProof(inputs, circuitType, directory, convertInputs, convertOutputs);
|
|
106
|
-
};
|
|
107
|
-
return await runInDirectory(this.bbWorkingDirectory, operation);
|
|
108
|
-
}
|
|
109
|
-
async generateWitnessAndCreateProof(inputs, circuitType, directory, convertInputs, convertOutputs) {
|
|
110
|
-
this.log.debug(`Generating witness for ${circuitType}`);
|
|
111
|
-
const compiledCircuit = ClientCircuitArtifacts[circuitType];
|
|
112
|
-
const witnessMap = convertInputs(inputs);
|
|
113
|
-
const timer = new Timer();
|
|
114
|
-
const outputWitness = await this.simulator.simulateCircuit(witnessMap, compiledCircuit);
|
|
115
|
-
const output = convertOutputs(outputWitness);
|
|
116
|
-
this.log.debug(`Generated witness for ${circuitType}`, {
|
|
117
|
-
eventName: 'circuit-witness-generation',
|
|
118
|
-
circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
|
|
119
|
-
duration: timer.ms(),
|
|
120
|
-
inputSize: inputs.toBuffer().length,
|
|
121
|
-
outputSize: output.toBuffer().length,
|
|
122
|
-
});
|
|
123
|
-
const proofOutput = await this.createProof(directory, outputWitness, Buffer.from(compiledCircuit.bytecode, 'base64'), circuitType);
|
|
124
|
-
if (proofOutput.proof.proof.length != NESTED_RECURSIVE_PROOF_LENGTH) {
|
|
125
|
-
throw new Error(`Incorrect proof length`);
|
|
126
|
-
}
|
|
127
|
-
const nestedProof = proofOutput.proof;
|
|
128
|
-
const kernelOutput = {
|
|
129
|
-
publicInputs: output,
|
|
130
|
-
proof: nestedProof,
|
|
131
|
-
verificationKey: proofOutput.verificationKey,
|
|
132
|
-
};
|
|
133
|
-
return kernelOutput;
|
|
134
|
-
}
|
|
135
|
-
async createProof(directory, partialWitness, bytecode, circuitType, appCircuitName) {
|
|
136
|
-
const compressedBincodedWitness = serializeWitness(partialWitness);
|
|
137
|
-
const inputsWitnessFile = join(directory, 'witness.gz');
|
|
138
|
-
await fs.writeFile(inputsWitnessFile, compressedBincodedWitness);
|
|
139
|
-
this.log.debug(`Written ${inputsWitnessFile}`);
|
|
140
|
-
const dbgCircuitName = appCircuitName ? `(${appCircuitName})` : '';
|
|
141
|
-
this.log.info(`Proving ${circuitType}${dbgCircuitName} circuit...`);
|
|
142
|
-
const timer = new Timer();
|
|
143
|
-
const provingResult = await generateProof(this.bbBinaryPath, directory, circuitType, bytecode, inputsWitnessFile, this.log.debug);
|
|
144
|
-
if (provingResult.status === BB_RESULT.FAILURE) {
|
|
145
|
-
this.log.error(`Failed to generate proof for ${circuitType}${dbgCircuitName}: ${provingResult.reason}`);
|
|
146
|
-
throw new Error(provingResult.reason);
|
|
147
|
-
}
|
|
148
|
-
this.log.info(`Generated ${circuitType}${dbgCircuitName} circuit proof in ${Math.ceil(timer.ms())} ms`);
|
|
149
|
-
if (circuitType === 'App') {
|
|
150
|
-
const vkData = await extractVkData(directory);
|
|
151
|
-
const proof = await this.readProofAsFields(directory, circuitType, vkData);
|
|
152
|
-
this.log.debug(`Generated proof`, {
|
|
153
|
-
eventName: 'circuit-proving',
|
|
154
|
-
circuitName: 'app-circuit',
|
|
155
|
-
duration: provingResult.durationMs,
|
|
156
|
-
inputSize: compressedBincodedWitness.length,
|
|
157
|
-
proofSize: proof.binaryProof.buffer.length,
|
|
158
|
-
appCircuitName,
|
|
159
|
-
circuitSize: vkData.circuitSize,
|
|
160
|
-
numPublicInputs: vkData.numPublicInputs,
|
|
161
|
-
});
|
|
162
|
-
return { proof, verificationKey: vkData.keyAsFields };
|
|
163
|
-
}
|
|
164
|
-
const vkData = await this.updateVerificationKeyAfterProof(directory, circuitType);
|
|
165
|
-
const proof = await this.readProofAsFields(directory, circuitType, vkData);
|
|
166
|
-
await this.verifyProofForProtocolCircuit(circuitType, proof.binaryProof);
|
|
167
|
-
this.log.debug(`Generated proof`, {
|
|
168
|
-
circuitName: mapProtocolArtifactNameToCircuitName(circuitType),
|
|
169
|
-
duration: provingResult.durationMs,
|
|
170
|
-
eventName: 'circuit-proving',
|
|
171
|
-
inputSize: compressedBincodedWitness.length,
|
|
172
|
-
proofSize: proof.binaryProof.buffer.length,
|
|
173
|
-
circuitSize: vkData.circuitSize,
|
|
174
|
-
numPublicInputs: vkData.numPublicInputs,
|
|
175
|
-
});
|
|
176
|
-
return { proof, verificationKey: vkData.keyAsFields };
|
|
177
|
-
}
|
|
178
|
-
/**
|
|
179
|
-
* Parses and returns the proof data stored at the specified directory
|
|
180
|
-
* @param filePath - The directory containing the proof data
|
|
181
|
-
* @param circuitType - The type of circuit proven
|
|
182
|
-
* @returns The proof
|
|
183
|
-
*/
|
|
184
|
-
async readProofAsFields(filePath, circuitType, vkData) {
|
|
185
|
-
const [binaryProof, proofString] = await Promise.all([
|
|
186
|
-
fs.readFile(`${filePath}/${PROOF_FILENAME}`),
|
|
187
|
-
fs.readFile(`${filePath}/${PROOF_FIELDS_FILENAME}`, { encoding: 'utf-8' }),
|
|
188
|
-
]);
|
|
189
|
-
const json = JSON.parse(proofString);
|
|
190
|
-
const fields = json.map(Fr.fromString);
|
|
191
|
-
const numPublicInputs = circuitType === 'App' ? vkData.numPublicInputs : vkData.numPublicInputs - AGGREGATION_OBJECT_LENGTH;
|
|
192
|
-
const fieldsWithoutPublicInputs = fields.slice(numPublicInputs);
|
|
193
|
-
this.log.debug(`Circuit type: ${circuitType}, complete proof length: ${fields.length}, without public inputs: ${fieldsWithoutPublicInputs.length}, num public inputs: ${numPublicInputs}, circuit size: ${vkData.circuitSize}, is recursive: ${vkData.isRecursive}, raw length: ${binaryProof.length}`);
|
|
194
|
-
const proof = new RecursiveProof(fieldsWithoutPublicInputs, new Proof(binaryProof, vkData.numPublicInputs), true);
|
|
195
|
-
return proof;
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_native_proof_creator.js","sourceRoot":"","sources":["../../src/prover/bb_native_proof_creator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,EAAE,EACF,6BAA6B,EAQ7B,KAAK,EACL,sBAAsB,EACtB,cAAc,GAGf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,sBAAsB,EAEtB,6BAA6B,EAC7B,kBAAkB,EAClB,0CAA0C,EAC1C,6CAA6C,EAC7C,2CAA2C,EAC3C,8CAA8C,EAC9C,2CAA2C,EAC3C,8CAA8C,EAC9C,sDAAsD,EACtD,0CAA0C,EAC1C,6CAA6C,EAC7C,kDAAkD,GACnD,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,oCAAoC,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAE7E;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IAQ/B,YACU,YAAoB,EACpB,kBAA0B,EAC1B,MAAM,iBAAiB,CAAC,wBAAwB,CAAC;QAFjD,iBAAY,GAAZ,YAAY,CAAQ;QACpB,uBAAkB,GAAlB,kBAAkB,CAAQ;QAC1B,QAAG,GAAH,GAAG,CAA8C;QAVnD,cAAS,GAAG,IAAI,aAAa,EAAE,CAAC;QAEhC,qBAAgB,GAA8D,IAAI,GAAG,EAG1F,CAAC;IAMD,CAAC;IAEG,oBAAoB,CAAC,YAAwC;QAClE,MAAM,eAAe,GAAG,YAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrH,CAAC;IAEM,KAAK,CAAC,eAAe,CAC1B,MAA6C;QAE7C,OAAO,MAAM,IAAI,CAAC,eAAe,CAC/B,MAAM,EACN,2BAA2B,EAC3B,0CAA0C,EAC1C,6CAA6C,CAC9C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,MAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,eAAe,CAC/B,MAAM,EACN,4BAA4B,EAC5B,2CAA2C,EAC3C,8CAA8C,CAC/C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,MAAsD;QAEtD,OAAO,MAAM,IAAI,CAAC,eAAe,CAC/B,MAAM,EACN,6BAA6B,CAAC,MAAM,CAAC,OAAO,CAAC,EAC7C,2CAA2C,EAC3C,MAAM,CAAC,EAAE,CAAC,8CAA8C,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CACjF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,eAAe,CAC1B,MAA6C;QAE7C,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1B,OAAO,MAAM,IAAI,CAAC,eAAe,CAC/B,MAAM,EACN,2BAA2B,EAC3B,0CAA0C,EAC1C,6CAA6C,CAC9C,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAC/B,MAAM,EACN,mCAAmC,EACnC,kDAAkD,EAClD,sDAAsD,CACvD,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,cAA0B,EAC1B,QAAgB,EAChB,cAAuB;QAEvB,MAAM,SAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;YACvG,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,sBAAsB,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAsD,CAAC;YACjF,MAAM,MAAM,GAA0B;gBACpC,KAAK;gBACL,eAAe,EAAE,WAAW,CAAC,eAAe;aAC7C,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,6BAA6B,CAAC,WAAmC,EAAE,KAAY;QAC1F,MAAM,eAAe,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAExD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAErF,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,WAAW,aAAa,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAE7F,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YACxC,MAAM,YAAY,GAAG,oBAAoB,WAAW,SAAS,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,WAAW,aAAa,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACpG,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,eAAuB,EACvB,KAAY,EACZ,cAAyC,GAAG,EAAE,GAAE,CAAC;QAEjD,MAAM,SAAS,GAAG,KAAK,EAAE,kBAA0B,EAAE,EAAE;YACrD,MAAM,aAAa,GAAG,GAAG,kBAAkB,QAAQ,CAAC;YACpD,MAAM,mBAAmB,GAAG,GAAG,kBAAkB,KAAK,CAAC;YAEvD,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;YACzD,OAAO,MAAM,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,mBAAoB,EAAE,WAAW,CAAC,CAAC;QAChG,CAAC,CAAC;QACF,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,+BAA+B,CAAC,QAAgB,EAAE,WAAmC;QACjG,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,WAAW,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,MAAS,EACT,WAAmC,EACnC,aAAwC,EACxC,cAA0C;QAE1C,MAAM,SAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YAC5C,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QACjH,CAAC,CAAC;QACF,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,6BAA6B,CAIzC,MAAS,EACT,WAAmC,EACnC,SAAiB,EACjB,aAAwC,EACxC,cAA0C;QAE1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,WAAW,EAAE,CAAC,CAAC;QACxD,MAAM,eAAe,GAAwB,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAEjF,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;QAE7C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,WAAW,EAAE,EAAE;YACrD,SAAS,EAAE,4BAA4B;YACvC,WAAW,EAAE,oCAAoC,CAAC,WAAW,CAAC;YAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM;YACnC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM;SACG,CAAC,CAAC;QAE3C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CACxC,SAAS,EACT,aAAa,EACb,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC/C,WAAW,CACZ,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,6BAA6B,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,KAA6D,CAAC;QAE9F,MAAM,YAAY,GAAyB;YACzC,YAAY,EAAE,MAAM;YACpB,KAAK,EAAE,WAAW;YAClB,eAAe,EAAE,WAAW,CAAC,eAAe;SAC7C,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,SAAiB,EACjB,cAA0B,EAC1B,QAAgB,EAChB,WAA2C,EAC3C,cAAuB;QAKvB,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAEnE,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAExD,MAAM,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,CAAC;QAEjE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,iBAAiB,EAAE,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,WAAW,GAAG,cAAc,aAAa,CAAC,CAAC;QAEpE,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAE1B,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,IAAI,CAAC,YAAY,EACjB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,IAAI,CAAC,GAAG,CAAC,KAAK,CACf,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,WAAW,GAAG,cAAc,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;YACxG,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,WAAW,GAAG,cAAc,qBAAqB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAExG,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAgC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YAE1G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBAChC,SAAS,EAAE,iBAAiB;gBAC5B,WAAW,EAAE,aAAa;gBAC1B,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,SAAS,EAAE,yBAAyB,CAAC,MAAM;gBAC3C,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;gBAC1C,cAAc;gBACd,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,eAAe,EAAE,MAAM,CAAC,eAAe;aACjB,CAAC,CAAC;YAE1B,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAElF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAuC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjH,MAAM,IAAI,CAAC,6BAA6B,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QAEzE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE;YAChC,WAAW,EAAE,oCAAoC,CAAC,WAAW,CAAC;YAC9D,QAAQ,EAAE,aAAa,CAAC,UAAU;YAClC,SAAS,EAAE,iBAAiB;YAC5B,SAAS,EAAE,yBAAyB,CAAC,MAAM;YAC3C,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;YAC1C,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,eAAe,EAAE,MAAM,CAAC,eAAe;SACjB,CAAC,CAAC;QAE1B,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;IACxD,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,WAA2C,EAC3C,MAA2B;QAE3B,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnD,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,cAAc,EAAE,CAAC;YAC5C,EAAE,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,qBAAqB,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SAC3E,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,eAAe,GACnB,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,GAAG,yBAAyB,CAAC;QACtG,MAAM,yBAAyB,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAChE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,iBAAiB,WAAW,4BAA4B,MAAM,CAAC,MAAM,4BAA4B,yBAAyB,CAAC,MAAM,wBAAwB,eAAe,mBAAmB,MAAM,CAAC,WAAW,mBAAmB,MAAM,CAAC,WAAW,iBAAiB,WAAW,CAAC,MAAM,EAAE,CACxR,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,yBAAyB,EACzB,IAAI,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC,EAC9C,IAAI,CACL,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|