@aztec/prover-client 0.71.0 → 0.72.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/config.js +2 -2
- package/dest/mocks/test_context.d.ts +2 -1
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +6 -3
- package/dest/orchestrator/block-proving-state.d.ts +9 -10
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +70 -52
- package/dest/orchestrator/epoch-proving-state.d.ts +5 -5
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +8 -29
- package/dest/orchestrator/orchestrator.d.ts +3 -2
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +20 -33
- package/dest/prover-agent/rpc.d.ts +1 -1
- package/dest/prover-agent/rpc.d.ts.map +1 -1
- package/dest/prover-agent/rpc.js +6 -6
- package/dest/prover-client/server-epoch-prover.d.ts +1 -1
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +3 -3
- package/dest/proving_broker/rpc.d.ts +3 -3
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +7 -7
- package/dest/test/mock_prover.d.ts +1 -1
- package/package.json +11 -11
- package/src/config.ts +1 -1
- package/src/mocks/test_context.ts +5 -2
- package/src/orchestrator/block-proving-state.ts +81 -57
- package/src/orchestrator/epoch-proving-state.ts +16 -45
- package/src/orchestrator/orchestrator.ts +38 -64
- package/src/prover-agent/rpc.ts +5 -5
- package/src/prover-client/server-epoch-prover.ts +6 -2
- package/src/proving_broker/rpc.ts +13 -6
package/dest/config.js
CHANGED
|
@@ -12,7 +12,7 @@ export const bbConfigMappings = {
|
|
|
12
12
|
},
|
|
13
13
|
bbWorkingDirectory: {
|
|
14
14
|
env: 'BB_WORKING_DIRECTORY',
|
|
15
|
-
description: 'The working directory to for proving',
|
|
15
|
+
description: 'The working directory to use for proving',
|
|
16
16
|
},
|
|
17
17
|
bbBinaryPath: {
|
|
18
18
|
env: 'BB_BINARY_PATH',
|
|
@@ -38,4 +38,4 @@ export const proverClientConfigMappings = {
|
|
|
38
38
|
export function getProverEnvVars() {
|
|
39
39
|
return getConfigFromMappings(proverClientConfigMappings);
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQXFCLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDL0UsT0FBTyxFQUEyQixtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRS9HLE9BQU8sRUFHTCx5QkFBeUIsRUFDekIsMEJBQTBCLEdBQzNCLE1BQU0sNEJBQTRCLENBQUM7QUFPcEMsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQThDO0lBQ3pFLG9CQUFvQixFQUFFO1FBQ3BCLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLHFEQUFxRDtLQUNuRTtJQUNELGNBQWMsRUFBRTtRQUNkLEdBQUcsRUFBRSxrQkFBa0I7UUFDdkIsV0FBVyxFQUFFLDZCQUE2QjtLQUMzQztJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSxzQkFBc0I7UUFDM0IsV0FBVyxFQUFFLDBDQUEwQztLQUN4RDtJQUNELFlBQVksRUFBRTtRQUNaLEdBQUcsRUFBRSxnQkFBZ0I7UUFDckIsV0FBVyxFQUFFLDJCQUEyQjtLQUN6QztJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSxpQkFBaUI7UUFDdEIsV0FBVyxFQUFFLCtDQUErQztRQUM1RCxHQUFHLG1CQUFtQixDQUFDLEtBQUssQ0FBQztLQUM5QjtDQUNGLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBMkM7SUFDaEYsR0FBRyxnQkFBZ0I7SUFDbkIsR0FBRyxvQkFBb0I7SUFDdkIsR0FBRyx5QkFBeUI7SUFDNUIsR0FBRywwQkFBMEI7Q0FDOUIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCO0lBQzlCLE9BQU8scUJBQXFCLENBQXFCLDBCQUEwQixDQUFDLENBQUM7QUFDL0UsQ0FBQyJ9
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type BBProverConfig } from '@aztec/bb-prover';
|
|
2
2
|
import { type L2Block, type ProcessedTx, type ServerCircuitProver, type Tx } from '@aztec/circuit-types';
|
|
3
3
|
import { makeBloatedProcessedTx } from '@aztec/circuit-types/test';
|
|
4
|
-
import { type AppendOnlyTreeSnapshot, BlockHeader, type GlobalVariables } from '@aztec/circuits.js';
|
|
4
|
+
import { type AppendOnlyTreeSnapshot, type BlockHeader, type GlobalVariables } from '@aztec/circuits.js';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { type Logger } from '@aztec/foundation/log';
|
|
7
7
|
import { PublicProcessor, PublicTxSimulator, type SimulationProvider } from '@aztec/simulator/server';
|
|
@@ -27,6 +27,7 @@ export declare class TestContext {
|
|
|
27
27
|
getFork(): Promise<import("@aztec/circuit-types").MerkleTreeWriteOperations>;
|
|
28
28
|
getBlockHeader(blockNumber: 0): BlockHeader;
|
|
29
29
|
getBlockHeader(blockNumber: number): BlockHeader | undefined;
|
|
30
|
+
getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
|
|
30
31
|
cleanup(): Promise<void>;
|
|
31
32
|
makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): ProcessedTx;
|
|
32
33
|
makeProcessedTx(seed?: number): ProcessedTx;
|
|
@@ -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,OAAO,EACZ,KAAK,WAAW,EAEhB,KAAK,mBAAmB,EACxB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EACL,KAAK,sBAAsB,EAC3B,WAAW,
|
|
1
|
+
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { makeBloatedProcessedTx } from '@aztec/circuit-types/test';
|
|
2
|
-
import {
|
|
2
|
+
import { TreeSnapshots, } from '@aztec/circuits.js';
|
|
3
3
|
import { times } from '@aztec/foundation/collection';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { TestDateProvider } from '@aztec/foundation/timer';
|
|
@@ -45,7 +45,7 @@ export class TestContext {
|
|
|
45
45
|
const publicDb = await ws.fork();
|
|
46
46
|
worldStateDB.getMerkleInterface.mockReturnValue(publicDb);
|
|
47
47
|
const publicTxSimulator = new PublicTxSimulator(publicDb, worldStateDB, globalVariables, true);
|
|
48
|
-
const processor = new PublicProcessor(publicDb, globalVariables,
|
|
48
|
+
const processor = new PublicProcessor(publicDb, globalVariables, worldStateDB, publicTxSimulator, new TestDateProvider());
|
|
49
49
|
let localProver;
|
|
50
50
|
const config = await getEnvironmentConfig(logger);
|
|
51
51
|
const simulationProvider = await getSimulationProvider({
|
|
@@ -81,6 +81,9 @@ export class TestContext {
|
|
|
81
81
|
getBlockHeader(blockNumber = 0) {
|
|
82
82
|
return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
|
|
83
83
|
}
|
|
84
|
+
getPreviousBlockHeader(currentBlockNumber = this.blockNumber) {
|
|
85
|
+
return this.getBlockHeader(currentBlockNumber - 1);
|
|
86
|
+
}
|
|
84
87
|
async cleanup() {
|
|
85
88
|
await this.proverAgent.stop();
|
|
86
89
|
for (const dir of this.directoriesToCleanup.filter(x => x !== '')) {
|
|
@@ -161,4 +164,4 @@ class TestProvingOrchestrator extends ProvingOrchestrator {
|
|
|
161
164
|
return Promise.resolve();
|
|
162
165
|
}
|
|
163
166
|
}
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_context.js","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAKL,aAAa,GACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EACL,eAAe,EACf,iBAAiB,EAEjB,sBAAsB,GAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAEhG,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAErH,MAAM,OAAO,WAAW;IAGtB,YACS,iBAAoC,EACpC,UAAmC,EACnC,eAAgC,EAChC,kBAAsC,EACtC,eAAgC,EAChC,MAA2B,EAC3B,WAAwB,EACxB,YAAqC,EACrC,WAAmB,EACnB,oBAA8B,EAC9B,MAAc;QAVd,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,eAAU,GAAV,UAAU,CAAyB;QACnC,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAqB;QAC3B,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAyB;QACrC,gBAAW,GAAX,WAAW,CAAQ;QACnB,yBAAoB,GAApB,oBAAoB,CAAU;QAC9B,WAAM,GAAN,MAAM,CAAQ;QAbf,YAAO,GAA6B,IAAI,GAAG,EAAE,CAAC;IAcnD,CAAC;IAEJ,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,CACd,MAAc,EACd,WAAW,GAAG,CAAC,EACf,eAA2E,CAAC,CAAC,EAAE,CAC7E,OAAO,CAAC,OAAO,CAAC,IAAI,iBAAiB,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC,EACtE,WAAW,GAAG,CAAC;QAEf,MAAM,oBAAoB,GAAa,EAAE,CAAC;QAC1C,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;QAEjD,MAAM,YAAY,GAAG,IAAI,EAAgB,CAAC;QAE1C,mFAAmF;QACnF,MAAM,EAAE,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAEjC,YAAY,CAAC,kBAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE1D,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAC/F,MAAM,SAAS,GAAG,IAAI,eAAe,CACnC,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,IAAI,gBAAgB,EAAE,CACvB,CAAC;QAEF,IAAI,WAAgC,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC;YACrD,oBAAoB,EAAE,MAAM,EAAE,oBAAoB;YAClD,cAAc,EAAE,MAAM,EAAE,gBAAgB;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,WAAW,GAAG,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAmB;gBAC/B,cAAc,EAAE,MAAM,CAAC,gBAAgB;gBACvC,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;gBACjD,YAAY,EAAE,MAAM,CAAC,cAAc;gBACnC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,aAAa,EAAE,MAAM,CAAC,aAAa;aACpC,CAAC;YACF,WAAW,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,MAAM,EAAE,kBAAkB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YACxD,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAEnE,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,IAAI,IAAI,CACb,iBAAiB,EACjB,EAAE,EACF,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,KAAK,EACL,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,MAAM,CACP,CAAC;IACJ,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAIM,cAAc,CAAC,WAAW,GAAG,CAAC;QACnC,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC/G,CAAC;IAEM,sBAAsB,CAAC,kBAAkB,GAAG,IAAI,CAAC,WAAW;QACjE,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,GAAG,CAAC,CAAE,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;YAClE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAIM,eAAe,CAAC,UAAkE;QACvF,MAAM,IAAI,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QAChF,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACxF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACjD,OAAO,sBAAsB,CAAC;YAC5B,MAAM;YACN,UAAU,EAAE,aAAa,EAAE;YAC3B,wBAAwB;YACxB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC;IAED,8EAA8E;IACvE,KAAK,CAAC,gBAAgB,CAC3B,MAAc,EACd,UAAkB,CAAC,EACnB,oBAA8C,IAAI,CAAC,eAAe,EAClE,sBAAgG,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;QAE1G,MAAM,eAAe,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACnH,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAC5B,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,QAAQ,GAAG,IAAI,EAAE,eAAe,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAChG,CAAC;QACF,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAEhC,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC5D,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAS,EAAE,eAAuB;QACpE,MAAM,6BAA6B,GAAG,CACpC,aAAyC,EACzC,gBAAwC,EACxC,YAAiB,EACjB,eAAmB,EACnB,OAAe,EACf,EAAE;YACF,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;gBACrB,MAAM,QAAQ,GAAG,EAAE,CAAC,0BAA0B,CAAC,OAAO,EAAE;oBACtD,CAAC,CAAC,EAAE,CAAC,2BAA2B;oBAChC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,2BAA2B,EAAE,EAAE,CAAC,0BAA0B,CAAC,CAAC;gBACvE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;oBAC/B,IAAI,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC7D,OAAO,OAAO,CAAC,OAAO,CACpB,IAAI,sBAAsB,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE,YAAY,CAAC,YAAY,CAAC,CAC3F,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,gBAAgB,EAAE,CAAC,CAAC;QACvE,CAAC,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,oDAAoD,CACpE,GAAG,EACH,eAAe,EACf,6BAA6B,CAC9B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,GAAkB;QAC7C,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACxC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,0BAA0B,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACpD,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC;gBACzB,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,aAAa,CACrE,cAAc,CAAC,iBAAiB,EAChC,cAAc,CAAC,OAAO,CAAC,YAAY,EACnC,cAAc,CAAC,OAAO,CAAC,aAAa,EACpC,cAAc,CAAC,OAAO,CAAC,cAAc,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oDAAoD,CAChE,GAAS,EACT,eAAuB,EACvB,YAMoC;QAEpC,yFAAyF;QACzF,MAAM,gBAAgB,GAQlB,IAAI,CAAC,KAAK,CACZ,IAAI,CAAC,iBAEJ,EACD,8BAA8B,CAC/B,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,gBAAgB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IACtE,CAAC;CACF;AAED,MAAM,uBAAwB,SAAQ,mBAAmB;IAAzD;;QACS,gDAA2C,GAAG,KAAK,CAAC;IAa7D,CAAC;IAXC,kGAAkG;IAClG,+GAA+G;IAC5F,kCAAkC,CACnD,OAAgB,EAChB,UAAkC;QAElC,IAAI,IAAI,CAAC,2CAA2C,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC,kCAAkC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type L2Block, type MerkleTreeId, type PublicInputsAndRecursiveProof } from '@aztec/circuit-types';
|
|
2
|
-
import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, type
|
|
2
|
+
import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, type ParityPublicInputs, RootParityInputs } from '@aztec/circuits.js';
|
|
3
3
|
import { SpongeBlob } from '@aztec/circuits.js/blobs';
|
|
4
4
|
import { type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EmptyBlockRootRollupInputs, MergeRollupInputs, SingleTxBlockRootRollupInputs } from '@aztec/circuits.js/rollup';
|
|
5
5
|
import { type Logger } from '@aztec/foundation/log';
|
|
@@ -16,14 +16,12 @@ export declare class BlockProvingState {
|
|
|
16
16
|
#private;
|
|
17
17
|
readonly index: number;
|
|
18
18
|
readonly globalVariables: GlobalVariables;
|
|
19
|
-
readonly newL1ToL2Messages:
|
|
20
|
-
private readonly
|
|
21
|
-
private readonly
|
|
22
|
-
private readonly
|
|
23
|
-
private readonly
|
|
24
|
-
private readonly archiveTreeRootSiblingPath;
|
|
19
|
+
readonly newL1ToL2Messages: Fr[];
|
|
20
|
+
private readonly l1ToL2MessageSubtreeSiblingPath;
|
|
21
|
+
private readonly l1ToL2MessageTreeSnapshotAfterInsertion;
|
|
22
|
+
private readonly lastArchiveSnapshot;
|
|
23
|
+
private readonly newArchiveSiblingPath;
|
|
25
24
|
private readonly previousBlockHeader;
|
|
26
|
-
private readonly previousBlockHash;
|
|
27
25
|
private readonly parentEpoch;
|
|
28
26
|
private baseOrMergeProvingOutputs;
|
|
29
27
|
private baseParityProvingOutputs;
|
|
@@ -35,7 +33,7 @@ export declare class BlockProvingState {
|
|
|
35
33
|
totalNumTxs: number;
|
|
36
34
|
private txs;
|
|
37
35
|
error: string | undefined;
|
|
38
|
-
constructor(index: number, globalVariables: GlobalVariables, newL1ToL2Messages:
|
|
36
|
+
constructor(index: number, globalVariables: GlobalVariables, newL1ToL2Messages: Fr[], l1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, l1ToL2MessageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, lastArchiveSnapshot: AppendOnlyTreeSnapshot, newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHeader: BlockHeader, parentEpoch: EpochProvingState);
|
|
39
37
|
get blockNumber(): number;
|
|
40
38
|
startNewBlock(numTxs: number, numBlobFields: number): void;
|
|
41
39
|
addNewTx(tx: TxProvingState): number;
|
|
@@ -59,13 +57,14 @@ export declare class BlockProvingState {
|
|
|
59
57
|
rollupType: string;
|
|
60
58
|
inputs: BlockRootRollupInputs;
|
|
61
59
|
};
|
|
60
|
+
getPaddingBlockRootInputs(proverId: Fr): EmptyBlockRootRollupInputs;
|
|
62
61
|
getRootParityInputs(): RootParityInputs;
|
|
63
|
-
getL1ToL2Roots(): RootParityInput<459>;
|
|
64
62
|
getTxProvingState(txIndex: number): TxProvingState;
|
|
65
63
|
buildHeaderFromProvingOutputs(logger?: Logger): BlockHeader;
|
|
66
64
|
isReadyForMergeRollup(location: TreeNodeLocation): boolean;
|
|
67
65
|
isReadyForBlockRootRollup(): boolean;
|
|
68
66
|
isReadyForRootParity(): boolean;
|
|
67
|
+
isComplete(): boolean;
|
|
69
68
|
verifyState(): boolean;
|
|
70
69
|
reject(reason: string): void;
|
|
71
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE3G,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAE3B,KAAK,WAAW,EAEhB,EAAE,EACF,KAAK,eAAe,EACpB,KAAK,wCAAwC,EAE7C,KAAK,yCAAyC,
|
|
1
|
+
{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
var _BlockProvingState_instances,
|
|
1
|
+
var _BlockProvingState_instances, _BlockProvingState_getBlockRootRollupData, _BlockProvingState_getBlockRootRollupBlobData, _BlockProvingState_getChildProofsForBlockRoot, _BlockProvingState_getPreviousRollupData, _BlockProvingState_getRootParityData;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, Fr, MembershipWitness, NUM_BASE_PARITY_PER_ROOT_PARITY, RootParityInput, RootParityInputs, StateReference, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
|
|
4
4
|
import { SpongeBlob } from '@aztec/circuits.js/blobs';
|
|
5
|
-
import { BlockRootRollupData, BlockRootRollupInputs, ConstantRollupData, EmptyBlockRootRollupInputs, MergeRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs, } from '@aztec/circuits.js/rollup';
|
|
5
|
+
import { BlockRootRollupBlobData, BlockRootRollupData, BlockRootRollupInputs, ConstantRollupData, EmptyBlockRootRollupInputs, MergeRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs, } from '@aztec/circuits.js/rollup';
|
|
6
6
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
7
7
|
import { UnbalancedTreeStore } from '@aztec/foundation/trees';
|
|
8
8
|
import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
|
|
@@ -13,18 +13,16 @@ import { buildBlobHints, buildHeaderFromCircuitOutputs } from './block-building-
|
|
|
13
13
|
* Contains the raw inputs and intermediate state to generate every constituent proof in the tree.
|
|
14
14
|
*/
|
|
15
15
|
export class BlockProvingState {
|
|
16
|
-
constructor(index, globalVariables, newL1ToL2Messages,
|
|
16
|
+
constructor(index, globalVariables, newL1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, newArchiveSiblingPath, previousBlockHeader, parentEpoch) {
|
|
17
17
|
_BlockProvingState_instances.add(this);
|
|
18
18
|
this.index = index;
|
|
19
19
|
this.globalVariables = globalVariables;
|
|
20
20
|
this.newL1ToL2Messages = newL1ToL2Messages;
|
|
21
|
-
this.
|
|
22
|
-
this.
|
|
23
|
-
this.
|
|
24
|
-
this.
|
|
25
|
-
this.archiveTreeRootSiblingPath = archiveTreeRootSiblingPath;
|
|
21
|
+
this.l1ToL2MessageSubtreeSiblingPath = l1ToL2MessageSubtreeSiblingPath;
|
|
22
|
+
this.l1ToL2MessageTreeSnapshotAfterInsertion = l1ToL2MessageTreeSnapshotAfterInsertion;
|
|
23
|
+
this.lastArchiveSnapshot = lastArchiveSnapshot;
|
|
24
|
+
this.newArchiveSiblingPath = newArchiveSiblingPath;
|
|
26
25
|
this.previousBlockHeader = previousBlockHeader;
|
|
27
|
-
this.previousBlockHash = previousBlockHash;
|
|
28
26
|
this.parentEpoch = parentEpoch;
|
|
29
27
|
this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(0);
|
|
30
28
|
this.blockRootRollupStarted = false;
|
|
@@ -92,45 +90,79 @@ export class BlockProvingState {
|
|
|
92
90
|
return new MergeRollupInputs([__classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, left), __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, right)]);
|
|
93
91
|
}
|
|
94
92
|
getBlockRootRollupTypeAndInputs(proverId) {
|
|
95
|
-
if (this.
|
|
96
|
-
|
|
97
|
-
rollupType: 'empty-block-root-rollup',
|
|
98
|
-
inputs: __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getEmptyBlockRootInputs).call(this, proverId),
|
|
99
|
-
};
|
|
93
|
+
if (!this.rootParityProvingOutput) {
|
|
94
|
+
throw new Error('Root parity is not ready.');
|
|
100
95
|
}
|
|
101
96
|
const proofs = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
|
|
102
97
|
const nonEmptyProofs = proofs.filter(p => !!p);
|
|
103
98
|
if (proofs.length !== nonEmptyProofs.length) {
|
|
104
99
|
throw new Error('At lease one child is not ready for the block root.');
|
|
105
100
|
}
|
|
106
|
-
const previousRollupData = nonEmptyProofs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
|
|
107
101
|
const data = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getBlockRootRollupData).call(this, proverId);
|
|
102
|
+
if (this.totalNumTxs === 0) {
|
|
103
|
+
const constants = ConstantRollupData.from({
|
|
104
|
+
lastArchive: this.lastArchiveSnapshot,
|
|
105
|
+
globalVariables: this.globalVariables,
|
|
106
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
107
|
+
protocolContractTreeRoot,
|
|
108
|
+
});
|
|
109
|
+
return {
|
|
110
|
+
rollupType: 'empty-block-root-rollup',
|
|
111
|
+
inputs: EmptyBlockRootRollupInputs.from({
|
|
112
|
+
data,
|
|
113
|
+
constants,
|
|
114
|
+
isPadding: false,
|
|
115
|
+
}),
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
const previousRollupData = nonEmptyProofs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
|
|
119
|
+
const blobData = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getBlockRootRollupBlobData).call(this);
|
|
108
120
|
if (previousRollupData.length === 1) {
|
|
109
121
|
return {
|
|
110
122
|
rollupType: 'single-tx-block-root-rollup',
|
|
111
|
-
inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data),
|
|
123
|
+
inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data, blobData),
|
|
112
124
|
};
|
|
113
125
|
}
|
|
114
126
|
else {
|
|
115
127
|
return {
|
|
116
128
|
rollupType: 'block-root-rollup',
|
|
117
|
-
inputs: new BlockRootRollupInputs(previousRollupData, data),
|
|
129
|
+
inputs: new BlockRootRollupInputs(previousRollupData, data, blobData),
|
|
118
130
|
};
|
|
119
131
|
}
|
|
120
132
|
}
|
|
133
|
+
getPaddingBlockRootInputs(proverId) {
|
|
134
|
+
if (!this.rootParityProvingOutput) {
|
|
135
|
+
throw new Error('Root parity is not ready.');
|
|
136
|
+
}
|
|
137
|
+
// Use the new block header and archive of the current block as the previous header and archiver of the next padding block.
|
|
138
|
+
const newBlockHeader = this.buildHeaderFromProvingOutputs();
|
|
139
|
+
const newArchive = this.blockRootProvingOutput.inputs.newArchive;
|
|
140
|
+
const data = BlockRootRollupData.from({
|
|
141
|
+
l1ToL2Roots: __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityData).call(this, this.rootParityProvingOutput),
|
|
142
|
+
l1ToL2MessageSubtreeSiblingPath: this.l1ToL2MessageSubtreeSiblingPath,
|
|
143
|
+
newArchiveSiblingPath: this.newArchiveSiblingPath,
|
|
144
|
+
previousBlockHeader: newBlockHeader,
|
|
145
|
+
proverId,
|
|
146
|
+
});
|
|
147
|
+
const constants = ConstantRollupData.from({
|
|
148
|
+
lastArchive: newArchive,
|
|
149
|
+
globalVariables: this.globalVariables,
|
|
150
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
151
|
+
protocolContractTreeRoot,
|
|
152
|
+
});
|
|
153
|
+
return EmptyBlockRootRollupInputs.from({
|
|
154
|
+
data,
|
|
155
|
+
constants,
|
|
156
|
+
isPadding: true,
|
|
157
|
+
});
|
|
158
|
+
}
|
|
121
159
|
getRootParityInputs() {
|
|
122
160
|
if (!this.baseParityProvingOutputs.every(p => !!p)) {
|
|
123
161
|
throw new Error('At lease one base parity is not ready.');
|
|
124
162
|
}
|
|
125
|
-
const children = this.baseParityProvingOutputs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m",
|
|
163
|
+
const children = this.baseParityProvingOutputs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityData).call(this, p));
|
|
126
164
|
return new RootParityInputs(children);
|
|
127
165
|
}
|
|
128
|
-
getL1ToL2Roots() {
|
|
129
|
-
if (!this.rootParityProvingOutput) {
|
|
130
|
-
throw new Error('Root parity is not ready.');
|
|
131
|
-
}
|
|
132
|
-
return __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityInputFromProvingOutput).call(this, this.rootParityProvingOutput);
|
|
133
|
-
}
|
|
134
166
|
// Returns a specific transaction proving state
|
|
135
167
|
getTxProvingState(txIndex) {
|
|
136
168
|
return this.txs[txIndex];
|
|
@@ -146,7 +178,7 @@ export class BlockProvingState {
|
|
|
146
178
|
}
|
|
147
179
|
endPartialState = lastRollup.inputs.end;
|
|
148
180
|
}
|
|
149
|
-
const endState = new StateReference(this.
|
|
181
|
+
const endState = new StateReference(this.l1ToL2MessageTreeSnapshotAfterInsertion, endPartialState);
|
|
150
182
|
return buildHeaderFromCircuitOutputs(previousRollupData.map(d => d.baseOrMergeRollupPublicInputs), this.rootParityProvingOutput.inputs, this.blockRootProvingOutput.inputs, endState, logger);
|
|
151
183
|
}
|
|
152
184
|
isReadyForMergeRollup(location) {
|
|
@@ -161,6 +193,9 @@ export class BlockProvingState {
|
|
|
161
193
|
isReadyForRootParity() {
|
|
162
194
|
return this.baseParityProvingOutputs.every(p => !!p);
|
|
163
195
|
}
|
|
196
|
+
isComplete() {
|
|
197
|
+
return !!this.blockRootProvingOutput;
|
|
198
|
+
}
|
|
164
199
|
// Returns whether the proving state is still valid
|
|
165
200
|
verifyState() {
|
|
166
201
|
return this.parentEpoch.verifyState();
|
|
@@ -170,35 +205,18 @@ export class BlockProvingState {
|
|
|
170
205
|
this.parentEpoch.reject(reason);
|
|
171
206
|
}
|
|
172
207
|
}
|
|
173
|
-
_BlockProvingState_instances = new WeakSet(),
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
protocolContractTreeRoot,
|
|
180
|
-
});
|
|
181
|
-
return EmptyBlockRootRollupInputs.from({
|
|
182
|
-
l1ToL2Roots,
|
|
183
|
-
newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
|
|
184
|
-
startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
|
|
185
|
-
newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
|
|
186
|
-
previousBlockHash: this.previousBlockHash,
|
|
187
|
-
previousPartialState: this.previousBlockHeader.state.partial,
|
|
188
|
-
constants,
|
|
208
|
+
_BlockProvingState_instances = new WeakSet(), _BlockProvingState_getBlockRootRollupData = function _BlockProvingState_getBlockRootRollupData(proverId) {
|
|
209
|
+
return BlockRootRollupData.from({
|
|
210
|
+
l1ToL2Roots: __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityData).call(this, this.rootParityProvingOutput),
|
|
211
|
+
l1ToL2MessageSubtreeSiblingPath: this.l1ToL2MessageSubtreeSiblingPath,
|
|
212
|
+
newArchiveSiblingPath: this.newArchiveSiblingPath,
|
|
213
|
+
previousBlockHeader: this.previousBlockHeader,
|
|
189
214
|
proverId,
|
|
190
|
-
isPadding: false,
|
|
191
215
|
});
|
|
192
|
-
},
|
|
216
|
+
}, _BlockProvingState_getBlockRootRollupBlobData = function _BlockProvingState_getBlockRootRollupBlobData() {
|
|
193
217
|
const txEffects = this.txs.map(txProvingState => txProvingState.processedTx.txEffect);
|
|
194
218
|
const { blobFields, blobCommitments, blobsHash } = buildBlobHints(txEffects);
|
|
195
|
-
return
|
|
196
|
-
l1ToL2Roots: this.getL1ToL2Roots(),
|
|
197
|
-
newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
|
|
198
|
-
startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
|
|
199
|
-
newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
|
|
200
|
-
previousBlockHash: this.previousBlockHash,
|
|
201
|
-
proverId,
|
|
219
|
+
return BlockRootRollupBlobData.from({
|
|
202
220
|
blobFields: padArrayEnd(blobFields, Fr.ZERO, FIELDS_PER_BLOB * BLOBS_PER_BLOCK),
|
|
203
221
|
blobCommitments: padArrayEnd(blobCommitments, [Fr.ZERO, Fr.ZERO], BLOBS_PER_BLOCK),
|
|
204
222
|
blobsHash,
|
|
@@ -215,7 +233,7 @@ _BlockProvingState_instances = new WeakSet(), _BlockProvingState_getEmptyBlockRo
|
|
|
215
233
|
}, _BlockProvingState_getPreviousRollupData = function _BlockProvingState_getPreviousRollupData({ inputs, proof, verificationKey, }) {
|
|
216
234
|
const leafIndex = getVKIndex(verificationKey.keyAsFields);
|
|
217
235
|
return new PreviousRollupData(inputs, proof, verificationKey.keyAsFields, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
|
|
218
|
-
},
|
|
236
|
+
}, _BlockProvingState_getRootParityData = function _BlockProvingState_getRootParityData({ inputs, proof, verificationKey }) {
|
|
219
237
|
return new RootParityInput(proof, verificationKey.keyAsFields, getVKSiblingPath(getVKIndex(verificationKey)), inputs);
|
|
220
238
|
};
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-proving-state.js","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}
|
|
239
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-proving-state.js","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type MerkleTreeId, type ProofAndVerificationKey, type PublicInputsAndRecursiveProof } from '@aztec/circuit-types';
|
|
2
|
-
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/circuits.js';
|
|
3
|
-
import { BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs,
|
|
2
|
+
import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, type BlockHeader, type Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/circuits.js';
|
|
3
|
+
import { BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, RootRollupInputs, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
|
|
4
4
|
import { type Tuple } from '@aztec/foundation/serialize';
|
|
5
5
|
import { type TreeNodeLocation } from '@aztec/foundation/trees';
|
|
6
6
|
import { BlockProvingState } from './block-proving-state.js';
|
|
@@ -28,10 +28,10 @@ export declare class EpochProvingState {
|
|
|
28
28
|
private paddingBlockRootProvingOutput;
|
|
29
29
|
private rootRollupProvingOutput;
|
|
30
30
|
private provingStateLifecycle;
|
|
31
|
-
readonly cachedTubeProofs: Map<string, Promise<ProofAndVerificationKey<
|
|
31
|
+
readonly cachedTubeProofs: Map<string, Promise<ProofAndVerificationKey<538>>>;
|
|
32
32
|
blocks: (BlockProvingState | undefined)[];
|
|
33
33
|
constructor(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void);
|
|
34
|
-
startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[],
|
|
34
|
+
startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], l1ToL2MessageSubtreeSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, l1ToL2MessageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, lastArchiveSnapshot: AppendOnlyTreeSnapshot, newArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHeader: BlockHeader): BlockProvingState;
|
|
35
35
|
verifyState(): boolean;
|
|
36
36
|
isAcceptingBlocks(): boolean;
|
|
37
37
|
setBlockRootRollupProof(blockIndex: number, proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
|
|
@@ -41,7 +41,7 @@ export declare class EpochProvingState {
|
|
|
41
41
|
getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
|
|
42
42
|
getBlockMergeRollupInputs(mergeLocation: TreeNodeLocation): BlockMergeRollupInputs;
|
|
43
43
|
getRootRollupInputs(proverId: Fr): RootRollupInputs;
|
|
44
|
-
getPaddingBlockRootInputs(proverId: Fr): EmptyBlockRootRollupInputs;
|
|
44
|
+
getPaddingBlockRootInputs(proverId: Fr): import("@aztec/circuits.js/rollup").EmptyBlockRootRollupInputs;
|
|
45
45
|
getBlockProvingStateByBlockNumber(blockNumber: number): BlockProvingState | undefined;
|
|
46
46
|
getEpochProofResult(): {
|
|
47
47
|
proof: import("@aztec/circuits.js").Proof;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/epoch-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,6BAA6B,EACnC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,cAAc,
|
|
1
|
+
{"version":3,"file":"epoch-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/epoch-proving-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
var _EpochProvingState_instances, _EpochProvingState_getChildProofsForRoot, _EpochProvingState_getPreviousRollupData;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import {
|
|
4
|
-
import { BlockMergeRollupInputs,
|
|
5
|
-
import { makeTuple } from '@aztec/foundation/array';
|
|
6
|
-
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
3
|
+
import { MembershipWitness, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
|
|
4
|
+
import { BlockMergeRollupInputs, PreviousRollupBlockData, RootRollupInputs, } from '@aztec/circuits.js/rollup';
|
|
7
5
|
import { UnbalancedTreeStore } from '@aztec/foundation/trees';
|
|
8
|
-
import { getVKIndex, getVKSiblingPath
|
|
9
|
-
import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
6
|
+
import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks';
|
|
10
7
|
import { BlockProvingState } from './block-proving-state.js';
|
|
11
8
|
var PROVING_STATE_LIFECYCLE;
|
|
12
9
|
(function (PROVING_STATE_LIFECYCLE) {
|
|
@@ -37,9 +34,9 @@ export class EpochProvingState {
|
|
|
37
34
|
}
|
|
38
35
|
// Adds a block to the proving state, returns its index
|
|
39
36
|
// Will update the proving life cycle if this is the last block
|
|
40
|
-
startNewBlock(globalVariables, l1ToL2Messages,
|
|
37
|
+
startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, newArchiveSiblingPath, previousBlockHeader) {
|
|
41
38
|
const index = globalVariables.blockNumber.toNumber() - this.firstBlockNumber;
|
|
42
|
-
const block = new BlockProvingState(index, globalVariables,
|
|
39
|
+
const block = new BlockProvingState(index, globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, newArchiveSiblingPath, previousBlockHeader, this);
|
|
43
40
|
this.blocks[index] = block;
|
|
44
41
|
if (this.blocks.filter(b => !!b).length === this.totalNumBlocks) {
|
|
45
42
|
this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_FULL;
|
|
@@ -88,28 +85,10 @@ export class EpochProvingState {
|
|
|
88
85
|
});
|
|
89
86
|
}
|
|
90
87
|
getPaddingBlockRootInputs(proverId) {
|
|
91
|
-
|
|
92
|
-
const l1ToL2Roots = this.blocks[0]?.getL1ToL2Roots();
|
|
93
|
-
if (!block || !l1ToL2Roots) {
|
|
88
|
+
if (!this.blocks[0]?.isComplete()) {
|
|
94
89
|
throw new Error('Epoch needs one completed block in order to be padded.');
|
|
95
90
|
}
|
|
96
|
-
|
|
97
|
-
lastArchive: block.archive,
|
|
98
|
-
globalVariables: block.header.globalVariables,
|
|
99
|
-
vkTreeRoot: getVKTreeRoot(),
|
|
100
|
-
protocolContractTreeRoot,
|
|
101
|
-
});
|
|
102
|
-
return EmptyBlockRootRollupInputs.from({
|
|
103
|
-
l1ToL2Roots,
|
|
104
|
-
newL1ToL2MessageTreeRootSiblingPath: makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, Fr.zero),
|
|
105
|
-
startL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot.zero(),
|
|
106
|
-
newArchiveSiblingPath: makeTuple(ARCHIVE_HEIGHT, Fr.zero),
|
|
107
|
-
previousBlockHash: block.header.hash(),
|
|
108
|
-
previousPartialState: block.header.state.partial,
|
|
109
|
-
constants,
|
|
110
|
-
proverId,
|
|
111
|
-
isPadding: true,
|
|
112
|
-
});
|
|
91
|
+
return this.blocks[0].getPaddingBlockRootInputs(proverId);
|
|
113
92
|
}
|
|
114
93
|
// Returns a specific transaction proving state
|
|
115
94
|
getBlockProvingStateByBlockNumber(blockNumber) {
|
|
@@ -165,4 +144,4 @@ _EpochProvingState_instances = new WeakSet(), _EpochProvingState_getChildProofsF
|
|
|
165
144
|
const leafIndex = getVKIndex(verificationKey.keyAsFields);
|
|
166
145
|
return new PreviousRollupBlockData(inputs, proof, verificationKey.keyAsFields, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
|
|
167
146
|
};
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtcHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvZXBvY2gtcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLE9BQU8sRUFPTCxpQkFBaUIsRUFHakIsY0FBYyxHQUNmLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUNMLHNCQUFzQixFQUV0Qix1QkFBdUIsRUFDdkIsZ0JBQWdCLEdBRWpCLE1BQU0sMkJBQTJCLENBQUM7QUFFbkMsT0FBTyxFQUF5QixtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JGLE9BQU8sRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUV2RixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUk3RCxJQUFLLHVCQUtKO0FBTEQsV0FBSyx1QkFBdUI7SUFDMUIsdUdBQXFCLENBQUE7SUFDckIsaUdBQWtCLENBQUE7SUFDbEIseUdBQXNCLENBQUE7SUFDdEIseUdBQXNCLENBQUE7QUFDeEIsQ0FBQyxFQUxJLHVCQUF1QixLQUF2Qix1QkFBdUIsUUFLM0I7QUFJRDs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxpQkFBaUI7SUFlNUIsWUFDa0IsV0FBbUIsRUFDbkIsZ0JBQXdCLEVBQ3hCLGNBQXNCLEVBQzlCLGtCQUFtRCxFQUNuRCxpQkFBMkM7O1FBSm5DLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQ25CLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBUTtRQUN4QixtQkFBYyxHQUFkLGNBQWMsQ0FBUTtRQUM5Qix1QkFBa0IsR0FBbEIsa0JBQWtCLENBQWlDO1FBQ25ELHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBMEI7UUFaN0MsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFFOUUsbUdBQW1HO1FBQ25GLHFCQUFnQixHQUFHLElBQUksR0FBRyxFQUFzRSxDQUFDO1FBRTFHLFdBQU0sR0FBc0MsRUFBRSxDQUFDO1FBU3BELElBQUksQ0FBQyw4QkFBOEIsR0FBRyxJQUFJLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQ2hGLENBQUM7SUFFRCx1REFBdUQ7SUFDdkQsK0RBQStEO0lBQ3hELGFBQWEsQ0FDbEIsZUFBZ0MsRUFDaEMsY0FBb0IsRUFDcEIsK0JBQTJGLEVBQzNGLHVDQUErRCxFQUMvRCxtQkFBMkMsRUFDM0MscUJBQXVELEVBQ3ZELG1CQUFnQztRQUVoQyxNQUFNLEtBQUssR0FBRyxlQUFlLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQztRQUM3RSxNQUFNLEtBQUssR0FBRyxJQUFJLGlCQUFpQixDQUNqQyxLQUFLLEVBQ0wsZUFBZSxFQUNmLGNBQWMsRUFDZCwrQkFBK0IsRUFDL0IsdUNBQXVDLEVBQ3ZDLG1CQUFtQixFQUNuQixxQkFBcUIsRUFDckIsbUJBQW1CLEVBQ25CLElBQUksQ0FDTCxDQUFDO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxLQUFLLENBQUM7UUFDM0IsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ2hFLElBQUksQ0FBQyxxQkFBcUIsR0FBRyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBQztRQUMxRSxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQscUVBQXFFO0lBQzlELFdBQVc7UUFDaEIsT0FBTyxDQUNMLElBQUksQ0FBQyxxQkFBcUIsS0FBSyx1QkFBdUIsQ0FBQyxxQkFBcUI7WUFDNUUsSUFBSSxDQUFDLHFCQUFxQixLQUFLLHVCQUF1QixDQUFDLGtCQUFrQixDQUMxRSxDQUFDO0lBQ0osQ0FBQztJQUVELHNFQUFzRTtJQUMvRCxpQkFBaUI7UUFDdEIsT0FBTyxJQUFJLENBQUMscUJBQXFCLEtBQUssdUJBQXVCLENBQUMscUJBQXFCLENBQUM7SUFDdEYsQ0FBQztJQUVNLHVCQUF1QixDQUM1QixVQUFrQixFQUNsQixLQUdDO1FBRUQsT0FBTyxJQUFJLENBQUMsOEJBQThCLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN4RSxDQUFDO0lBRU0sd0JBQXdCLENBQzdCLFFBQTBCLEVBQzFCLEtBR0M7UUFFRCxJQUFJLENBQUMsOEJBQThCLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRU0sa0JBQWtCLENBQUMsS0FBNEQ7UUFDcEYsSUFBSSxDQUFDLHVCQUF1QixHQUFHLEtBQUssQ0FBQztJQUN2QyxDQUFDO0lBRU0sd0JBQXdCLENBQzdCLEtBR0M7UUFFRCxJQUFJLENBQUMsNkJBQTZCLEdBQUcsS0FBSyxDQUFDO0lBQzdDLENBQUM7SUFFTSxpQkFBaUIsQ0FBQyxRQUEwQjtRQUNqRCxPQUFPLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN6RSxDQUFDO0lBRU0seUJBQXlCLENBQUMsYUFBK0I7UUFDOUQsTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsOEJBQThCLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3JGLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNwQixNQUFNLElBQUksS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7UUFDdEQsQ0FBQztRQUVELE9BQU8sSUFBSSxzQkFBc0IsQ0FBQyxDQUFDLHVCQUFBLElBQUksOEVBQXVCLE1BQTNCLElBQUksRUFBd0IsSUFBSSxDQUFDLEVBQUUsdUJBQUEsSUFBSSw4RUFBdUIsTUFBM0IsSUFBSSxFQUF3QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDN0csQ0FBQztJQUVNLG1CQUFtQixDQUFDLFFBQVk7UUFDckMsTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsR0FBRyx1QkFBQSxJQUFJLDhFQUF1QixNQUEzQixJQUFJLENBQXlCLENBQUM7UUFDcEQsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQztRQUN0RCxDQUFDO1FBRUQsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7WUFDM0Isa0JBQWtCLEVBQUUsQ0FBQyx1QkFBQSxJQUFJLDhFQUF1QixNQUEzQixJQUFJLEVBQXdCLElBQUksQ0FBQyxFQUFFLHVCQUFBLElBQUksOEVBQXVCLE1BQTNCLElBQUksRUFBd0IsS0FBSyxDQUFDLENBQUM7WUFDM0YsUUFBUTtTQUNULENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSx5QkFBeUIsQ0FBQyxRQUFZO1FBQzNDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLFVBQVUsRUFBRSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO1FBQzVFLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMseUJBQXlCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELCtDQUErQztJQUN4QyxpQ0FBaUMsQ0FBQyxXQUFtQjtRQUMxRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFdBQVcsS0FBSyxXQUFXLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBRU0sbUJBQW1CO1FBQ3hCLElBQUksQ0FBQyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztZQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLDZEQUE2RCxDQUFDLENBQUM7UUFDakYsQ0FBQztRQUVELE9BQU87WUFDTCxLQUFLLEVBQUUsSUFBSSxDQUFDLHVCQUF1QixDQUFDLEtBQUssQ0FBQyxXQUFXO1lBQ3JELFlBQVksRUFBRSxJQUFJLENBQUMsdUJBQXVCLENBQUMsTUFBTTtTQUNsRCxDQUFDO0lBQ0osQ0FBQztJQUVNLG9CQUFvQixDQUFDLFFBQTBCO1FBQ3BELE9BQU8sSUFBSSxDQUFDLDhCQUE4QixDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsS0FBSyxTQUFTLENBQUM7SUFDaEYsQ0FBQztJQUVELDZFQUE2RTtJQUN0RSxvQkFBb0I7UUFDekIsTUFBTSxXQUFXLEdBQUcsdUJBQUEsSUFBSSw4RUFBdUIsTUFBM0IsSUFBSSxDQUF5QixDQUFDO1FBQ2xELE9BQU8sV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQsNEVBQTRFO0lBQ3JFLE1BQU07UUFDWCxJQUFJLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUVELHFFQUFxRTtJQUNyRSx1Q0FBdUM7SUFDaEMsTUFBTSxDQUFDLE1BQWM7UUFDMUIsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1lBQ3hCLE9BQU87UUFDVCxDQUFDO1FBQ0QsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHVCQUF1QixDQUFDLHNCQUFzQixDQUFDO1FBQzVFLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsc0VBQXNFO0lBQ3RFLHVDQUF1QztJQUNoQyxPQUFPLENBQUMsTUFBcUI7UUFDbEMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1lBQ3hCLE9BQU87UUFDVCxDQUFDO1FBQ0QsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHVCQUF1QixDQUFDLHNCQUFzQixDQUFDO1FBQzVFLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNsQyxDQUFDO0NBMEJGOztJQXZCRyxNQUFNLFlBQVksR0FBRyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDO0lBQzVDLDRFQUE0RTtJQUM1RSxPQUFPLElBQUksQ0FBQyxjQUFjLEtBQUssQ0FBQztRQUM5QixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksQ0FBQyw2QkFBNkIsQ0FBQztRQUNqRyxDQUFDLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUNwRSxDQUFDLCtGQUVzQixFQUNyQixNQUFNLEVBQ04sS0FBSyxFQUNMLGVBQWUsR0FJaEI7SUFDQyxNQUFNLFNBQVMsR0FBRyxVQUFVLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzFELE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsTUFBTSxFQUNOLEtBQUssRUFDTCxlQUFlLENBQUMsV0FBVyxFQUMzQixJQUFJLGlCQUFpQixDQUFDLGNBQWMsRUFBRSxNQUFNLENBQUMsU0FBUyxDQUFDLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FDdEYsQ0FBQztBQUNKLENBQUMifQ==
|