@aztec/bb-prover 0.51.1 → 0.53.0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/bb/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CA+G9C"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/bb/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAiF9C"}
package/dest/bb/cli.js CHANGED
@@ -17,33 +17,13 @@ export function getProgram(log) {
17
17
  .action(() => {
18
18
  log(Object.keys(ProtocolCircuitArtifacts).reduce((prev, x) => prev.concat(`\n${x}`)));
19
19
  });
20
- program
21
- .command('write-pk')
22
- .description('Generates the proving key for the specified circuit')
23
- .requiredOption('-w, --working-directory <string>', 'A directory to use for storing input/output files', BB_WORKING_DIRECTORY)
24
- .requiredOption('-b, --bb-path <string>', 'The path to the BB binary', BB_BINARY_PATH)
25
- .requiredOption('-c, --circuit <string>', 'The name of a protocol circuit')
26
- .action(async (options) => {
27
- const compiledCircuit = ProtocolCircuitArtifacts[options.circuit];
28
- if (!compiledCircuit) {
29
- log(`Failed to find circuit ${options.circuit}`);
30
- return;
31
- }
32
- try {
33
- await fs.access(options.workingDirectory, fs.constants.W_OK);
34
- }
35
- catch (error) {
36
- log(`Working directory does not exist`);
37
- return;
38
- }
39
- await generateKeyForNoirCircuit(options.bbPath, options.workingDirectory, options.circuit, compiledCircuit, 'pk', log);
40
- });
41
20
  program
42
21
  .command('write-vk')
43
22
  .description('Generates the verification key for the specified circuit')
44
23
  .requiredOption('-w, --working-directory <string>', 'A directory to use for storing input/output files', BB_WORKING_DIRECTORY)
45
24
  .requiredOption('-b, --bb-path <string>', 'The path to the BB binary', BB_BINARY_PATH)
46
25
  .requiredOption('-c, --circuit <string>', 'The name of a protocol circuit')
26
+ .requiredOption('-f, --flavor <string>', 'The name of the verification key flavor', 'ultra_honk')
47
27
  .action(async (options) => {
48
28
  const compiledCircuit = ProtocolCircuitArtifacts[options.circuit];
49
29
  if (!compiledCircuit) {
@@ -57,7 +37,9 @@ export function getProgram(log) {
57
37
  log(`Working directory does not exist`);
58
38
  return;
59
39
  }
60
- await generateKeyForNoirCircuit(options.bbPath, options.workingDirectory, options.circuit, compiledCircuit, 'vk', log);
40
+ await generateKeyForNoirCircuit(options.bbPath, options.workingDirectory, options.circuit, compiledCircuit, options.flavor,
41
+ // (options.circuit as ServerProtocolArtifact) === 'RootRollupArtifact' ? 'ultra_keccak_honk' : 'ultra_honk',
42
+ log);
61
43
  });
62
44
  program
63
45
  .command('write-contract')
@@ -83,4 +65,4 @@ export function getProgram(log) {
83
65
  });
84
66
  return program;
85
67
  }
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2JiL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQXlCLHdCQUF3QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFdEcsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFckYsTUFBTSxFQUFFLG9CQUFvQixFQUFFLGNBQWMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFFN0Q7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxVQUFVLENBQUMsR0FBVTtJQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUV0QyxPQUFPLENBQUMsV0FBVyxDQUFDLHdDQUF3QyxDQUFDLENBQUM7SUFFOUQsT0FBTztTQUNKLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQztTQUM1QixXQUFXLENBQUMsZ0RBQWdELENBQUM7U0FDN0QsTUFBTSxDQUFDLEdBQUcsRUFBRTtRQUNYLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBWSxFQUFFLENBQVMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hHLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztTQUNKLE9BQU8sQ0FBQyxVQUFVLENBQUM7U0FDbkIsV0FBVyxDQUFDLHFEQUFxRCxDQUFDO1NBQ2xFLGNBQWMsQ0FDYixrQ0FBa0MsRUFDbEMsbURBQW1ELEVBQ25ELG9CQUFvQixDQUNyQjtTQUNBLGNBQWMsQ0FBQyx3QkFBd0IsRUFBRSwyQkFBMkIsRUFBRSxjQUFjLENBQUM7U0FDckYsY0FBYyxDQUFDLHdCQUF3QixFQUFFLGdDQUFnQyxDQUFDO1NBQzFFLE1BQU0sQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7UUFDdEIsTUFBTSxlQUFlLEdBQUcsd0JBQXdCLENBQUMsT0FBTyxDQUFDLE9BQTJCLENBQUMsQ0FBQztRQUN0RixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDckIsR0FBRyxDQUFDLDBCQUEwQixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUNqRCxPQUFPO1FBQ1QsQ0FBQztRQUNELElBQUksQ0FBQztZQUNILE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLEdBQUcsQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO1lBQ3hDLE9BQU87UUFDVCxDQUFDO1FBQ0QsTUFBTSx5QkFBeUIsQ0FDN0IsT0FBTyxDQUFDLE1BQU0sRUFDZCxPQUFPLENBQUMsZ0JBQWdCLEVBQ3hCLE9BQU8sQ0FBQyxPQUFPLEVBQ2YsZUFBZSxFQUNmLElBQUksRUFDSixHQUFHLENBQ0osQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztTQUNKLE9BQU8sQ0FBQyxVQUFVLENBQUM7U0FDbkIsV0FBVyxDQUFDLDBEQUEwRCxDQUFDO1NBQ3ZFLGNBQWMsQ0FDYixrQ0FBa0MsRUFDbEMsbURBQW1ELEVBQ25ELG9CQUFvQixDQUNyQjtTQUNBLGNBQWMsQ0FBQyx3QkFBd0IsRUFBRSwyQkFBMkIsRUFBRSxjQUFjLENBQUM7U0FDckYsY0FBYyxDQUFDLHdCQUF3QixFQUFFLGdDQUFnQyxDQUFDO1NBQzFFLE1BQU0sQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFDLEVBQUU7UUFDdEIsTUFBTSxlQUFlLEdBQUcsd0JBQXdCLENBQUMsT0FBTyxDQUFDLE9BQTJCLENBQUMsQ0FBQztRQUN0RixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDckIsR0FBRyxDQUFDLDBCQUEwQixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUNqRCxPQUFPO1FBQ1QsQ0FBQztRQUNELElBQUksQ0FBQztZQUNILE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLEdBQUcsQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO1lBQ3hDLE9BQU87UUFDVCxDQUFDO1FBQ0QsTUFBTSx5QkFBeUIsQ0FDN0IsT0FBTyxDQUFDLE1BQU0sRUFDZCxPQUFPLENBQUMsZ0JBQWdCLEVBQ3hCLE9BQU8sQ0FBQyxPQUFPLEVBQ2YsZUFBZSxFQUNmLElBQUksRUFDSixHQUFHLENBQ0osQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztTQUNKLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQztTQUN6QixXQUFXLENBQUMsK0RBQStELENBQUM7U0FDNUUsY0FBYyxDQUNiLGtDQUFrQyxFQUNsQyxtREFBbUQsRUFDbkQsb0JBQW9CLENBQ3JCO1NBQ0EsY0FBYyxDQUFDLHdCQUF3QixFQUFFLDJCQUEyQixFQUFFLGNBQWMsQ0FBQztTQUNyRixjQUFjLENBQUMsd0JBQXdCLEVBQUUsZ0NBQWdDLENBQUM7U0FDMUUsY0FBYyxDQUFDLDZCQUE2QixFQUFFLHNDQUFzQyxFQUFFLGNBQWMsQ0FBQztTQUNyRyxNQUFNLENBQUMsS0FBSyxFQUFDLE9BQU8sRUFBQyxFQUFFO1FBQ3RCLE1BQU0sZUFBZSxHQUFHLHdCQUF3QixDQUFDLE9BQU8sQ0FBQyxPQUEyQixDQUFDLENBQUM7UUFDdEYsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3JCLEdBQUcsQ0FBQywwQkFBMEIsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDakQsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUM7WUFDSCxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0QsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixHQUFHLENBQUMsa0NBQWtDLENBQUMsQ0FBQztZQUN4QyxPQUFPO1FBQ1QsQ0FBQztRQUVELE1BQU0sMEJBQTBCLENBQzlCLE9BQU8sQ0FBQyxNQUFNLEVBQ2QsT0FBTyxDQUFDLGdCQUFnQixFQUN4QixPQUFPLENBQUMsT0FBTyxFQUNmLGVBQWUsRUFDZixPQUFPLENBQUMsWUFBWSxFQUNwQixHQUFHLENBQ0osQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyJ9
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2JiL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQXlCLHdCQUF3QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFdEcsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFckYsTUFBTSxFQUFFLG9CQUFvQixFQUFFLGNBQWMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFFN0Q7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxVQUFVLENBQUMsR0FBVTtJQUNuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUV0QyxPQUFPLENBQUMsV0FBVyxDQUFDLHdDQUF3QyxDQUFDLENBQUM7SUFFOUQsT0FBTztTQUNKLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQztTQUM1QixXQUFXLENBQUMsZ0RBQWdELENBQUM7U0FDN0QsTUFBTSxDQUFDLEdBQUcsRUFBRTtRQUNYLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBWSxFQUFFLENBQVMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hHLENBQUMsQ0FBQyxDQUFDO0lBRUwsT0FBTztTQUNKLE9BQU8sQ0FBQyxVQUFVLENBQUM7U0FDbkIsV0FBVyxDQUFDLDBEQUEwRCxDQUFDO1NBQ3ZFLGNBQWMsQ0FDYixrQ0FBa0MsRUFDbEMsbURBQW1ELEVBQ25ELG9CQUFvQixDQUNyQjtTQUNBLGNBQWMsQ0FBQyx3QkFBd0IsRUFBRSwyQkFBMkIsRUFB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
@@ -2,6 +2,7 @@
2
2
  import { type AvmCircuitInputs } from '@aztec/circuits.js';
