@aztec/prover-client 0.54.0 → 0.55.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/mocks/test_context.d.ts +1 -1
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +21 -4
- package/dest/orchestrator/orchestrator.js +2 -2
- package/dest/prover-agent/rpc.d.ts.map +1 -1
- package/dest/prover-agent/rpc.js +4 -2
- package/dest/test/mock_prover.d.ts +25 -0
- package/dest/test/mock_prover.d.ts.map +1 -0
- package/dest/test/mock_prover.js +52 -0
- package/package.json +11 -10
- package/src/mocks/test_context.ts +23 -2
- package/src/orchestrator/orchestrator.ts +1 -1
- package/src/prover-agent/rpc.ts +3 -0
- package/src/test/mock_prover.ts +148 -0
|
@@ -23,7 +23,7 @@ export declare class TestContext {
|
|
|
23
23
|
logger: DebugLogger;
|
|
24
24
|
constructor(publicExecutor: MockProxy<PublicExecutor>, publicContractsDB: MockProxy<ContractsDataSourcePublicDB>, publicWorldStateDB: MockProxy<WorldStatePublicDB>, publicProcessor: PublicProcessor, simulationProvider: SimulationProvider, globalVariables: GlobalVariables, actualDb: MerkleTreeAdminOperations, prover: ServerCircuitProver, proverAgent: ProverAgent, orchestrator: ProvingOrchestrator, blockNumber: number, directoriesToCleanup: string[], logger: DebugLogger);
|
|
25
25
|
get blockProver(): ProvingOrchestrator;
|
|
26
|
-
static new(logger: DebugLogger, proverCount?: number, createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>, blockNumber?: number): Promise<TestContext>;
|
|
26
|
+
static new(logger: DebugLogger, worldState?: 'native' | 'legacy', proverCount?: number, createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>, blockNumber?: number): Promise<TestContext>;
|
|
27
27
|
cleanup(): Promise<void>;
|
|
28
28
|
processPublicFunctions(txs: Tx[], maxTransactions: number, blockProver?: BlockProver, txValidator?: TxValidator<ProcessedTx>): Promise<[ProcessedTx[], import("@aztec/circuit-types").FailedTx[], import("@aztec/circuit-types").NestedProcessReturnValues[]]>;
|
|
29
29
|
processPublicFunctionsWithMockExecutorImplementation(txs: Tx[], maxTransactions: number, blockProver?: BlockProver, txValidator?: TxValidator<ProcessedTx>, executorMock?: (execution: PublicExecutionRequest, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingNullifiers: Nullifier[], transactionFee?: Fr, sideEffectCounter?: number) => Promise<PublicExecutionResult>): Promise<[ProcessedTx[], import("@aztec/circuit-types").FailedTx[], import("@aztec/circuit-types").NestedProcessReturnValues[]]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAChB,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,EAAE,EACP,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,GAAG,EAAE,eAAe,EAAU,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvG,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAE1B,KAAK,cAAc,EACnB,eAAe,EAEf,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAChB,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,EAAE,EACP,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,GAAG,EAAE,eAAe,EAAU,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvG,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAE1B,KAAK,cAAc,EACnB,eAAe,EAEf,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EACxB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,KAAK,SAAS,EAAQ,MAAM,oBAAoB,CAAC;AAK1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,qBAAa,WAAW;IAEb,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC;IACzC,iBAAiB,EAAE,SAAS,CAAC,2BAA2B,CAAC;IACzD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,CAAC;IACjD,eAAe,EAAE,eAAe;IAChC,kBAAkB,EAAE,kBAAkB;IACtC,eAAe,EAAE,eAAe;IAChC,QAAQ,EAAE,yBAAyB;IACnC,MAAM,EAAE,mBAAmB;IAC3B,WAAW,EAAE,WAAW;IACxB,YAAY,EAAE,mBAAmB;IACjC,WAAW,EAAE,MAAM;IACnB,oBAAoB,EAAE,MAAM,EAAE;IAC9B,MAAM,EAAE,WAAW;gBAZnB,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,EACzC,iBAAiB,EAAE,SAAS,CAAC,2BAA2B,CAAC,EACzD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,CAAC,EACjD,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,yBAAyB,EACnC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,mBAAmB,EACjC,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,EAAE,EAC9B,MAAM,EAAE,WAAW;IAG5B,IAAW,WAAW,wBAErB;WAEY,GAAG,CACd,MAAM,EAAE,WAAW,EACnB,UAAU,GAAE,QAAQ,GAAG,QAAmB,EAC1C,WAAW,SAAI,EACf,YAAY,GAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,mBAAmB,CACiB,EACxF,WAAW,SAAI;IAgFX,OAAO;IAOA,sBAAsB,CACjC,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC;IAqC3B,oDAAoD,CAC/D,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,EACtC,YAAY,CAAC,EAAE,CACb,SAAS,EAAE,sBAAsB,EACjC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,SAAS,EAAE,EAC9B,cAAc,CAAC,EAAE,EAAE,EACnB,iBAAiB,CAAC,EAAE,MAAM,KACvB,OAAO,CAAC,qBAAqB,CAAC;CAOtC"}
|
|
@@ -3,8 +3,11 @@ import { openTmpStore } from '@aztec/kv-store/utils';
|
|
|
3
3
|
import { PublicExecutionResultBuilder, PublicProcessor, RealPublicKernelCircuitSimulator, WASMSimulator, } from '@aztec/simulator';
|
|
4
4
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
5
5
|
import { MerkleTrees } from '@aztec/world-state';
|
|
6
|
+
import { NativeWorldStateService } from '@aztec/world-state/native';
|
|
6
7
|
import * as fs from 'fs/promises';
|
|
7
8
|
import { mock } from 'jest-mock-extended';
|
|
9
|
+
import { tmpdir } from 'os';
|
|
10
|
+
import { join } from 'path';
|
|
8
11
|
import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
|
|
9
12
|
import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
|
|
10
13
|
import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
|
|
@@ -29,14 +32,25 @@ export class TestContext {
|
|
|
29
32
|
get blockProver() {
|
|
30
33
|
return this.orchestrator;
|
|
31
34
|
}
|
|
32
|
-
static async new(logger, proverCount = 4, createProver = _ => Promise.resolve(new TestCircuitProver(new NoopTelemetryClient(), new WASMSimulator())), blockNumber = 3) {
|
|
35
|
+
static async new(logger, worldState = 'legacy', proverCount = 4, createProver = _ => Promise.resolve(new TestCircuitProver(new NoopTelemetryClient(), new WASMSimulator())), blockNumber = 3) {
|
|
36
|
+
const directoriesToCleanup = [];
|
|
33
37
|
const globalVariables = makeGlobals(blockNumber);
|
|
34
38
|
const publicExecutor = mock();
|
|
35
39
|
const publicContractsDB = mock();
|
|
36
40
|
const publicWorldStateDB = mock();
|
|
37
41
|
const publicKernel = new RealPublicKernelCircuitSimulator(new WASMSimulator());
|
|
38
42
|
const telemetry = new NoopTelemetryClient();
|
|
39
|
-
|
|
43
|
+
let actualDb;
|
|
44
|
+
if (worldState === 'native') {
|
|
45
|
+
const dir = await fs.mkdtemp(join(tmpdir(), 'prover-client-world-state-'));
|
|
46
|
+
directoriesToCleanup.push(dir);
|
|
47
|
+
const ws = await NativeWorldStateService.create(dir);
|
|
48
|
+
actualDb = ws.asLatest();
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
const ws = await MerkleTrees.new(openTmpStore(), telemetry);
|
|
52
|
+
actualDb = ws.asLatest();
|
|
53
|
+
}
|
|
40
54
|
const processor = new PublicProcessor(actualDb, publicExecutor, publicKernel, GlobalVariables.empty(), Header.empty(), publicContractsDB, publicWorldStateDB, telemetry);
|
|
41
55
|
let localProver;
|
|
42
56
|
const config = await getEnvironmentConfig(logger);
|
|
@@ -56,12 +70,15 @@ export class TestContext {
|
|
|
56
70
|
};
|
|
57
71
|
localProver = await createProver(bbConfig);
|
|
58
72
|
}
|
|
73
|
+
if (config?.directoryToCleanup) {
|
|
74
|
+
directoriesToCleanup.push(config.directoryToCleanup);
|
|
75
|
+
}
|
|
59
76
|
const queue = new MemoryProvingQueue(telemetry);
|
|
60
77
|
const orchestrator = new ProvingOrchestrator(actualDb, queue, telemetry);
|
|
61
78
|
const agent = new ProverAgent(localProver, proverCount);
|
|
62
79
|
queue.start();
|
|
63
80
|
agent.start(queue);
|
|
64
|
-
return new this(publicExecutor, publicContractsDB, publicWorldStateDB, processor, simulationProvider, globalVariables, actualDb, localProver, agent, orchestrator, blockNumber,
|
|
81
|
+
return new this(publicExecutor, publicContractsDB, publicWorldStateDB, processor, simulationProvider, globalVariables, actualDb, localProver, agent, orchestrator, blockNumber, directoriesToCleanup, logger);
|
|
65
82
|
}
|
|
66
83
|
async cleanup() {
|
|
67
84
|
await this.proverAgent.stop();
|
|
@@ -97,4 +114,4 @@ export class TestContext {
|
|
|
97
114
|
return await this.publicProcessor.process(txs, maxTransactions, blockProver, txValidator);
|
|
98
115
|
}
|
|
99
116
|
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBQVksZUFBZSxFQUFFLE1BQU0sRUFBa0MsTUFBTSxvQkFBb0IsQ0FBQztBQUd2RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUdMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVwRSxPQUFPLEtBQUssRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsQyxPQUFPLEVBQWtCLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDNUIsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU1QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLE9BQU8sV0FBVztJQUN0QixZQUNTLGNBQXlDLEVBQ3pDLGlCQUF5RCxFQUN6RCxrQkFBaUQs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
|
|
@@ -360,7 +360,7 @@ let ProvingOrchestrator = (() => {
|
|
|
360
360
|
// drop this result
|
|
361
361
|
return;
|
|
362
362
|
}
|
|
363
|
-
logger.error(`Error thrown when proving job
|
|
363
|
+
logger.error(`Error thrown when proving job`, err);
|
|
364
364
|
provingState.reject(`${err}`);
|
|
365
365
|
}
|
|
366
366
|
finally {
|
|
@@ -717,4 +717,4 @@ let ProvingOrchestrator = (() => {
|
|
|
717
717
|
_a;
|
|
718
718
|
})();
|
|
719
719
|
export { ProvingOrchestrator };
|
|
720
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
|
|
720
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,EACJ,qBAAqB,EACrB,iBAAiB,EACjB,OAAO,EACP,YAAY,EAGZ,gBAAgB,EAChB,EAAE,EAEF,mBAAmB,EACnB,oBAAoB,EACpB,sBAAsB,EACtB,4BAA4B,EAC5B,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,EAEf,cAAc,GAMf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,gBAAgB,EAEhB,gBAAgB,EAEhB,iBAAiB,EACjB,EAAE,EAEF,MAAM,EAEN,2BAA2B,EAC3B,wCAAwC,EACxC,6BAA6B,EAC7B,mCAAmC,EACnC,+BAA+B,EAC/B,2BAA2B,EAM3B,gBAAgB,EAChB,cAAc,EAEd,UAAU,EAEV,mBAAmB,EACnB,cAAc,EACd,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAClG,OAAO,EAAE,UAAU,EAAqC,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAGvH,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,uBAAuB,EACvB,oBAAoB,EACpB,UAAU,GACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAA6B,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,eAAe,EAA6B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnG,MAAM,MAAM,GAAG,iBAAiB,CAAC,mCAAmC,CAAC,CAAC;AAEtE;;;;;;;;;GASG;AAEH;;GAEG;IACU,mBAAmB;;;;;;;;sBAAnB,mBAAmB;YAO9B,YACU,EAAwB,EACxB,MAA2B,EACnC,eAAgC,EACf,WAAe,EAAE,CAAC,IAAI;gBAH/B,OAAE,IARD,mDAAmB,EAQpB,EAAE,EAAsB;gBACxB,WAAM,GAAN,MAAM,CAAqB;gBAElB,aAAQ,GAAR,QAAQ,CAAc;gBAVjC,iBAAY,GAA6B,SAAS,CAAC;gBACnD,uBAAkB,GAAsB,EAAE,CAAC;gBAC3C,cAAS,GAAmC,SAAS,CAAC;gBAU5D,IAAI,CAAC,OAAO,GAAG,IAAI,0BAA0B,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;YACxF,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YAEM,WAAW;gBAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;YACvB,CAAC;YAED;;eAEG;YACI,KAAK;gBACV,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAC7B,CAAC;YAED;;;;;;;eAOG;YAKI,KAAK,CAAC,aAAa,CACxB,MAAc,EACd,eAAgC,EAChC,cAAoB;gBAEpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CAAC,2DAA2D,MAAM,GAAG,CAAC,CAAC;gBACxF,CAAC;gBAED,iGAAiG;gBACjG,yDAAyD;gBACzD,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC;gBACxC,MAAM,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;gBAClF,IAAI,aAAa,KAAK,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;oBAClD,MAAM,CAAC,IAAI,CACT,qDAAqD,WAAW,CAAC,QAAQ,EAAE,eAAe,aAAa,GAAG,CAC3G,CAAC;gBACJ,CAAC;gBAED,+DAA+D;gBAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CACT,kBAAkB,eAAe,CAAC,WAAW,aAAa,eAAe,CAAC,UAAU,SAAS,MAAM,eAAe,CACnH,CAAC;gBACF,mEAAmE;gBACnE,IAAI,gBAAgB,GAAuB,EAAE,CAAC;gBAC9C,IAAI,oBAA2E,CAAC;gBAChF,IAAI,CAAC;oBACH,oBAAoB,GAAG,WAAW,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC;gBACnG,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACD,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAClF,gBAAgB,CAAC,SAAS,CAAC,oBAAoB,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,CACrE,CAAC;gBAEF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;gBAE/F,MAAM,wCAAwC,GAAG,MAAM,qBAAqB,CAC1E,YAAY,CAAC,qBAAqB,EAClC,2BAA2B,EAC3B,IAAI,CAAC,EAAE,CACR,CAAC;gBAEF,MAAM,mCAAmC,GAAG,SAAS,CACnD,wCAAwC,EACxC,CAAC,CAAC,EAAE,CACF,CAAC,GAAG,wCAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAC7G,CAAC,CACF,CAAC;gBAEF,8DAA8D;gBAC9D,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;gBAErF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,EAAiB,CAAC;gBACrF,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAC5B,CAAC,MAAM,EAAiB,EAAE,CAAC,CAAC;oBAC1B,MAAM,EAAE,cAAc,CAAC,OAAO;oBAC9B,MAAM;iBACP,CAAC,CACH,CAAC;gBAEF,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,MAAM,EACN,OAAO,EACP,MAAM,EACN,eAAe,EACf,oBAAoB,EACpB,gBAAgB,CAAC,MAAM,EACvB,mBAAmB,EACnB,mCAAmC,CACpC,CAAC;gBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACjD,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtE,CAAC;gBAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;gBAEjC,MAAM,MAAM,GAAkB;oBAC5B,cAAc,EAAE,OAAO;iBACxB,CAAC;gBACF,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;eAGG;YAII,KAAK,CAAC,QAAQ,CAAC,EAAe;gBACnC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;gBAC1F,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,EAAE,CAAC;oBACjD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,CAAC;gBAED,UAAU,CAAC,EAAE,CAAC,CAAC;gBAEf,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEhD,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC,IAAI,uCAAuC,CAAC,CAAC;oBAC1F,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;gBACrF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACxE,CAAC;YAED;;eAEG;YAYI,KAAK,CAAC,iBAAiB;gBAC5B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,8FAA8F,CAAC,CAAC;gBAClH,CAAC;gBAED,wDAAwD;gBACxD,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC;gBAC9F,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO;gBACT,CAAC;qBAAM,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;oBAC7C,MAAM,IAAI,KAAK,CAAC,6CAA6C,cAAc,qBAAqB,CAAC,CAAC;gBACpG,CAAC;gBAED,MAAM,CAAC,KAAK,CAAC,uBAAuB,cAAc,qBAAqB,CAAC,CAAC;gBACzE,oCAAoC;gBACpC,gBAAgB;gBAChB,2DAA2D;gBAC3D,qFAAqF;gBACrF,yEAAyE;gBACzE,qBAAqB;gBACrB,mDAAmD;gBACnD,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAC1B,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,EACzC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,EACzC,aAAa,EAAE,CAChB,CAAC;gBACF,MAAM,QAAQ,GAAiE,EAAE,CAAC;gBAClF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;oBACxC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC/F,MAAM,OAAO,GAAG;wBACd,MAAM;wBACN,QAAQ;qBACT,CAAC;oBACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzB,CAAC;gBAED,0BAA0B;gBAC1B,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YACzE,CAAC;YAED,4DAA4D;YAC5D,sFAAsF;YAC9E,iBAAiB,CACvB,YAA0B,EAC1B,QAAsE,EACtE,iBAA8B;gBAE9B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,0CAA0C;oBAC1C,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,CAAC,MAAM,iDAAiD,CAAC,CAAC;oBAC5F,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;oBACtE,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,yDAAyD,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC;gBAClG,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,uDAAuD,EACvD;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,sBAAqC;iBAC1E,EACD,MAAM,CAAC,EAAE,CACP,IAAI,CAAC,MAAM,CAAC,0BAA0B,CACpC,IAAI,2BAA2B,CAC7B,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB;gBACjD,qHAAqH;gBACrH,oHAAoH;gBACpH,4EAA4E;gBAC5E,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAClD,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAClD,aAAa,EAAE,CAChB,EACD,MAAM,EACN,YAAY,CAAC,WAAW,CACzB,CACJ,EACD,MAAM,CAAC,EAAE;oBACP,MAAM,CAAC,KAAK,CAAC,iDAAiD,QAAQ,CAAC,MAAM,cAAc,CAAC,CAAC;oBAC7F,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;oBAChD,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACxE,CAAC,CACF,CAAC;YACJ,CAAC;YAED;;;;;eAKG;YACK,wBAAwB,CAC9B,QAAsE,EACtE,SAA6B,EAC7B,YAA0B;gBAE1B,sFAAsF;gBACtF,2EAA2E;gBAC3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACzC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;oBAC7D,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC,cAAc,CAAC;oBAE/D,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;oBAC9E,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC/F,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC/F,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;oBACtD,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;YAED;;eAEG;YACI,WAAW;gBAChB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACjD,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,CAAC;gBAED,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;YAC9B,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,kBAAkB;gBAC9B,IACE,CAAC,IAAI,CAAC,YAAY;oBAClB,CAAC,IAAI,CAAC,YAAY,CAAC,2BAA2B;oBAC9C,CAAC,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,YAAY,CAAC,OAAO,EAC7D,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;gBACvG,CAAC;gBAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC;gBACxE,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAErE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnD,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;gBAClG,CAAC;gBAED,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EACjE,WAAW,CACT,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAChH,EACD,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,EACtE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAC/G,CAAC;gBACF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,MAAM,eAAe,CAAC,YAAY,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE,CAAC,EAClE,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG,CACzB,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,iBAAiB,CAAC,eAAe,EACjC,iBAAiB,EACjB,KAAK,EACL,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,EAC9C,iBAAiB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAC/E,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC1D,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBACxD,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;YAED;;;eAGG;YAQI,KAAK,CAAC,aAAa;gBACxB,IAAI,CAAC;oBACH,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,2BAA2B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;wBAC1G,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;oBAC9F,CAAC;oBACD,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;wBAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC7C,CAAC;oBAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC;oBACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAE/C,MAAM,EAAE,KAAK,CAAC,oCAAoC,CAAC,CAAC;oBACpD,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAEpC,MAAM,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBAElE,oFAAoF;oBACpF,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC;oBAC1D,MAAM,iBAAiB,GAAe,IAAI,CAAC,YAAa,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CACnF,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAChD,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC1C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAC;oBAE9C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;wBACjC,OAAO,EAAE,iBAAiB,CAAC,UAAU;wBACrC,MAAM,EAAE,MAAM;wBACd,IAAI,EAAE,SAAS;qBAChB,CAAC,CAAC;oBAEH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC;wBACtF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;wBACjC,MAAM,IAAI,KAAK,CACb,8BAA8B,OAAO,CAAC,IAAI;6BACvC,iBAAiB,EAAE;6BACnB,QAAQ,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CACpF,CAAC;oBACJ,CAAC;oBAED,MAAM,CAAC,IAAI,CAAC,gCAAgC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;oBAE9D,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO,CAAC;oBAElC,MAAM,WAAW,GAAuB;wBACtC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;wBACnC,iBAAiB,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,wBAAwB,EAAE;wBAC1E,KAAK,EAAE,OAAO;qBACf,CAAC;oBAEF,YAAY,CAAC,cAAc,EAAE;wBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;wBAClC,UAAU,EAAE,aAAa,EAAE,CAAC,QAAQ,EAAE;wBACtC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE;wBACzB,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE;wBAC9C,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;qBACxE,CAAC,CAAC;oBAEH,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,IAAI,eAAe,CACvB,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EACtF,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CACpE,CAAC;gBACJ,CAAC;YACH,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,kBAAkB,CAAC,EAAe,EAAE,YAA0B;gBAC1E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,8BAA8B;oBAC9B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;gBAC7E,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YAEO,kBAAkB,CACxB,MAAwB,EACxB,aAA4B,EAC5B,EAAe,EACf,YAA0B;gBAE1B,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACrE,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBACtD,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBACxC,MAAM,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,EAAE,CAAC;gBAC9D,yCAAyC;gBACzC,qGAAqG;gBACrG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC1C,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;oBAC5D,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;YAED;;;;;eAKG;YACK,eAAe,CACrB,YAAsC,EACtC,OAA4C,EAC5C,QAA6C;gBAE7C,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;oBACzD,OAAO;gBACT,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;gBACzC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAEzC,8GAA8G;gBAC9G,8EAA8E;gBAC9E,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;oBACzB,IAAI,CAAC;wBACH,sEAAsE;wBACtE,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;4BAC9B,OAAO;wBACT,CAAC;wBAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;wBAChD,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;4BACjC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;4BACzD,OAAO;wBACT,CAAC;wBAED,6DAA6D;wBAC7D,kEAAkE;wBAClE,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;4BAC9B,OAAO;wBACT,CAAC;wBAED,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACzB,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;4BAC9B,oEAAoE;4BACpE,mBAAmB;4BACnB,OAAO;wBACT,CAAC;wBAED,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;wBACnD,YAAa,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;oBACjC,CAAC;4BAAS,CAAC;wBACT,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wBAC1D,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;4BACf,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBAC3C,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC;gBAEF,8DAA8D;gBAC9D,YAAY,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAED,uFAAuF;YAI/E,KAAK,CAAC,uBAAuB,CACnC,YAAsC,EACtC,EAAe;gBAEf,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;oBAChE,OAAO;gBACT,CAAC;gBAED,2EAA2E;gBAC3E,8FAA8F;gBAC9F,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAChC,oBAAoB,CAClB,EAAE,EACF,uBAAuB,CAAC,6BAA6B,CAAC,EACtD,YAAY,CAAC,eAAe,EAC5B,IAAI,CAAC,EAAE,EACP,mBAAmB,CAAC,QAAQ,EAAE,CAC/B,CACF,CAAC;gBAEF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;oBAChB,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;gBAC1C,CAAC;gBAED,MAAM,QAAQ,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAC5G,KAAK,EAAE,EAAgB,EAAE,EAAE;oBACzB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChE,CAAC,CACF,CAAC;gBACF,MAAM,aAAa,GAAkB,IAAI,GAAG,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAE7G,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;oBAC9D,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YACjC,CAAC;YAED,4DAA4D;YACpD,gBAAgB,CACtB,YAA0B,EAC1B,YAAoB,EACpB,YAAoB,EACpB,WAIC;gBAED,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,CAAC,GAAG,YAAY,CAAC,cAAc,CACvF,YAAY,EACZ,YAAY,CACb,CAAC;gBACF,MAAM,UAAU,GAAG,EAAE,IAAI,UAAU,GAAG,EAAE,GAAG,qBAAqB,CAAC;gBACjE,MAAM,KAAK,GAAG,YAAY,CAAC,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;gBACvG,OAAO;oBACL,KAAK;oBACL,qBAAqB;oBACrB,UAAU;oBACV,cAAc,EAAE,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;iBAChE,CAAC;YACJ,CAAC;YAED,iHAAiH;YACjH,+DAA+D;YACvD,iBAAiB,CAAC,YAAsC,EAAE,KAAa,EAAE,EAAkB;gBACjG,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;oBACvD,OAAO;gBACT,CAAC;gBACD,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,YAAY,CAC5D,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB;qBACpE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;qBAC7B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CACpC,CAAC;gBACF,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACzE,YAAY,CAAC,MAAM,CACjB,sCAAsC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,UAAU,CAC3F,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,EAAE,CACxC,EAAE,CACJ,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,MAAM,eAAe,GAAG,iBAAiB,CAAC,cAAc,CACtD,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB;qBAChE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;qBAC7B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CACnC,CAAC;gBACF,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACjE,+EAA+E;oBAC/E,YAAY,CAAC,MAAM,CACjB,iCAAiC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,CAClF,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,CACpC,EAAE,CACJ,CAAC;oBACF,OAAO;gBACT,CAAC;gBAED,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,cAAc,CAC1D,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,qBAAqB;qBAClE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;qBAC7B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CACnC,CAAC;gBACF,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACrE,YAAY,CAAC,MAAM,CACjB,mCAAmC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,UAAU,CACtF,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CACtC,EAAE,CACJ,CAAC;oBACF,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,KAAK,CACV,yCACE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAChD,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CACzC,CAAC;gBAEF,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,+CAA+C,EAC/C;oBACE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACpD,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,aAA4B;iBACjE,EACD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CAChG,EACD,MAAM,CAAC,EAAE;oBACP,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACzF,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;oBAC1D,MAAM,YAAY,GAAG,YAAY,CAAC,cAAc,GAAG,EAAE,CAAC;oBACtD,IAAI,CAAC,6BAA6B,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE;wBACpE,MAAM,CAAC,MAAM;wBACb,MAAM,CAAC,KAAK;wBACZ,MAAM,CAAC,eAAe,CAAC,WAAW;qBACnC,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;YAED,yDAAyD;YACzD,2FAA2F;YACnF,WAAW,CAAC,YAA0B,EAAE,OAAe;gBAC7D,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBACxD,OAAO;gBACT,CAAC;gBAED,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/D,MAAM,CAAC,KAAK,CAAC,wCAAwC,OAAO,EAAE,CAAC,CAAC;gBAEhE,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,yCAAyC,EACzC;oBACE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAChE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,cAA6B;iBAClE,EACD,MAAM,CAAC,EAAE,CACP,IAAI,CAAC,MAAM,CAAC,YAAY,CACtB,IAAI,UAAU,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,EACzD,MAAM,EACN,YAAY,CAAC,WAAW,CACzB,CACJ,EACD,MAAM,CAAC,EAAE;oBACP,MAAM,CAAC,KAAK,CAAC,sCAAsC,OAAO,EAAE,CAAC,CAAC;oBAC9D,MAAM,iBAAiB,GAAG,cAAc,CAAC,gCAAgC,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC3G,IAAI,CAAC,4BAA4B,CAC/B,YAAY,EACZ,OAAO,EACP,CAAC,CAAC,EACF,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,EACb,iBAAiB,CAClB,CAAC;gBACJ,CAAC,CACF,CAAC;YACJ,CAAC;YAED,wHAAwH;YACxH,+DAA+D;YACvD,kBAAkB,CACxB,YAA0B,EAC1B,KAAa,EACb,KAAa,EACb,cAAoC;gBAEpC,MAAM,MAAM,GAAG,uBAAuB,CACpC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAE,CAAC,EAC3F,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAE,CAAC,CAC5F,CAAC;gBAEF,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,gDAAgD,EAChD;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,cAA6B;iBAClE,EACD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CACpF,EACD,MAAM,CAAC,EAAE;oBACP,IAAI,CAAC,6BAA6B,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE;wBAC7D,MAAM,CAAC,MAAM;wBACb,MAAM,CAAC,KAAK;wBACZ,MAAM,CAAC,eAAe,CAAC,WAAW;qBACnC,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;YAED,yCAAyC;YACjC,KAAK,CAAC,sBAAsB,CAAC,YAAsC;gBACzE,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBACD,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;gBACtD,MAAM,eAAe,GAAG,YAAY,CAAC,oBAAqB,CAAC;gBAE3D,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAC1C,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EACzB,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EACzB,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAE,EACnC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EACzB,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,EACzB,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAE,EACnC,eAAe,EACf,YAAY,CAAC,iBAAiB,EAC9B,YAAY,CAAC,mBAAmB,EAChC,YAAY,CAAC,0BAA0B,EACvC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,QAAQ,CACd,CAAC;gBAEF,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,oDAAoD,EACpD;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,mBAAkC;iBACvE,EACD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CACxF,EACD,MAAM,CAAC,EAAE;oBACP,YAAY,CAAC,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC;oBACzD,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;oBAEnD,MAAM,aAAa,GAAkB;wBACnC,MAAM,EAAE,cAAc,CAAC,OAAO;qBAC/B,CAAC;oBACF,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACtC,CAAC,CACF,CAAC;YACJ,CAAC;YAED,iGAAiG;YACjG,+DAA+D;YACvD,wBAAwB,CAAC,YAA0B,EAAE,MAAwB,EAAE,KAAa;gBAClG,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,+CAA+C,EAC/C;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,aAA4B;iBACjE,EACD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CACnF,EACD,SAAS,CAAC,EAAE;oBACV,YAAY,CAAC,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBACnD,IAAI,YAAY,CAAC,wBAAwB,EAAE,EAAE,CAAC;wBAC5C,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAC3C,YAAY,CAAC,eAGZ,CACF,CAAC;wBACF,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;oBAChE,CAAC;gBACH,CAAC,CACF,CAAC;YACJ,CAAC;YAED,sDAAsD;YACtD,6DAA6D;YACrD,wBAAwB,CAAC,YAA0B,EAAE,MAAwB;gBACnF,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,+CAA+C,EAC/C;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,aAA4B;iBACjE,EACD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CACnF,EACD,KAAK,EAAC,SAAS,EAAC,EAAE;oBAChB,YAAa,CAAC,oBAAoB,GAAG,SAAS,CAAC;oBAC/C,MAAM,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAAC;gBAC1D,CAAC,CACF,CAAC;YACJ,CAAC;YAEO,KAAK,CAAC,8BAA8B,CAAC,YAAsC;gBACjF,IAAI,CAAC,YAAY,EAAE,yBAAyB,EAAE,EAAE,CAAC;oBAC/C,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBAC1C,OAAO;gBACT,CAAC;gBACD,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;YAClD,CAAC;YAED;;;;;;eAMG;YACK,6BAA6B,CACnC,YAA0B,EAC1B,YAAoB,EACpB,YAAoB,EACpB,cAIC;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;gBAE/F,4CAA4C;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAClB,OAAO;gBACT,CAAC;gBAED,IAAI,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;oBAC7B,kCAAkC;oBAClC,KAAK,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACN,4BAA4B;oBAC5B,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;gBAChH,CAAC;YACH,CAAC;YAED;;;;;;eAMG;YACK,SAAS,CAAC,YAAsC,EAAE,OAAe,EAAE,aAAqB;gBAC9F,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;oBACnE,OAAO;gBACT,CAAC;gBAED,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/D,MAAM,cAAc,GAAG,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;gBAE5E,sFAAsF;gBACtF,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;oBAC7B,yHAAyH;oBACzH,oHAAoH;oBACpH,MAAM,YAAY,GAAG,kBAAkB,CACrC,IAAI,CAAC,MAAM,EACX,wCAAwC,EACxC;wBACE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAChE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,SAAU,CAAC,YAAY;qBACtE,EACD,KAAK,EAAE,MAAmB,EAAE,EAAE;wBAC5B,MAAM,MAAM,GAAqB,IAAI,gBAAgB,CACnD,cAAc,CAAC,SAAU,CAAC,YAAY,EACtC,cAAc,CAAC,SAAU,CAAC,QAAQ,EAClC,cAAc,CAAC,SAAU,CAAC,QAAQ,EAClC,cAAc,CAAC,SAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,YAAY,EACpF,cAAc,CAAC,SAAU,CAAC,QAAQ,CACnC,CAAC;wBACF,IAAI,CAAC;4BACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;wBACjF,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;gCACnC,MAAM,GAAG,CAAC;4BACZ,CAAC;iCAAM,CAAC;gCACN,MAAM,CAAC,IAAI,CACT,qHAAqH,GAAG,GAAG,CAC5H,CAAC;gCACF,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,eAAe,EAAE,mBAAmB,CAAC,QAAQ,EAAE,EAAE,CAAC;4BACtF,CAAC;wBACH,CAAC;oBACH,CAAC,CACF,CAAC;oBACF,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE;wBAC5D,MAAM,CAAC,KAAK,CAAC,gCAAgC,aAAa,gBAAgB,OAAO,EAAE,CAAC,CAAC;wBACrF,IAAI,CAAC,sCAAsC,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;oBACtG,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,sCAAsC,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC;gBACnH,CAAC;YACH,CAAC;YAEO,sCAAsC,CAC5C,YAA0B,EAC1B,OAAe,EACf,aAAqB,EACrB,OAAc;gBAEd,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/D,MAAM,aAAa,GAAG,cAAc,CAAC,8BAA8B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBAC5F,IAAI,aAAa,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;oBACjD,IAAI,aAAa,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;wBACzC,yBAAyB;wBACzB,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;oBAChG,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,mCAAmC,OAAO,cAAc,aAAa,EAAE,CAAC,CAAC;oBACtF,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAED,sGAAsG;YACtG,0DAA0D;YAC1D,2FAA2F;YACnF,4BAA4B,CAClC,YAA0B,EAC1B,OAAe,EACf,sBAA8B,EAC9B,KAAsG,EACtG,eAAoC,EACpC,iBAAuC;gBAEvC,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/D,wCAAwC;gBACxC,IAAI,iBAAiB,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,EAAE,CAAC;oBACzD,gCAAgC;oBAChC,OAAO;gBACT,CAAC;gBAED,IAAI,iBAAiB,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,EAAE,CAAC;oBACzD,qFAAqF;oBACrF,MAAM,CAAC,KAAK,CAAC,qCAAqC,OAAO,yBAAyB,CAAC,CAAC;oBACpF,+DAA+D;oBAC/D,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;oBACzD,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,GAAG,eAAe,CAAC;oBAChE,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;oBACjF,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,GAAG,gBAAgB,CAClE,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CACnD,CAAC;oBAEF,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,CAAC;oBACtE,OAAO;gBACT,CAAC;gBACD,kDAAkD;gBAClD,IAAI,iBAAiB,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC7C,yBAAyB;oBACzB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;gBACpG,CAAC;gBAED,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,sBAAsB,GAAG,CAAC,CAAC,CAAC;YAC9E,CAAC;YAED;;;;;;eAMG;YACK,mBAAmB,CAAC,YAAsC,EAAE,OAAe,EAAE,aAAqB;gBACxG,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;oBAC9E,OAAO;gBACT,CAAC;gBAED,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC/D,MAAM,OAAO,GAAG,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,mBAAmB,CAAC;gBAEzF,IAAI,CAAC,eAAe,CAClB,YAAY,EACZ,kBAAkB,CAChB,IAAI,CAAC,MAAM,EACX,OAAO,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI;oBACpC,CAAC,CAAC,+CAA+C;oBACjD,CAAC,CAAC,iDAAiD,EACrD;oBACE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,4BAA4B,CAAC,OAAO,CAAC,IAAI,CAAC;iBAC/E,EACD,CACE,MAAM,EAC+F,EAAE;oBACvG,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,EAAE,CAAC;wBAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;oBACnF,CAAC;yBAAM,CAAC;wBACN,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;oBACrF,CAAC;gBACH,CAAC,CACF,EACD,MAAM,CAAC,EAAE;oBACP,MAAM,iBAAiB,GAAG,cAAc,CAAC,kCAAkC,CACzE,aAAa,EACb,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,eAAe,CACvB,CAAC;oBACF,IAAI,CAAC,4BAA4B,CAC/B,YAAY,EACZ,OAAO,EACP,aAAa,EACb,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,eAAe,EACtB,iBAAiB,CAClB,CAAC;gBACJ,CAAC,CACF,CAAC;YACJ,CAAC;;;;yCA7+BA,SAAS,CAAC,mCAAmC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;oBAC5E,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM;oBAC/B,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;iBAClE,CAAC,CAAC;oCA0FF,SAAS,CAAC,8BAA8B,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBAChD,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;iBACzC,CAAC,CAAC;6CA0BF,SAAS,CAAC,uCAAuC,EAAE;oBAClD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;wBACvB,OAAO,EAAE,CAAC;oBACZ,CAAC;oBAED,OAAO;wBACL,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;wBACpF,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,WAAW;wBACvD,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,oBAAoB;qBACtE,CAAC;gBACJ,CAAC,CAAC;yCA8KD,SAAS,CAAC,mCAAmC,EAAE;oBAC9C,OAAO;wBACL,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;wBACpF,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,oBAAoB;wBACrE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,YAAa,CAAC,WAAW;qBACxD,CAAC;gBACJ,CAAC,CAAC;mDAkKD,SAAS,CAAC,6CAA6C,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBACpE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;iBACzC,CAAC,CAAC;YAvdH,wLAAa,aAAa,6DAmFzB;YASD,yKAAa,QAAQ,6DAoBpB;YAgBD,oMAAa,iBAAiB,6DAuC7B;YA6ID,wLAAa,aAAa,6DAgEzB;YAoGD,sNAAc,uBAAuB,6DAqCpC;;;;;SAxiBU,mBAAmB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA+B7D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAiCnF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,yFAA8B,GAClC,gBAAgB,CAoClB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,iBAc5D"}
|
package/dest/prover-agent/rpc.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { AvmCircuitInputs, AztecAddress, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EthAddress, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, PrivateKernelEmptyInputData, Proof, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelTailCircuitPrivateInputs, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VerificationKeyData, } from '@aztec/circuits.js';
|
|
1
|
+
import { AvmCircuitInputs, AvmVerificationKeyData, AztecAddress, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EthAddress, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, PrivateKernelEmptyInputData, Proof, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelTailCircuitPrivateInputs, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VerificationKeyData, } from '@aztec/circuits.js';
|
|
2
2
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
3
3
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
4
4
|
import { ProvingError } from './proving-error.js';
|
|
5
5
|
export function createProvingJobSourceServer(queue) {
|
|
6
6
|
return new JsonRpcServer(queue, {
|
|
7
|
+
AvmVerificationKeyData,
|
|
7
8
|
AvmCircuitInputs,
|
|
8
9
|
BaseOrMergeRollupPublicInputs,
|
|
9
10
|
BaseParityInputs,
|
|
@@ -33,6 +34,7 @@ export function createProvingJobSourceServer(queue) {
|
|
|
33
34
|
}
|
|
34
35
|
export function createProvingJobSourceClient(url, namespace, fetch = makeFetch([1, 2, 3], false)) {
|
|
35
36
|
return createJsonRpcClient(url, {
|
|
37
|
+
AvmVerificationKeyData,
|
|
36
38
|
AvmCircuitInputs,
|
|
37
39
|
BaseOrMergeRollupPublicInputs,
|
|
38
40
|
BaseParityInputs,
|
|
@@ -76,4 +78,4 @@ export function createProverAgentRpcServer(agent) {
|
|
|
76
78
|
['start', 'stop', 'setCircuitProver', 'work', 'getProof']);
|
|
77
79
|
return rpc;
|
|
78
80
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLGdCQUFnQixFQUNoQixzQkFBc0IsRUFDdEIsWUFBWSxFQUNaLDZCQUE2QixFQUM3QixnQkFBZ0IsRUFDaEIsZ0JBQWdCLEVBQ2hCLHNCQUFzQixFQUN0QixpQ0FBaUMsRUFDakMscUJBQXFCLEVBQ3JCLFVBQVUsRUFDVixFQUFFLEVBQ0YsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLDJCQUEyQixFQUMzQixLQUFLLEVBQ0wsZ0NBQWdDLEVBQ2hDLCtCQUErQixFQUMvQixvQ0FBb0MsRUFDcEMsY0FBYyxFQUNkLGVBQWUsRUFDZixnQkFBZ0IsRUFDaEIsZ0JBQWdCLEVBQ2hCLHNCQUFzQixFQUN0QixVQUFVLEVBQ1YsbUJBQW1CLEdBQ3BCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLFNBQVMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsTUFBTSxVQUFVLDRCQUE0QixDQUFDLEtBQXVCO0lBQ2xFLE9BQU8sSUFBSSxhQUFhLENBQ3RCLEtBQUssRUFDTDtRQUNFLHNCQUFzQjtRQUN0QixnQkFBZ0I7UUFDaEIsNkJBQTZCO1FBQzdCLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsRUFBRTtRQUNGLE1BQU07UUFDTix5QkFBeUI7UUFDekIsaUJBQWlCO1FBQ2pCLGtCQUFrQjtRQUNsQixLQUFLO1FBQ0wsWUFBWTtRQUNaLDJCQUEyQjtRQUMzQixnQ0FBZ0M7UUFDaEMsK0JBQStCO1FBQy9CLG9DQUFvQztRQUNwQyxjQUFjO1FBQ2QsZUFBZTtRQUNmLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsc0JBQXNCO1FBQ3RCLFVBQVU7UUFDVixtQkFBbUI7UUFDbkIsaUNBQWlDO1FBQ2pDLHNCQUFzQjtRQUN0QixxQkFBcUI7S0FDdEIsRUFDRCxFQUFFLENBQ0gsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsNEJBQTRCLENBQzFDLEdBQVcsRUFDWCxTQUFrQixFQUNsQixLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFFbkMsT0FBTyxtQkFBbUIsQ0FDeEIsR0FBRyxFQUNIO1FBQ0Usc0JBQXNCO1FBQ3RCLGdCQUFnQjtRQUNoQiw2QkFBNkI7UUFDN0IsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixFQUFFO1FBQ0YsTUFBTTtRQUNOLHlCQUF5QjtRQUN6QixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLEtBQUs7UUFDTCxZQUFZO1FBQ1osMkJBQTJCO1FBQzNCLGdDQUFnQztRQUNoQywrQkFBK0I7UUFDL0Isb0NBQW9DO1FBQ3BDLGNBQWM7UUFDZCxlQUFlO1FBQ2YsZ0JBQWdCO1FBQ2hCLHNCQUFzQjtRQUN0QixnQkFBZ0I7UUFDaEIsVUFBVTtRQUNWLG1CQUFtQjtRQUNuQixpQ0FBaUM7UUFDakMsc0JBQXNCO1FBQ3RCLHFCQUFxQjtLQUN0QixFQUNELEVBQUUsRUFDRixLQUFLLEVBQ0wsU0FBUyxFQUNULEtBQUssQ0FDYyxDQUFDO0FBQ3hCLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLDBCQUEwQixDQUFDLEtBQWtCO0lBQzNELE1BQU0sR0FBRyxHQUFHLElBQUksYUFBYSxDQUMzQixLQUFLLEVBQ0w7UUFDRSxZQUFZO1FBQ1osVUFBVTtRQUNWLEVBQUU7UUFDRixNQUFNO0tBQ1AsRUFDRCxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQzFELENBQUM7SUFDRixPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMifQ==
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type PublicInputsAndRecursiveProof, type PublicInputsAndTubeProof, type ServerCircuitProver } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmVerificationKeyData, type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs, type KernelCircuitPublicInputs, type PublicKernelCircuitPublicInputs, RECURSIVE_PROOF_LENGTH, type RecursiveProof, type RootRollupPublicInputs, VerificationKeyData } from '@aztec/circuits.js';
|
|
3
|
+
export declare class MockProver implements ServerCircuitProver {
|
|
4
|
+
constructor();
|
|
5
|
+
getAvmProof(): Promise<{
|
|
6
|
+
proof: import("@aztec/circuits.js").Proof;
|
|
7
|
+
verificationKey: AvmVerificationKeyData;
|
|
8
|
+
}>;
|
|
9
|
+
getBaseParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<439>>;
|
|
10
|
+
getRootParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<439>>;
|
|
11
|
+
getBaseRollupProof(): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
12
|
+
getMergeRollupProof(): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
13
|
+
getBlockMergeRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
14
|
+
getBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
15
|
+
getEmptyPrivateKernelProof(): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
|
|
16
|
+
getEmptyTubeProof(): Promise<PublicInputsAndTubeProof<KernelCircuitPublicInputs>>;
|
|
17
|
+
getPublicKernelProof(): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>>;
|
|
18
|
+
getPublicTailProof(): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
|
|
19
|
+
getRootRollupProof(): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs>>;
|
|
20
|
+
getTubeProof(): Promise<{
|
|
21
|
+
tubeVK: VerificationKeyData;
|
|
22
|
+
tubeProof: RecursiveProof<typeof RECURSIVE_PROOF_LENGTH>;
|
|
23
|
+
}>;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=mock_prover.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mock_prover.d.ts","sourceRoot":"","sources":["../../src/test/mock_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,KAAK,yBAAyB,EAC9B,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,mBAAmB,EAGpB,MAAM,oBAAoB,CAAC;AAU5B,qBAAa,UAAW,YAAW,mBAAmB;;IAGpD,WAAW;;;;IASX,kBAAkB;IAIlB,kBAAkB;IAIlB,kBAAkB;IAUlB,mBAAmB,IAAI,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAU5F,wBAAwB;IAUxB,uBAAuB,IAAI,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAUpG,0BAA0B,IAAI,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAU/F,iBAAiB,IAAI,OAAO,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,CAAC;IAUjF,oBAAoB,IAAI,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAU/F,kBAAkB,IAAI,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAUvF,kBAAkB,IAAI,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IAUpF,YAAY,IAAI,OAAO,CAAC;QACtB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,SAAS,EAAE,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC;KAC1D,CAAC;CAMH"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { makePublicInputsAndRecursiveProof, } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmVerificationKeyData, RECURSIVE_PROOF_LENGTH, VerificationKeyData, makeEmptyProof, makeRecursiveProof, } from '@aztec/circuits.js';
|
|
3
|
+
import { makeBaseOrMergeRollupPublicInputs, makeBlockRootOrBlockMergeRollupPublicInputs, makeKernelCircuitPublicInputs, makePublicKernelCircuitPublicInputs, makeRootParityInput, makeRootRollupPublicInputs, } from '@aztec/circuits.js/testing';
|
|
4
|
+
export class MockProver {
|
|
5
|
+
constructor() { }
|
|
6
|
+
getAvmProof() {
|
|
7
|
+
return Promise.resolve(Promise.resolve({
|
|
8
|
+
proof: makeEmptyProof(),
|
|
9
|
+
verificationKey: AvmVerificationKeyData.makeFake(),
|
|
10
|
+
}));
|
|
11
|
+
}
|
|
12
|
+
getBaseParityProof() {
|
|
13
|
+
return Promise.resolve(makeRootParityInput(RECURSIVE_PROOF_LENGTH));
|
|
14
|
+
}
|
|
15
|
+
getRootParityProof() {
|
|
16
|
+
return Promise.resolve(makeRootParityInput(RECURSIVE_PROOF_LENGTH));
|
|
17
|
+
}
|
|
18
|
+
getBaseRollupProof() {
|
|
19
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBaseOrMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
20
|
+
}
|
|
21
|
+
getMergeRollupProof() {
|
|
22
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBaseOrMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
23
|
+
}
|
|
24
|
+
getBlockMergeRollupProof() {
|
|
25
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
26
|
+
}
|
|
27
|
+
getBlockRootRollupProof() {
|
|
28
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
29
|
+
}
|
|
30
|
+
getEmptyPrivateKernelProof() {
|
|
31
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeKernelCircuitPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
32
|
+
}
|
|
33
|
+
getEmptyTubeProof() {
|
|
34
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeKernelCircuitPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
35
|
+
}
|
|
36
|
+
getPublicKernelProof() {
|
|
37
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makePublicKernelCircuitPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
38
|
+
}
|
|
39
|
+
getPublicTailProof() {
|
|
40
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeKernelCircuitPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
41
|
+
}
|
|
42
|
+
getRootRollupProof() {
|
|
43
|
+
return Promise.resolve(makePublicInputsAndRecursiveProof(makeRootRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
44
|
+
}
|
|
45
|
+
getTubeProof() {
|
|
46
|
+
return Promise.resolve({
|
|
47
|
+
tubeVK: VerificationKeyData.makeFake(),
|
|
48
|
+
tubeProof: makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19wcm92ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwsaUNBQWlDLEdBQ2xDLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUNMLHNCQUFzQixFQUt0QixzQkFBc0IsRUFHdEIsbUJBQW1CLEVBQ25CLGNBQWMsRUFDZCxrQkFBa0IsR0FDbkIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQ0wsaUNBQWlDLEVBQ2pDLDJDQUEyQyxFQUMzQyw2QkFBNkIsRUFDN0IsbUNBQW1DLEVBQ25DLG1CQUFtQixFQUNuQiwwQkFBMEIsR0FDM0IsTUFBTSw0QkFBNEIsQ0FBQztBQUVwQyxNQUFNLE9BQU8sVUFBVTtJQUNyQixnQkFBZSxDQUFDO0lBRWhCLFdBQVc7UUFDVCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUM7WUFDZCxLQUFLLEVBQUUsY0FBYyxFQUFFO1lBQ3ZCLGVBQWUsRUFBRSxzQkFBc0IsQ0FBQyxRQUFRLEVBQUU7U0FDbkQsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRUQsa0JBQWtCO1FBQ2hCLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDLENBQUM7SUFDdEUsQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFRCxrQkFBa0I7UUFDaEIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixpQ0FBaUMsQ0FDL0IsaUNBQWlDLEVBQUUsRUFDbkMsa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsRUFDMUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQy9CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxtQkFBbUI7UUFDakIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixpQ0FBaUMsQ0FDL0IsaUNBQWlDLEVBQUUsRUFDbkMsa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsRUFDMUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQy9CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCx3QkFBd0I7UUFDdEIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixpQ0FBaUMsQ0FDL0IsMkNBQTJDLEVBQUUsRUFDN0Msa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsRUFDMUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQy9CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCx1QkFBdUI7UUFDckIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixpQ0FBaUMsQ0FDL0IsMkNBQTJDLEVBQUUsRUFDN0Msa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsRUFDMUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQy9CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCwwQkFBMEI7UUFDeEIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixpQ0FBaUMsQ0FDL0IsNkJBQTZCLEVBQUUsRUFDL0Isa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsRUFDMUMsbUJBQW1CLENBQUMsUUFBUSxFQUFFLENBQy9CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxpQkFBaUI7UUFDZixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLGlDQUFpQyxDQUMvQiw2QkFBNkIsRUFBRSxFQUMvQixrQkFBa0IsQ0FBQyxzQkFBc0IsQ0FBQyxFQUMxQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsQ0FDL0IsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELG9CQUFvQjtRQUNsQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLGlDQUFpQyxDQUMvQixtQ0FBbUMsRUFBRSxFQUNyQyxrQkFBa0IsQ0FBQyxzQkFBc0IsQ0FBQyxFQUMxQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsQ0FDL0IsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLGlDQUFpQyxDQUMvQiw2QkFBNkIsRUFBRSxFQUMvQixrQkFBa0IsQ0FBQyxzQkFBc0IsQ0FBQyxFQUMxQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsQ0FDL0IsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLGlDQUFpQyxDQUMvQiwwQkFBMEIsRUFBRSxFQUM1QixrQkFBa0IsQ0FBQyxzQkFBc0IsQ0FBQyxFQUMxQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsQ0FDL0IsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELFlBQVk7UUFJVixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUM7WUFDckIsTUFBTSxFQUFFLG1CQUFtQixDQUFDLFFBQVEsRUFBRTtZQUN0QyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsc0JBQXNCLENBQUM7U0FDdEQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.55.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -59,15 +59,15 @@
|
|
|
59
59
|
]
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@aztec/bb-prover": "0.
|
|
63
|
-
"@aztec/circuit-types": "0.
|
|
64
|
-
"@aztec/circuits.js": "0.
|
|
65
|
-
"@aztec/foundation": "0.
|
|
66
|
-
"@aztec/kv-store": "0.
|
|
67
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
68
|
-
"@aztec/simulator": "0.
|
|
69
|
-
"@aztec/telemetry-client": "0.
|
|
70
|
-
"@aztec/world-state": "0.
|
|
62
|
+
"@aztec/bb-prover": "0.55.1",
|
|
63
|
+
"@aztec/circuit-types": "0.55.1",
|
|
64
|
+
"@aztec/circuits.js": "0.55.1",
|
|
65
|
+
"@aztec/foundation": "0.55.1",
|
|
66
|
+
"@aztec/kv-store": "0.55.1",
|
|
67
|
+
"@aztec/noir-protocol-circuits-types": "0.55.1",
|
|
68
|
+
"@aztec/simulator": "0.55.1",
|
|
69
|
+
"@aztec/telemetry-client": "0.55.1",
|
|
70
|
+
"@aztec/world-state": "0.55.1",
|
|
71
71
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
72
72
|
"commander": "^12.1.0",
|
|
73
73
|
"lodash.chunk": "^4.2.0",
|
|
@@ -80,6 +80,7 @@
|
|
|
80
80
|
"@types/memdown": "^3.0.0",
|
|
81
81
|
"@types/node": "^18.7.23",
|
|
82
82
|
"@types/source-map-support": "^0.5.10",
|
|
83
|
+
"get-port": "^7.1.0",
|
|
83
84
|
"jest": "^29.5.0",
|
|
84
85
|
"jest-mock-extended": "^3.0.3",
|
|
85
86
|
"ts-node": "^10.9.1",
|
|
@@ -25,9 +25,12 @@ import {
|
|
|
25
25
|
} from '@aztec/simulator';
|
|
26
26
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
27
27
|
import { MerkleTrees } from '@aztec/world-state';
|
|
28
|
+
import { NativeWorldStateService } from '@aztec/world-state/native';
|
|
28
29
|
|
|
29
30
|
import * as fs from 'fs/promises';
|
|
30
31
|
import { type MockProxy, mock } from 'jest-mock-extended';
|
|
32
|
+
import { tmpdir } from 'os';
|
|
33
|
+
import { join } from 'path';
|
|
31
34
|
|
|
32
35
|
import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
|
|
33
36
|
import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
|
|
@@ -58,11 +61,13 @@ export class TestContext {
|
|
|
58
61
|
|
|
59
62
|
static async new(
|
|
60
63
|
logger: DebugLogger,
|
|
64
|
+
worldState: 'native' | 'legacy' = 'legacy',
|
|
61
65
|
proverCount = 4,
|
|
62
66
|
createProver: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver> = _ =>
|
|
63
67
|
Promise.resolve(new TestCircuitProver(new NoopTelemetryClient(), new WASMSimulator())),
|
|
64
68
|
blockNumber = 3,
|
|
65
69
|
) {
|
|
70
|
+
const directoriesToCleanup: string[] = [];
|
|
66
71
|
const globalVariables = makeGlobals(blockNumber);
|
|
67
72
|
|
|
68
73
|
const publicExecutor = mock<PublicExecutor>();
|
|
@@ -70,7 +75,19 @@ export class TestContext {
|
|
|
70
75
|
const publicWorldStateDB = mock<WorldStatePublicDB>();
|
|
71
76
|
const publicKernel = new RealPublicKernelCircuitSimulator(new WASMSimulator());
|
|
72
77
|
const telemetry = new NoopTelemetryClient();
|
|
73
|
-
|
|
78
|
+
|
|
79
|
+
let actualDb: MerkleTreeAdminOperations;
|
|
80
|
+
|
|
81
|
+
if (worldState === 'native') {
|
|
82
|
+
const dir = await fs.mkdtemp(join(tmpdir(), 'prover-client-world-state-'));
|
|
83
|
+
directoriesToCleanup.push(dir);
|
|
84
|
+
const ws = await NativeWorldStateService.create(dir);
|
|
85
|
+
actualDb = ws.asLatest();
|
|
86
|
+
} else {
|
|
87
|
+
const ws = await MerkleTrees.new(openTmpStore(), telemetry);
|
|
88
|
+
actualDb = ws.asLatest();
|
|
89
|
+
}
|
|
90
|
+
|
|
74
91
|
const processor = new PublicProcessor(
|
|
75
92
|
actualDb,
|
|
76
93
|
publicExecutor,
|
|
@@ -100,6 +117,10 @@ export class TestContext {
|
|
|
100
117
|
localProver = await createProver(bbConfig);
|
|
101
118
|
}
|
|
102
119
|
|
|
120
|
+
if (config?.directoryToCleanup) {
|
|
121
|
+
directoriesToCleanup.push(config.directoryToCleanup);
|
|
122
|
+
}
|
|
123
|
+
|
|
103
124
|
const queue = new MemoryProvingQueue(telemetry);
|
|
104
125
|
const orchestrator = new ProvingOrchestrator(actualDb, queue, telemetry);
|
|
105
126
|
const agent = new ProverAgent(localProver, proverCount);
|
|
@@ -119,7 +140,7 @@ export class TestContext {
|
|
|
119
140
|
agent,
|
|
120
141
|
orchestrator,
|
|
121
142
|
blockNumber,
|
|
122
|
-
|
|
143
|
+
directoriesToCleanup,
|
|
123
144
|
logger,
|
|
124
145
|
);
|
|
125
146
|
}
|
|
@@ -598,7 +598,7 @@ export class ProvingOrchestrator implements BlockProver {
|
|
|
598
598
|
return;
|
|
599
599
|
}
|
|
600
600
|
|
|
601
|
-
logger.error(`Error thrown when proving job
|
|
601
|
+
logger.error(`Error thrown when proving job`, err);
|
|
602
602
|
provingState!.reject(`${err}`);
|
|
603
603
|
} finally {
|
|
604
604
|
const index = this.pendingProvingJobs.indexOf(controller);
|
package/src/prover-agent/rpc.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type ProvingJobSource } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
3
|
AvmCircuitInputs,
|
|
4
|
+
AvmVerificationKeyData,
|
|
4
5
|
AztecAddress,
|
|
5
6
|
BaseOrMergeRollupPublicInputs,
|
|
6
7
|
BaseParityInputs,
|
|
@@ -37,6 +38,7 @@ export function createProvingJobSourceServer(queue: ProvingJobSource): JsonRpcSe
|
|
|
37
38
|
return new JsonRpcServer(
|
|
38
39
|
queue,
|
|
39
40
|
{
|
|
41
|
+
AvmVerificationKeyData,
|
|
40
42
|
AvmCircuitInputs,
|
|
41
43
|
BaseOrMergeRollupPublicInputs,
|
|
42
44
|
BaseParityInputs,
|
|
@@ -75,6 +77,7 @@ export function createProvingJobSourceClient(
|
|
|
75
77
|
return createJsonRpcClient(
|
|
76
78
|
url,
|
|
77
79
|
{
|
|
80
|
+
AvmVerificationKeyData,
|
|
78
81
|
AvmCircuitInputs,
|
|
79
82
|
BaseOrMergeRollupPublicInputs,
|
|
80
83
|
BaseParityInputs,
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type PublicInputsAndRecursiveProof,
|
|
3
|
+
type PublicInputsAndTubeProof,
|
|
4
|
+
type ServerCircuitProver,
|
|
5
|
+
makePublicInputsAndRecursiveProof,
|
|
6
|
+
} from '@aztec/circuit-types';
|
|
7
|
+
import {
|
|
8
|
+
AvmVerificationKeyData,
|
|
9
|
+
type BaseOrMergeRollupPublicInputs,
|
|
10
|
+
type BlockRootOrBlockMergePublicInputs,
|
|
11
|
+
type KernelCircuitPublicInputs,
|
|
12
|
+
type PublicKernelCircuitPublicInputs,
|
|
13
|
+
RECURSIVE_PROOF_LENGTH,
|
|
14
|
+
type RecursiveProof,
|
|
15
|
+
type RootRollupPublicInputs,
|
|
16
|
+
VerificationKeyData,
|
|
17
|
+
makeEmptyProof,
|
|
18
|
+
makeRecursiveProof,
|
|
19
|
+
} from '@aztec/circuits.js';
|
|
20
|
+
import {
|
|
21
|
+
makeBaseOrMergeRollupPublicInputs,
|
|
22
|
+
makeBlockRootOrBlockMergeRollupPublicInputs,
|
|
23
|
+
makeKernelCircuitPublicInputs,
|
|
24
|
+
makePublicKernelCircuitPublicInputs,
|
|
25
|
+
makeRootParityInput,
|
|
26
|
+
makeRootRollupPublicInputs,
|
|
27
|
+
} from '@aztec/circuits.js/testing';
|
|
28
|
+
|
|
29
|
+
export class MockProver implements ServerCircuitProver {
|
|
30
|
+
constructor() {}
|
|
31
|
+
|
|
32
|
+
getAvmProof() {
|
|
33
|
+
return Promise.resolve(
|
|
34
|
+
Promise.resolve({
|
|
35
|
+
proof: makeEmptyProof(),
|
|
36
|
+
verificationKey: AvmVerificationKeyData.makeFake(),
|
|
37
|
+
}),
|
|
38
|
+
);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
getBaseParityProof() {
|
|
42
|
+
return Promise.resolve(makeRootParityInput(RECURSIVE_PROOF_LENGTH));
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
getRootParityProof() {
|
|
46
|
+
return Promise.resolve(makeRootParityInput(RECURSIVE_PROOF_LENGTH));
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
getBaseRollupProof() {
|
|
50
|
+
return Promise.resolve(
|
|
51
|
+
makePublicInputsAndRecursiveProof(
|
|
52
|
+
makeBaseOrMergeRollupPublicInputs(),
|
|
53
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
54
|
+
VerificationKeyData.makeFake(),
|
|
55
|
+
),
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
getMergeRollupProof(): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>> {
|
|
60
|
+
return Promise.resolve(
|
|
61
|
+
makePublicInputsAndRecursiveProof(
|
|
62
|
+
makeBaseOrMergeRollupPublicInputs(),
|
|
63
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
64
|
+
VerificationKeyData.makeFake(),
|
|
65
|
+
),
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
getBlockMergeRollupProof() {
|
|
70
|
+
return Promise.resolve(
|
|
71
|
+
makePublicInputsAndRecursiveProof(
|
|
72
|
+
makeBlockRootOrBlockMergeRollupPublicInputs(),
|
|
73
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
74
|
+
VerificationKeyData.makeFake(),
|
|
75
|
+
),
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
getBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
|
|
80
|
+
return Promise.resolve(
|
|
81
|
+
makePublicInputsAndRecursiveProof(
|
|
82
|
+
makeBlockRootOrBlockMergeRollupPublicInputs(),
|
|
83
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
84
|
+
VerificationKeyData.makeFake(),
|
|
85
|
+
),
|
|
86
|
+
);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
getEmptyPrivateKernelProof(): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
|
|
90
|
+
return Promise.resolve(
|
|
91
|
+
makePublicInputsAndRecursiveProof(
|
|
92
|
+
makeKernelCircuitPublicInputs(),
|
|
93
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
94
|
+
VerificationKeyData.makeFake(),
|
|
95
|
+
),
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
getEmptyTubeProof(): Promise<PublicInputsAndTubeProof<KernelCircuitPublicInputs>> {
|
|
100
|
+
return Promise.resolve(
|
|
101
|
+
makePublicInputsAndRecursiveProof(
|
|
102
|
+
makeKernelCircuitPublicInputs(),
|
|
103
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
104
|
+
VerificationKeyData.makeFake(),
|
|
105
|
+
),
|
|
106
|
+
);
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
getPublicKernelProof(): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
|
|
110
|
+
return Promise.resolve(
|
|
111
|
+
makePublicInputsAndRecursiveProof(
|
|
112
|
+
makePublicKernelCircuitPublicInputs(),
|
|
113
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
114
|
+
VerificationKeyData.makeFake(),
|
|
115
|
+
),
|
|
116
|
+
);
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
getPublicTailProof(): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
|
|
120
|
+
return Promise.resolve(
|
|
121
|
+
makePublicInputsAndRecursiveProof(
|
|
122
|
+
makeKernelCircuitPublicInputs(),
|
|
123
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
124
|
+
VerificationKeyData.makeFake(),
|
|
125
|
+
),
|
|
126
|
+
);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
getRootRollupProof(): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs>> {
|
|
130
|
+
return Promise.resolve(
|
|
131
|
+
makePublicInputsAndRecursiveProof(
|
|
132
|
+
makeRootRollupPublicInputs(),
|
|
133
|
+
makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
134
|
+
VerificationKeyData.makeFake(),
|
|
135
|
+
),
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
getTubeProof(): Promise<{
|
|
140
|
+
tubeVK: VerificationKeyData;
|
|
141
|
+
tubeProof: RecursiveProof<typeof RECURSIVE_PROOF_LENGTH>;
|
|
142
|
+
}> {
|
|
143
|
+
return Promise.resolve({
|
|
144
|
+
tubeVK: VerificationKeyData.makeFake(),
|
|
145
|
+
tubeProof: makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|