3
3
  import { type LogFn } from '@aztec/foundation/log';
4
4
  import { type NoirCompiledCircuit } from '@aztec/types/noir';
5
+ import { type UltraHonkFlavor } from '../honk.js';
5
6
  export declare const VK_FILENAME = "vk";
6
7
  export declare const VK_FIELDS_FILENAME = "vk_fields.json";
7
8
  export declare const PROOF_FILENAME = "proof";
@@ -61,7 +62,7 @@ export declare function executeBB(pathToBB: string, command: string, args: strin
61
62
  * @param force - Force the key to be regenerated even if it already exists
62
63
  * @returns An instance of BBResult
63
64
  */
64
- export declare function generateKeyForNoirCircuit(pathToBB: string, workingDirectory: string, circuitName: string, compiledCircuit: NoirCompiledCircuit, key: 'vk' | 'pk', log: LogFn, force?: boolean): Promise<BBSuccess | BBFailure>;
65
+ export declare function generateKeyForNoirCircuit(pathToBB: string, workingDirectory: string, circuitName: string, compiledCircuit: NoirCompiledCircuit, flavor: UltraHonkFlavor, log: LogFn, force?: boolean): Promise<BBSuccess | BBFailure>;
65
66
  export declare function executeBbClientIvcProof(pathToBB: string, workingDirectory: string, bytecodeStackPath: string, witnessStackPath: string, log: LogFn): Promise<BBFailure | BBSuccess>;
66
67
  /**
67
68
  * Used for generating verification keys of noir circuits.
@@ -74,7 +75,7 @@ export declare function executeBbClientIvcProof(pathToBB: string, workingDirecto
74
75
  * @param log - A logging function
75
76
  * @returns An object containing a result indication, the location of the VK and the duration taken
76
77
  */
77
- export declare function computeVerificationKey(pathToBB: string, workingDirectory: string, circuitName: string, bytecode: Buffer, log: LogFn): Promise<BBFailure | BBSuccess>;
78
+ export declare function computeVerificationKey(pathToBB: string, workingDirectory: string, circuitName: string, bytecode: Buffer, flavor: UltraHonkFlavor, log: LogFn): Promise<BBFailure | BBSuccess>;
78
79
  /**
79
80
  * Used for generating proofs of noir circuits.
80
81
  * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
@@ -86,7 +87,7 @@ export declare function computeVerificationKey(pathToBB: string, workingDirector
86
87
  * @param log - A logging function
87
88
  * @returns An object containing a result indication, the location of the proof and the duration taken
88
89
  */
89
- export declare function generateProof(pathToBB: string, workingDirectory: string, circuitName: string, bytecode: Buffer, inputWitnessFile: string, log: LogFn): Promise<BBFailure | BBSuccess>;
90
+ export declare function generateProof(pathToBB: string, workingDirectory: string, circuitName: string, bytecode: Buffer, inputWitnessFile: string, flavor: UltraHonkFlavor, log: LogFn): Promise<BBFailure | BBSuccess>;
90
91
  /**
91
92
  * Used for generating proofs of the tube circuit
92
93
  * It is assumed that the working directory is a temporary and/or random directory used solely for generating this proof.
@@ -117,7 +118,7 @@ export declare function generateAvmProof(pathToBB: string, workingDirectory: str
117
118
  * @param log - A logging function
118
119
  * @returns An object containing a result indication and duration taken
119
120
  */
120
- export declare function verifyProof(pathToBB: string, proofFullPath: string, verificationKeyPath: string, log: LogFn): Promise<BBFailure | BBSuccess>;
121
+ export declare function verifyProof(pathToBB: string, proofFullPath: string, verificationKeyPath: string, ultraHonkFlavor: UltraHonkFlavor, log: LogFn): Promise<BBFailure | BBSuccess>;
121
122
  /**
122
123
  * Used for verifying proofs of the AVM
123
124
  * @param pathToBB - The full path to the bb binary
@@ -1 +1 @@
1
- {"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,KAAK,KAAK,EAAmC,MAAM,uBAAuB,CAAC;AAEpF,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAM7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AACzD,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AACxD,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AACxD,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAClE,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,oBAAY,SAAS;IACnB,OAAO,IAAA;IACP,OAAO,IAAA;IACP,eAAe,IAAA;CAChB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC;IACtD,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAE7C,MAAM,MAAM,oBAAoB,GAAG,OAAO,WAAW,GAAG,OAAO,cAAc,CAAC;AAE9E,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,KAAK,EACb,YAAY,UAAU,MAAM,YAAe,GAC1C,OAAO,CAAC,YAAY,CAAC,CAyBvB;AAID;;;;;;;;;;;;GAYG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,mBAAmB,EACpC,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,KAAK,EACV,KAAK,UAAQ,GACZ,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAqEhC;AAGD,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAiDhC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA8DhC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAkDhC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAgEhC;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,gBAAgB,EACvB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA8FhC;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAEhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,mBAAmB,EAAE,MAAM,EAC3B,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAEhC;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BhC;AA4CD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM,EAC3B,uBAAuB,EAAE,MAAM,EAC/B,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAyBhC;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAyBhC;AAED,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA6ChC;AAED,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,mBAAmB,EACpC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,EACV,KAAK,UAAQ,kCAqBd"}
@@ -68,13 +68,13 @@ const bytecodeFilename = 'bytecode';
68
68
  * @param force - Force the key to be regenerated even if it already exists
69
69
  * @returns An instance of BBResult
70
70
  */
71
- export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, key, log, force = false) {
71
+ export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, flavor, log, force = false) {
72
72
  const bytecode = Buffer.from(compiledCircuit.bytecode, 'base64');
73
73
  // The key generation is written to e.g. /workingDirectory/pk/BaseParityArtifact/pk
74
74
  // The bytecode hash file is also written here as /workingDirectory/pk/BaseParityArtifact/bytecode-hash
75
75
  // The bytecode is written to e.g. /workingDirectory/pk/BaseParityArtifact/bytecode
76
76
  // The bytecode is removed after the key is generated, leaving just the hash file
77
- const circuitOutputDirectory = `${workingDirectory}/${key}/${circuitName}`;
77
+ const circuitOutputDirectory = `${workingDirectory}/vk/${circuitName}`;
78
78
  const outputPath = `${circuitOutputDirectory}`;
79
79
  const bytecodeHash = sha256(bytecode);
80
80
  // ensure the directory exists
@@ -95,19 +95,19 @@ export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circ
95
95
  // args are the output path and the input bytecode path
96
96
  const args = ['-o', `${outputPath}/${VK_FILENAME}`, '-b', bytecodePath];
97
97
  const timer = new Timer();
98
- let result = await executeBB(pathToBB, `write_${key}_ultra_honk`, args, log);
98
+ let result = await executeBB(pathToBB, `write_vk_${flavor}`, args, log);
99
99
  // If we succeeded and the type of key if verification, have bb write the 'fields' version too
100
- if (result.status == BB_RESULT.SUCCESS && key === 'vk') {
100
+ if (result.status == BB_RESULT.SUCCESS) {
101
101
  const asFieldsArgs = ['-k', `${outputPath}/${VK_FILENAME}`, '-o', `${outputPath}/${VK_FIELDS_FILENAME}`, '-v'];
102
- result = await executeBB(pathToBB, `vk_as_fields_ultra_honk`, asFieldsArgs, log);
102
+ result = await executeBB(pathToBB, `vk_as_fields_${flavor}`, asFieldsArgs, log);
103
103
  }
104
104
  const duration = timer.ms();
105
105
  if (result.status == BB_RESULT.SUCCESS) {
106
106
  return {
107
107
  status: BB_RESULT.SUCCESS,
108
108
  durationMs: duration,
109
- pkPath: key === 'pk' ? outputPath : undefined,
110
- vkPath: key === 'vk' ? outputPath : undefined,
109
+ pkPath: undefined,
110
+ vkPath: outputPath,
111
111
  proofPath: undefined,
112
112
  };
113
113
  }
@@ -125,8 +125,8 @@ export async function generateKeyForNoirCircuit(pathToBB, workingDirectory, circ
125
125
  return {
126
126
  status: BB_RESULT.ALREADY_PRESENT,
127
127
  durationMs: 0,
128
- pkPath: key === 'pk' ? outputPath : undefined,
129
- vkPath: key === 'vk' ? outputPath : undefined,
128
+ pkPath: undefined,
129
+ vkPath: outputPath,
130
130
  };
131
131
  }
132
132
  return res;
@@ -190,7 +190,7 @@ export async function executeBbClientIvcProof(pathToBB, workingDirectory, byteco
190
190
  * @param log - A logging function
191
191
  * @returns An object containing a result indication, the location of the VK and the duration taken
192
192
  */
193
- export async function computeVerificationKey(pathToBB, workingDirectory, circuitName, bytecode, log) {
193
+ export async function computeVerificationKey(pathToBB, workingDirectory, circuitName, bytecode, flavor, log) {
194
194
  // Check that the working directory exists
195
195
  try {
196
196
  await fs.access(workingDirectory);
@@ -216,11 +216,11 @@ export async function computeVerificationKey(pathToBB, workingDirectory, circuit
216
216
  const logFunction = (message) => {
217
217
  log(`computeVerificationKey(${circuitName}) BB out - ${message}`);
218
218
  };
219
- let result = await executeBB(pathToBB, 'write_vk_ultra_honk', ['-o', outputPath, '-b', bytecodePath, '-v'], logFunction);
219
+ let result = await executeBB(pathToBB, `write_vk_${flavor}`, ['-o', outputPath, '-b', bytecodePath, '-v'], logFunction);
220
220
  if (result.status == BB_RESULT.FAILURE) {
221
221
  return { status: BB_RESULT.FAILURE, reason: 'Failed writing VK.' };
222
222
  }
223
- result = await executeBB(pathToBB, 'vk_as_fields_ultra_honk', ['-o', outputPath + '_fields.json', '-k', outputPath, '-v'], logFunction);
223
+ result = await executeBB(pathToBB, `vk_as_fields_${flavor}`, ['-o', outputPath + '_fields.json', '-k', outputPath, '-v'], logFunction);
224
224
  const duration = timer.ms();
225
225
  if (result.status == BB_RESULT.SUCCESS) {
226
226
  return {
@@ -251,7 +251,7 @@ export async function computeVerificationKey(pathToBB, workingDirectory, circuit
251
251
  * @param log - A logging function
252
252
  * @returns An object containing a result indication, the location of the proof and the duration taken
253
253
  */
254
- export async function generateProof(pathToBB, workingDirectory, circuitName, bytecode, inputWitnessFile, log) {
254
+ export async function generateProof(pathToBB, workingDirectory, circuitName, bytecode, inputWitnessFile, flavor, log) {
255
255
  // Check that the working directory exists
256
256
  try {
257
257
  await fs.access(workingDirectory);
@@ -261,7 +261,7 @@ export async function generateProof(pathToBB, workingDirectory, circuitName, byt
261
261
  }
262
262
  // The bytecode is written to e.g. /workingDirectory/BaseParityArtifact-bytecode
263
263
  const bytecodePath = `${workingDirectory}/${circuitName}-bytecode`;
264
- // The proof is written to e.g. /workingDirectory/proof
264
+ // The proof is written to e.g. /workingDirectory/ultra_honk/proof
265
265
  const outputPath = `${workingDirectory}`;
266
266
  const binaryPresent = await fs
267
267
  .access(pathToBB, fs.constants.R_OK)
@@ -278,7 +278,7 @@ export async function generateProof(pathToBB, workingDirectory, circuitName, byt
278
278
  const logFunction = (message) => {
279
279
  log(`${circuitName} BB out - ${message}`);
280
280
  };
281
- const result = await executeBB(pathToBB, 'prove_ultra_honk_output_all', args, logFunction);
281
+ const result = await executeBB(pathToBB, `prove_${flavor}_output_all`, args, logFunction);
282
282
  const duration = timer.ms();
283
283
  if (result.status == BB_RESULT.SUCCESS) {
284
284
  return {
@@ -319,7 +319,7 @@ export async function generateTubeProof(pathToBB, workingDirectory, log) {
319
319
  return { status: BB_RESULT.FAILURE, reason: `Working directory ${workingDirectory} does not exist` };
320
320
  }
321
321
  // // Paths for the inputs
322
- const vkPath = join(workingDirectory, 'inst_vk.bin'); // the vk of the last instance
322
+ const vkPath = join(workingDirectory, 'final_decider_vk.bin'); // the vk of the last instance
323
323
  const accPath = join(workingDirectory, 'pg_acc.bin');
324
324
  const proofPath = join(workingDirectory, 'client_ivc_proof.bin');
325
325
  const translatorVkPath = join(workingDirectory, 'translator_vk.bin');
@@ -466,8 +466,8 @@ export async function generateAvmProof(pathToBB, workingDirectory, input, log) {
466
466
  * @param log - A logging function
467
467
  * @returns An object containing a result indication and duration taken
468
468
  */
469
- export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath, log) {
470
- return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, 'verify_ultra_honk', log);
469
+ export async function verifyProof(pathToBB, proofFullPath, verificationKeyPath, ultraHonkFlavor, log) {
470
+ return await verifyProofInternal(pathToBB, proofFullPath, verificationKeyPath, `verify_${ultraHonkFlavor}`, log);
471
471
  }
472
472
  /**
473
473
  * Used for verifying proofs of the AVM
@@ -661,7 +661,7 @@ export async function generateContractForVerificationKey(pathToBB, vkFilePath, c
661
661
  return res;
662
662
  }
663
663
  export async function generateContractForCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, contractName, log, force = false) {
664
- const vkResult = await generateKeyForNoirCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, 'vk', log, force);
664
+ const vkResult = await generateKeyForNoirCircuit(pathToBB, workingDirectory, circuitName, compiledCircuit, 'ultra_keccak_honk', log, force);
665
665
  if (vkResult.status === BB_RESULT.FAILURE) {
666
666
  return vkResult;
667
667
  }
@@ -705,4 +705,4 @@ async function fsCache(dir, expectedCacheKey, logger, force, action) {
705
705
  }
706
706
  return res;
707
707
  }
708
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAc,YAAY,IAAI,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGhD,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;AAChC,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AACtC,MAAM,CAAC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AACzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,+CAAO,CAAA;IACP,+CAAO,CAAA;IACP,+DAAe,CAAA;AACjB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AA8BD;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CACvB,QAAgB,EAChB,OAAe,EACf,IAAc,EACd,MAAa,EACb,eAAe,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC;IAE3C,OAAO,IAAI,OAAO,CAAe,OAAO,CAAC,EAAE;QACzC,uBAAuB;QACvB,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;QAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC;QACnF,MAAM,CAAC,sBAAsB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YAClD,GAAG;SACJ,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1D,MAAM,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1D,MAAM,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,MAAe,EAAE,EAAE;YACnD,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAgB,EAChB,gBAAwB,EACxB,WAAmB,EACnB,eAAoC,EACpC,GAAgB,EAChB,GAAU,EACV,KAAK,GAAG,KAAK;IAEb,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEjE,mFAAmF;IACnF,uGAAuG;IACvG,mFAAmF;IACnF,iFAAiF;IACjF,MAAM,sBAAsB,GAAG,GAAG,gBAAgB,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAC3E,MAAM,UAAU,GAAG,GAAG,sBAAsB,EAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEtC,8BAA8B;IAC9B,MAAM,EAAE,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAwB,sBAAsB,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;QAC5G,MAAM,aAAa,GAAG,MAAM,EAAE;aAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;aACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;aACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;QAC1F,CAAC;QAED,uCAAuC;QACvC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,GAAG,sBAAsB,IAAI,gBAAgB,EAAE,CAAC;YACrE,8CAA8C;YAC9C,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAE3C,uDAAuD;YACvD,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,UAAU,IAAI,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YACxE,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,SAAS,GAAG,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7E,8FAA8F;YAC9F,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACvD,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,GAAG,UAAU,IAAI,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,UAAU,IAAI,kBAAkB,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC/G,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,yBAAyB,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;YAE5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvC,OAAO;oBACL,MAAM,EAAE,SAAS,CAAC,OAAO;oBACzB,UAAU,EAAE,QAAQ;oBACpB,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;oBAC7C,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;oBAC7C,SAAS,EAAE,SAAS;iBACrB,CAAC;YACJ,CAAC;YACD,oFAAoF;YACpF,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,MAAM,EAAE,sCAAsC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;aAC1F,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,eAAe;YACjC,UAAU,EAAE,CAAC;YACb,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YAC7C,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;SAC9C,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,+FAA+F;AAC/F,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAAgB,EAChB,gBAAwB,EACxB,iBAAyB,EACzB,gBAAwB,EACxB,GAAU;IAEV,0CAA0C;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,gBAAgB,iBAAiB,EAAE,CAAC;IACvG,CAAC;IAED,uDAAuD;IACvD,MAAM,UAAU,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAEzC,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,8CAA8C;QAC9C,GAAG,CAAC,gBAAgB,iBAAiB,EAAE,CAAC,CAAC;QACzC,GAAG,CAAC,cAAc,UAAU,EAAE,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,GAAG,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,qCAAqC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACnG,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAE9B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,UAAU;gBACV,SAAS,EAAE,GAAG,UAAU,EAAE;gBAC1B,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,GAAG,UAAU,EAAE;aACxB,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,uCAAuC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SAC3F,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,gBAAwB,EACxB,WAAmB,EACnB,QAAgB,EAChB,GAAU;IAEV,0CAA0C;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,gBAAgB,iBAAiB,EAAE,CAAC;IACvG,CAAC;IAED,gFAAgF;IAChF,MAAM,YAAY,GAAG,GAAG,gBAAgB,IAAI,WAAW,WAAW,CAAC;IAEnE,+CAA+C;IAC/C,MAAM,UAAU,GAAG,GAAG,gBAAgB,KAAK,CAAC;IAE5C,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,8CAA8C;QAC9C,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,GAAG,CAAC,0BAA0B,WAAW,cAAc,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC;QACF,IAAI,MAAM,GAAG,MAAM,SAAS,CAC1B,QAAQ,EACR,qBAAqB,EACrB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,EAC5C,WAAW,CACZ,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;QACrE,CAAC;QACD,MAAM,GAAG,MAAM,SAAS,CACtB,QAAQ,EACR,yBAAyB,EACzB,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAC3D,WAAW,CACZ,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAE5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,UAAU,EAAE,QAAQ;gBACpB,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,GAAG,UAAU,EAAE;aACxB,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,iCAAiC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SACrF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,gBAAwB,EACxB,WAAmB,EACnB,QAAgB,EAChB,gBAAwB,EACxB,GAAU;IAEV,0CAA0C;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,gBAAgB,iBAAiB,EAAE,CAAC;IACvG,CAAC;IAED,gFAAgF;IAChF,MAAM,YAAY,GAAG,GAAG,gBAAgB,IAAI,WAAW,WAAW,CAAC;IAEnE,uDAAuD;IACvD,MAAM,UAAU,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAEzC,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,8CAA8C;QAC9C,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAClF,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,GAAG,CAAC,GAAG,WAAW,aAAa,OAAO,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,6BAA6B,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3F,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAE5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,UAAU,EAAE,QAAQ;gBACpB,SAAS,EAAE,GAAG,UAAU,EAAE;gBAC1B,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,GAAG,UAAU,EAAE;aACxB,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,uCAAuC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SAC3F,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,gBAAwB,EACxB,GAAU;IAEV,0CAA0C;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,gBAAgB,iBAAiB,EAAE,CAAC;IACvG,CAAC;IAED,0BAA0B;IAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,8BAA8B;IACpF,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;IACjE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAEvD,uDAAuD;IACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC;IACpC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE,CACzC,MAAM,EAAE;SACL,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAEvB,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,IACE,CAAC,WAAW,CAAC,MAAM,CAAC;YACpB,CAAC,WAAW,CAAC,OAAO,CAAC;YACrB,CAAC,WAAW,CAAC,SAAS,CAAC;YACvB,CAAC,WAAW,CAAC,gBAAgB,CAAC;YAC9B,CAAC,WAAW,CAAC,SAAS,CAAC,EACvB,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,0CAA0C,gBAAgB,EAAE,EAAE,CAAC;QAC7G,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAEtC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,GAAG,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAE9B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,UAAU;gBACV,SAAS,EAAE,UAAU;gBACrB,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,UAAU;aACnB,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,uCAAuC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SAC3F,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,gBAAwB,EACxB,KAAuB,EACvB,GAAU;IAEV,0CAA0C;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,gBAAgB,iBAAiB,EAAE,CAAC;IACvG,CAAC;IAED,uBAAuB;IACvB,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAEhE,uDAAuD;IACvD,MAAM,UAAU,GAAG,gBAAgB,CAAC;IAEpC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE,CACzC,MAAM,EAAE;SACL,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAEvB,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,6CAA6C;QAC7C,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,YAAY,EAAE,EAAE,CAAC;QAC9F,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,CAChB,YAAY,EACZ,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CACxC,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,YAAY,EAAE,EAAE,CAAC;QAC9F,CAAC;QAED,gEAAgE;QAChE,mEAAmE;QACnE,MAAM,EAAE,CAAC,SAAS,CAChB,gBAAgB,EAChB,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CACvD,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,mCAAmC,gBAAgB,EAAE,EAAE,CAAC;QACtG,CAAC;QAED,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,YAAY,EAAE,EAAE,CAAC;QAC9F,CAAC;QAED,MAAM,IAAI,GAAG;YACX,gBAAgB;YAChB,YAAY;YACZ,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,gBAAgB;YAChB,aAAa;YACb,YAAY;YACZ,IAAI;YACJ,UAAU;YACV,eAAe,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;SAC1D,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE;YACtC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAE5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,UAAU,EAAE,QAAQ;gBACpB,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;gBAC3C,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,UAAU;aACnB,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,uCAAuC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SAC3F,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAgB,EAChB,aAAqB,EACrB,mBAA2B,EAC3B,GAAU;IAEV,OAAO,MAAM,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;AAC3G,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,aAAqB,EACrB,mBAA2B,EAC3B,GAAU;IAEV,OAAO,MAAM,mBAAmB,CAAC,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;AACpG,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,UAAkB,EAClB,GAAU;IAEV,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,mBAAmB,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,qCAAqC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SACzF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,mBAAmB,CAChC,QAAgB,EAChB,aAAqB,EACrB,mBAA2B,EAC3B,OAA2C,EAC3C,GAAU;IAEV,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,qCAAqC,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SACzF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAgB,EAChB,mBAA2B,EAC3B,uBAA+B,EAC/B,GAAU;IAEV,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,mBAAmB,IAAI,uBAAuB,EAAE,EAAE,IAAI,CAAC,CAAC;QAC/E,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,yBAAyB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC;QAC1F,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,4CAA4C,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SAChG,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,QAAgB,EAChB,SAAiB,EACjB,aAAqB,EACrB,UAAkB,EAClB,GAAU;IAEV,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,SAAS,IAAI,aAAa,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,sBAAsB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QACnF,CAAC;QACD,oFAAoF;QACpF,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,OAAO;YACzB,MAAM,EAAE,+CAA+C,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;SACnG,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,QAAgB,EAChB,UAAkB,EAClB,YAAoB,EACpB,GAAU;IAEV,MAAM,aAAa,GAAG,MAAM,EAAE;SAC3B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAErB,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,+BAA+B,QAAQ,EAAE,EAAE,CAAC;IAC1F,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5C,+DAA+D;IAC/D,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnG,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAwB,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;QAC3F,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,qBAAqB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC3E,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5B,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;YAC3E,CAAC;YACD,oFAAoF;YACpF,OAAO;gBACL,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,MAAM,EAAE,gDAAgD,MAAM,CAAC,QAAQ,YAAY,MAAM,CAAC,MAAM,GAAG;aACpG,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,eAAe;YACjC,UAAU,EAAE,CAAC;YACb,YAAY;SACb,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,gBAAwB,EACxB,WAAmB,EACnB,eAAoC,EACpC,YAAoB,EACpB,GAAU,EACV,KAAK,GAAG,KAAK;IAEb,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAC9C,QAAQ,EACR,gBAAgB,EAChB,WAAW,EACX,eAAe,EACf,IAAI,EACJ,GAAG,EACH,KAAK,CACN,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,kCAAkC,CACvC,QAAQ,EACR,IAAI,CAAC,QAAQ,CAAC,MAAO,EAAE,WAAW,CAAC,EACnC,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAC7D,GAAG,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,KAAK,UAAU,OAAO,CACpB,GAAW,EACX,gBAAwB,EACxB,MAAa,EACb,KAAc,EACd,MAAwB;IAExB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAEhD,IAAI,GAAY,CAAC;IACjB,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,GAAG,IAAI,CAAC;IACb,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,GAAG,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClD,kDAAkD;gBAClD,GAAG,GAAG,IAAI,CAAC;YACb,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,GAAkB,CAAC;IACvB,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,kDAAkD,GAAG,KAAK,CAAC,CAAC;QACnE,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,oCAAoC,GAAG,KAAK,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,gCAAgC,aAAa,qBAAqB,CAAC,CAAC;QAC3E,SAAS;IACX,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
708
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/bb/execute.ts"],"names":[],"mappings":"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"}
package/dest/honk.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
2
+ export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk';
3
+ declare const UltraKeccakHonkCircuits: readonly ["BlockRootRollupArtifact"];
4
+ type UltraKeccakHonkCircuits = (typeof UltraKeccakHonkCircuits)[number];
5
+ type UltraHonkCircuits = Exclude<ProtocolArtifact, UltraKeccakHonkCircuits>;
6
+ export declare function getUltraHonkFlavorForCircuit(artifact: UltraKeccakHonkCircuits): 'ultra_keccak_honk';
7
+ export declare function getUltraHonkFlavorForCircuit(artifact: UltraHonkCircuits): 'ultra_honk';
8
+ export declare function getUltraHonkFlavorForCircuit(artifact: ProtocolArtifact): UltraHonkFlavor;
9
+ export {};
10
+ //# sourceMappingURL=honk.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"honk.d.ts","sourceRoot":"","sources":["../src/honk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEjE,QAAA,MAAM,uBAAuB,sCAAuC,CAAC;AACrE,KAAK,uBAAuB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC;AACxE,KAAK,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;AAE5E,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,uBAAuB,GAAG,mBAAmB,CAAC;AACrG,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,iBAAiB,GAAG,YAAY,CAAC;AACxF,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,eAAe,CAAC"}
package/dest/honk.js ADDED
@@ -0,0 +1,8 @@
1
+ const UltraKeccakHonkCircuits = ['BlockRootRollupArtifact'];
2
+ export function getUltraHonkFlavorForCircuit(artifact) {
3
+ return isUltraKeccakHonkCircuit(artifact) ? 'ultra_keccak_honk' : 'ultra_honk';
4
+ }
5
+ function isUltraKeccakHonkCircuit(artifact) {
6
+ return UltraKeccakHonkCircuits.includes(artifact);
7
+ }
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9uay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ob25rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBVSxDQUFDO0FBT3JFLE1BQU0sVUFBVSw0QkFBNEIsQ0FBQyxRQUEwQjtJQUNyRSxPQUFPLHdCQUF3QixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO0FBQ2pGLENBQUM7QUFFRCxTQUFTLHdCQUF3QixDQUFDLFFBQTBCO0lBQzFELE9BQU8sdUJBQXVCLENBQUMsUUFBUSxDQUFDLFFBQW1DLENBQUMsQ0FBQztBQUMvRSxDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"bb_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,cAAc,EACd,EAAE,EACF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAEL,KAAK,sBAAsB,EAa5B,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAYnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C;;;;GAIG;AACH,qBAAa,2BAA4B,YAAW,mBAAmB;IASnE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,GAAG;IAXb,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,OAAO;WAOa,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,WAAW;YAK7C,qBAAqB;IAmC7B,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAQzF,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAMvD,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,8CAA8C,GACrD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;IAiBhE,gCAAgC,CAC3C,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IASpC;;;;OAIG;IACU,6BAA6B,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;YAmB9E,kBAAkB;IAgBhC;;;;OAIG;YACW,oCAAoC;YAUpC,QAAQ;YAkCR,sBAAsB;IAqDpC;;;;;OAKG;YACW,iBAAiB;IAwB/B,OAAO,CAAC,cAAc;CAYvB"}
1
+ {"version":3,"file":"bb_private_kernel_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,cAAc,EACd,EAAE,EACF,KAAK,0BAA0B,EAC/B,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,8CAA8C,EACnD,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EACzC,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAE5E,OAAO,EAEL,KAAK,sBAAsB,EAa5B,MAAM,qCAAqC,CAAC;AAM7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAYnD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAK7C;;;;GAIG;AACH,qBAAa,2BAA4B,YAAW,mBAAmB;IASnE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,GAAG;IAXb,OAAO,CAAC,SAAS,CAAuB;IAExC,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,OAAO;WAOa,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,WAAW;YAK7C,qBAAqB;IAmC7B,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAQzF,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAMvD,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,kBAAkB,CAC7B,MAAM,EAAE,8CAA8C,GACrD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAS5D,iBAAiB,CAC5B,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;IAiBhE,gCAAgC,CAC3C,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IASpC;;;;OAIG;IACU,6BAA6B,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;YAwB9E,kBAAkB;IAiBhC;;;;OAIG;YACW,oCAAoC;YAUpC,QAAQ;YAkCR,sBAAsB;IA4DpC;;;;;OAKG;YACW,iBAAiB;IAwB/B,OAAO,CAAC,cAAc;CAYvB"}
@@ -10,6 +10,7 @@ import { serializeWitness } from '@noir-lang/noirc_abi';
10
10
  import * as fs from 'fs/promises';
11
11
  import path from 'path';
12
12
  import { BB_RESULT, PROOF_FIELDS_FILENAME, PROOF_FILENAME, computeVerificationKey, executeBbClientIvcProof, verifyProof, } from '../bb/execute.js';
13
+ import { getUltraHonkFlavorForCircuit } from '../honk.js';
13
14
  import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
14
15
  import { extractVkData } from '../verification_key/verification_key_data.js';
15
16
  /**
@@ -91,20 +92,20 @@ export class BBNativePrivateKernelProver {
91
92
  const logFunction = (message) => {
92
93
  this.log.debug(`${circuitType} BB out - ${message}`);
93
94
  };
94
- const result = await this.verifyProofFromKey(verificationKey.keyAsBytes, proof, logFunction);
95
+ const result = await this.verifyProofFromKey(getUltraHonkFlavorForCircuit(circuitType), verificationKey.keyAsBytes, proof, logFunction);
95
96
  if (result.status === BB_RESULT.FAILURE) {
96
97
  const errorMessage = `Failed to verify ${circuitType} proof!`;
97
98
  throw new Error(errorMessage);
98
99
  }
99
100
  this.log.info(`Successfully verified ${circuitType} proof in ${Math.ceil(result.durationMs)} ms`);
100
101
  }
101
- async verifyProofFromKey(verificationKey, proof, logFunction = () => { }) {
102
+ async verifyProofFromKey(flavor, verificationKey, proof, logFunction = () => { }) {
102
103
  const operation = async (bbWorkingDirectory) => {
103
104
  const proofFileName = `${bbWorkingDirectory}/proof`;
104
105
  const verificationKeyPath = `${bbWorkingDirectory}/vk`;
105
106
  await fs.writeFile(proofFileName, proof.buffer);
106
107
  await fs.writeFile(verificationKeyPath, verificationKey);
107
- return await verifyProof(this.bbBinaryPath, proofFileName, verificationKeyPath, logFunction);
108
+ return await verifyProof(this.bbBinaryPath, proofFileName, verificationKeyPath, flavor, logFunction);
108
109
  };
109
110
  return await this.runInDirectory(operation);
110
111
  }
@@ -149,7 +150,7 @@ export class BBNativePrivateKernelProver {
149
150
  const dbgCircuitName = appCircuitName ? `(${appCircuitName})` : '';
150
151
  this.log.info(`Computing VK of ${circuitType}${dbgCircuitName} circuit...`);
151
152
  const timer = new Timer();
152
- const vkResult = await computeVerificationKey(this.bbBinaryPath, directory, circuitType, bytecode, this.log.debug);
153
+ const vkResult = await computeVerificationKey(this.bbBinaryPath, directory, circuitType, bytecode, circuitType === 'App' ? 'ultra_honk' : getUltraHonkFlavorForCircuit(circuitType), this.log.debug);
153
154
  if (vkResult.status === BB_RESULT.FAILURE) {
154
155
  this.log.error(`Failed to generate proof for ${circuitType}${dbgCircuitName}: ${vkResult.reason}`);
155
156
  throw new Error(vkResult.reason);
@@ -207,4 +208,4 @@ export class BBNativePrivateKernelProver {
207
208
  }), this.skipCleanup);
208
209
  }
209
210
  }
210
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_private_kernel_prover.js","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":"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"}
211
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bb_private_kernel_prover.js","sourceRoot":"","sources":["../../src/prover/bb_private_kernel_prover.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { type AvmCircuitInputs, type AvmVerificationKeyData, type BaseOrMergeRol
3
3
  import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
4
4
  import { type TelemetryClient } from '@aztec/telemetry-client';
5
5
  import type { ACVMConfig, BBConfig } from '../config.js';
6
+ import { type UltraHonkFlavor } from '../honk.js';
6
7
  export interface BBProverConfig extends BBConfig, ACVMConfig {
7
8
  circuitFilter?: ServerProtocolArtifact[];
8
9
  }
@@ -107,7 +108,7 @@ export declare class BBNativeRollupProver implements ServerCircuitProver {
107
108
  */
108
109
  verifyProof(circuitType: ServerProtocolArtifact, proof: Proof): Promise<void>;
109
110
  verifyAvmProof(proof: Proof, verificationKey: AvmVerificationKeyData): Promise<void>;
110
- verifyWithKey(verificationKey: VerificationKeyData, proof: Proof): Promise<void>;
111
+ verifyWithKey(flavor: UltraHonkFlavor, verificationKey: VerificationKeyData, proof: Proof): Promise<void>;
111
112
  private verifyWithKeyInternal;
112
113
  /**
113
114
  * Returns the verification key for a circuit, will generate it if not cached internally
@@ -1 +1 @@
1
- {"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,iCAAiC,EACtC,KAAK,qBAAqB,EAI1B,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,6BAA6B,EAC7B,KAAK,2BAA2B,EAEhC,KAAK,EACL,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAGL,KAAK,sBAAsB,EAoB5B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAc,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAuBtF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAazD,MAAM,WAAW,cAAe,SAAQ,QAAQ,EAAE,UAAU;IAE1D,aAAa,CAAC,EAAE,sBAAsB,EAAE,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,mBAAmB;IAQlD,OAAO,CAAC,MAAM;IAP1B,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,OAAO,CAAC,eAAe,CAAwB;gBAE3B,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe;IAItE,IAAI,MAAM,6CAET;WAEY,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe;IAWnE;;;;OAIG;IAEU,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC;IAqBlH;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,eAAe,CAAC,OAAO,6BAA6B,CAAC,CAAC;IAqBjE;;;;OAIG;IAIU,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAMvF;;;;OAIG;IAMU,oBAAoB,CAC/B,aAAa,EAAE,0BAA0B,GACxC,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAiC1E;;;;OAIG;IACU,kBAAkB,CAC7B,aAAa,EAAE,uBAAuB,GACrC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAgBpE;;;;OAIG;IACU,kBAAkB,CAC7B,eAAe,EAAE,gBAAgB,GAChC,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAyBxE;;;;OAIG;IACU,mBAAmB,CAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAgBxE;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAmB5E;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAgB5E;;;;OAIG;IACU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IAiBpD,0BAA0B,CACrC,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAYvD,iBAAiB,CAC5B,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;YAYtD,mBAAmB;YAoBnB,gCAAgC;YAiBhC,yCAAyC;YAiBzC,mBAAmB;YAsEnB,WAAW;YAyCX,sBAAsB;YAatB,uBAAuB;YAgBvB,cAAc;IAqCf,YAAY,CACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,CAAC;IA8BhG;;;;;;;;OAQG;YACW,oBAAoB;IAkDlC;;;;OAIG;IACU,WAAW,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;IAM7D,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,sBAAsB;IAIpE,aAAa,CAAC,eAAe,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK;YAI/D,qBAAqB;IAkCnC;;;;OAIG;IACU,4BAA4B,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAKhH;;;;OAIG;IACU,gBAAgB,CAC3B,KAAK,EAAE,cAAc,CAAC,OAAO,6BAA6B,CAAC,EAC3D,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,mBAAmB;IAsDzB;;;;OAIG;YACW,gCAAgC;IAsB9C;;;;OAIG;YACW,+BAA+B;IAY7C;;;;;OAKG;YACW,iBAAiB;IAwC/B;;;;;;OAMG;YACW,qBAAqB;IAmCnC,OAAO,CAAC,cAAc;CAWvB"}
1
+ {"version":3,"file":"bb_prover.d.ts","sourceRoot":"","sources":["../../src/prover/bb_prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAClC,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,iCAAiC,EACtC,KAAK,qBAAqB,EAI1B,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,6BAA6B,EAC7B,KAAK,2BAA2B,EAEhC,KAAK,EACL,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAGL,KAAK,sBAAsB,EAoB5B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAc,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAuBtF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,KAAK,eAAe,EAAgC,MAAM,YAAY,CAAC;AAQhF,MAAM,WAAW,cAAe,SAAQ,QAAQ,EAAE,UAAU;IAE1D,aAAa,CAAC,EAAE,sBAAsB,EAAE,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,oBAAqB,YAAW,mBAAmB;IAQlD,OAAO,CAAC,MAAM;IAP1B,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,OAAO,CAAC,eAAe,CAAwB;gBAE3B,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe;IAItE,IAAI,MAAM,6CAET;WAEY,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe;IAWnE;;;;OAIG;IAEU,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC;IAqBlH;;;;OAIG;IAEU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,eAAe,CAAC,OAAO,6BAA6B,CAAC,CAAC;IAqBjE;;;;OAIG;IAIU,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAMvF;;;;OAIG;IAMU,oBAAoB,CAC/B,aAAa,EAAE,0BAA0B,GACxC,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAkC1E;;;;OAIG;IACU,kBAAkB,CAC7B,aAAa,EAAE,uBAAuB,GACrC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAgBpE;;;;OAIG;IACU,kBAAkB,CAC7B,eAAe,EAAE,gBAAgB,GAChC,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAyBxE;;;;OAIG;IACU,mBAAmB,CAC9B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAgBxE;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAmB5E;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAgB5E;;;;OAIG;IACU,kBAAkB,CAC7B,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IAiBpD,0BAA0B,CACrC,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAYvD,iBAAiB,CAC5B,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;YAYtD,mBAAmB;YAoBnB,gCAAgC;YAiBhC,yCAAyC;YAiBzC,mBAAmB;YAuEnB,WAAW;YAyCX,sBAAsB;YAatB,uBAAuB;YAgBvB,cAAc;IAqCf,YAAY,CACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAAC,CAAA;KAAE,CAAC;IA6BhG;;;;;;;;OAQG;YACW,oBAAoB;IAkDlC;;;;OAIG;IACU,WAAW,CAAC,WAAW,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK;IAK7D,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,sBAAsB;IAMpE,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK;YAMxF,qBAAqB;IAyBnC;;;;OAIG;IACU,4BAA4B,CAAC,WAAW,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAKhH;;;;OAIG;IACU,gBAAgB,CAC3B,KAAK,EAAE,cAAc,CAAC,OAAO,6BAA6B,CAAC,EAC3D,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,mBAAmB;IAsDzB;;;;OAIG;YACW,gCAAgC;IAuB9C;;;;OAIG;YACW,+BAA+B;IAa7C;;;;;OAKG;YACW,iBAAiB;IAiC/B;;;;;;OAMG;YACW,qBAAqB;IAmCnC,OAAO,CAAC,cAAc;CAWvB"}