@aztec/prover-client 0.46.7 → 0.47.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.d.ts CHANGED
@@ -11,6 +11,8 @@ export type ProverClientConfig = ProverConfig & {
11
11
  bbWorkingDirectory: string;
12
12
  /** The path to the bb binary */
13
13
  bbBinaryPath: string;
14
+ /** True to disable proving altogether. */
15
+ disableProver: boolean;
14
16
  };
15
17
  /**
16
18
  * Returns the prover configuration from the environment variables.
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,0DAA0D;IAC1D,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,2CAA2C;IAC3C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,kBAAkB,CAqCrD"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,0DAA0D;IAC1D,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,2CAA2C;IAC3C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,kBAAkB,CAwCrD"}
package/dest/config.js CHANGED
@@ -5,7 +5,7 @@ import { tmpdir } from 'os';
5
5
  * @returns The prover configuration.
6
6
  */
7
7
  export function getProverEnvVars() {
8
- const { AZTEC_NODE_URL, ACVM_WORKING_DIRECTORY = tmpdir(), ACVM_BINARY_PATH = '', BB_WORKING_DIRECTORY = tmpdir(), BB_BINARY_PATH = '',
8
+ const { AZTEC_NODE_URL, ACVM_WORKING_DIRECTORY = tmpdir(), ACVM_BINARY_PATH = '', BB_WORKING_DIRECTORY = tmpdir(), BB_BINARY_PATH = '', PROVER_DISABLED = '',
9
9
  /** @deprecated */
10
10
  PROVER_AGENTS = '1', PROVER_AGENT_ENABLED = '1', PROVER_AGENT_CONCURRENCY = PROVER_AGENTS, PROVER_AGENT_POLL_INTERVAL_MS = '100', PROVER_REAL_PROOFS = '', PROVER_JOB_TIMEOUT_MS = '60000', PROVER_JOB_POLL_INTERVAL_MS = '1000', } = process.env;
11
11
  const realProofs = ['1', 'true'].includes(PROVER_REAL_PROOFS);
@@ -14,12 +14,14 @@ export function getProverEnvVars() {
14
14
  const proverAgentPollInterval = safeParseNumber(PROVER_AGENT_POLL_INTERVAL_MS, 100);
15
15
  const proverJobTimeoutMs = safeParseNumber(PROVER_JOB_TIMEOUT_MS, 60000);
16
16
  const proverJobPollIntervalMs = safeParseNumber(PROVER_JOB_POLL_INTERVAL_MS, 1000);
17
+ const disableProver = ['1', 'true'].includes(PROVER_DISABLED);
17
18
  return {
18
19
  acvmWorkingDirectory: ACVM_WORKING_DIRECTORY,
19
20
  acvmBinaryPath: ACVM_BINARY_PATH,
20
21
  bbBinaryPath: BB_BINARY_PATH,
21
22
  bbWorkingDirectory: BB_WORKING_DIRECTORY,
22
23
  realProofs,
24
+ disableProver,
23
25
  proverAgentEnabled,
24
26
  proverAgentPollInterval,
25
27
  proverAgentConcurrency,
@@ -32,4 +34,4 @@ function safeParseNumber(value, defaultValue) {
32
34
  const parsedValue = parseInt(value, 10);
33
35
  return Number.isSafeInteger(parsedValue) ? parsedValue : defaultValue;
34
36
  }
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBZ0I1Qjs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixNQUFNLEVBQ0osY0FBYyxFQUNkLHNCQUFzQixHQUFHLE1BQU0sRUFBRSxFQUNqQyxnQkFBZ0IsR0FBRyxFQUFFLEVBQ3JCLG9CQUFvQixHQUFHLE1BQU0sRUFBRSxFQUMvQixjQUFjLEdBQUcsRUFBRTtJQUNuQixrQkFBa0I7SUFDbEIsYUFBYSxHQUFHLEdBQUcsRUFDbkIsb0JBQW9CLEdBQUcsR0FBRyxFQUMxQix3QkFBd0IsR0FBRyxhQUFhLEVBQ3hDLDZCQUE2QixHQUFHLEtBQUssRUFDckMsa0JBQWtCLEdBQUcsRUFBRSxFQUN2QixxQkFBcUIsR0FBRyxPQUFPLEVBQy9CLDJCQUEyQixHQUFHLE1BQU0sR0FDckMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0lBRWhCLE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzlELE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDeEUsTUFBTSxzQkFBc0IsR0FBRyxlQUFlLENBQUMsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDNUUsTUFBTSx1QkFBdUIsR0FBRyxlQUFlLENBQUMsNkJBQTZCLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDcEYsTUFBTSxrQkFBa0IsR0FBRyxlQUFlLENBQUMscUJBQXFCLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDekUsTUFBTSx1QkFBdUIsR0FBRyxlQUFlLENBQUMsMkJBQTJCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFFbkYsT0FBTztRQUNMLG9CQUFvQixFQUFFLHNCQUFzQjtRQUM1QyxjQUFjLEVBQUUsZ0JBQWdCO1FBQ2hDLFlBQVksRUFBRSxjQUFjO1FBQzVCLGtCQUFrQixFQUFFLG9CQUFvQjtRQUN4QyxVQUFVO1FBQ1Ysa0JBQWtCO1FBQ2xCLHVCQUF1QjtRQUN2QixzQkFBc0I7UUFDdEIsT0FBTyxFQUFFLGNBQWM7UUFDdkIsdUJBQXVCO1FBQ3ZCLGtCQUFrQjtLQUNuQixDQUFDO0FBQ0osQ0FBQztBQUVELFNBQVMsZUFBZSxDQUFDLEtBQWEsRUFBRSxZQUFvQjtJQUMxRCxNQUFNLFdBQVcsR0FBRyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLE9BQU8sTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUM7QUFDeEUsQ0FBQyJ9
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBa0I1Qjs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixNQUFNLEVBQ0osY0FBYyxFQUNkLHNCQUFzQixHQUFHLE1BQU0sRUFBRSxFQUNqQyxnQkFBZ0IsR0FBRyxFQUFFLEVBQ3JCLG9CQUFvQixHQUFHLE1BQU0sRUFBRSxFQUMvQixjQUFjLEdBQUcsRUFBRSxFQUNuQixlQUFlLEdBQUcsRUFBRTtJQUNwQixrQkFBa0I7SUFDbEIsYUFBYSxHQUFHLEdBQUcsRUFDbkIsb0JBQW9CLEdBQUcsR0FBRyxFQUMxQix3QkFBd0IsR0FBRyxhQUFhLEVBQ3hDLDZCQUE2QixHQUFHLEtBQUssRUFDckMsa0JBQWtCLEdBQUcsRUFBRSxFQUN2QixxQkFBcUIsR0FBRyxPQUFPLEVBQy9CLDJCQUEyQixHQUFHLE1BQU0sR0FDckMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0lBRWhCLE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzlELE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDeEUsTUFBTSxzQkFBc0IsR0FBRyxlQUFlLENBQUMsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDNUUsTUFBTSx1QkFBdUIsR0FBRyxlQUFlLENBQUMsNkJBQTZCLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDcEYsTUFBTSxrQkFBa0IsR0FBRyxlQUFlLENBQUMscUJBQXFCLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDekUsTUFBTSx1QkFBdUIsR0FBRyxlQUFlLENBQUMsMkJBQTJCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkYsTUFBTSxhQUFhLEdBQUcsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBRTlELE9BQU87UUFDTCxvQkFBb0IsRUFBRSxzQkFBc0I7UUFDNUMsY0FBYyxFQUFFLGdCQUFnQjtRQUNoQyxZQUFZLEVBQUUsY0FBYztRQUM1QixrQkFBa0IsRUFBRSxvQkFBb0I7UUFDeEMsVUFBVTtRQUNWLGFBQWE7UUFDYixrQkFBa0I7UUFDbEIsdUJBQXVCO1FBQ3ZCLHNCQUFzQjtRQUN0QixPQUFPLEVBQUUsY0FBYztRQUN2Qix1QkFBdUI7UUFDdkIsa0JBQWtCO0tBQ25CLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyxlQUFlLENBQUMsS0FBYSxFQUFFLFlBQW9CO0lBQzFELE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDeEMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztBQUN4RSxDQUFDIn0=
package/dest/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export { ProverClient } from '@aztec/circuit-types';
2
2
  export * from './tx-prover/tx-prover.js';
3
3
  export * from './config.js';
4
+ export * from './tx-prover/factory.js';
4
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC"}
package/dest/index.js CHANGED
@@ -1,3 +1,4 @@
1
1
  export * from './tx-prover/tx-prover.js';
2
2
  export * from './config.js';
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGFBQWEsQ0FBQyJ9
3
+ export * from './tx-prover/factory.js';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLHdCQUF3QixDQUFDIn0=
@@ -14,9 +14,9 @@ export declare function getSimulationProvider(config: {
14
14
  acvmWorkingDirectory: string | undefined;
15
15
  acvmBinaryPath: string | undefined;
16
16
  }, logger?: DebugLogger): Promise<SimulationProvider>;
17
- export declare const makeBloatedProcessedTx: (builderDb: MerkleTreeOperations, seed?: number) => Promise<ProcessedTx>;
18
- export declare const makeEmptyProcessedTx: (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => Promise<ProcessedTx>;
17
+ export declare const makeBloatedProcessedTx: (builderDb: MerkleTreeOperations, seed?: number) => ProcessedTx;
18
+ export declare const makeEmptyProcessedTx: (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => ProcessedTx;
19
19
  export declare const updateExpectedTreesFromTxs: (db: MerkleTreeOperations, txs: ProcessedTx[]) => Promise<void>;
20
20
  export declare const makeGlobals: (blockNumber: number) => GlobalVariables;
21
- export declare const makeEmptyProcessedTestTx: (builderDb: MerkleTreeOperations) => Promise<ProcessedTx>;
21
+ export declare const makeEmptyProcessedTestTx: (builderDb: MerkleTreeOperations) => ProcessedTx;
22
22
  //# sourceMappingURL=fixtures.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAIjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGL,EAAE,EAEF,eAAe,EAUhB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAuB,KAAK,kBAAkB,EAAiB,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAgB/D,eAAO,MAAM,oBAAoB,WAAkB,WAAW;;;;;;cA6B7D,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,kBAAkB,CAAC,CAe7B;AAED,eAAO,MAAM,sBAAsB,cAAqB,oBAAoB,wCA6B3E,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAqB,oBAAoB,WAAW,EAAE,WAAW,EAAE,yBAGnG,CAAC;AAGF,eAAO,MAAM,0BAA0B,OAAc,oBAAoB,OAAO,WAAW,EAAE,kBA+B5F,CAAC;AAEF,eAAO,MAAM,WAAW,gBAAiB,MAAM,oBAU9C,CAAC;AAEF,eAAO,MAAM,wBAAwB,cAAe,oBAAoB,KAAG,QAAQ,WAAW,CAE7F,CAAC"}
1
+ {"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAIjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGL,EAAE,EAEF,eAAe,EAUhB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAuB,KAAK,kBAAkB,EAAiB,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAgB/D,eAAO,MAAM,oBAAoB,WAAkB,WAAW;;;;;;cA6B7D,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,kBAAkB,CAAC,CAe7B;AAED,eAAO,MAAM,sBAAsB,cAAe,oBAAoB,+BA6BrE,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,oBAAoB,WAAW,EAAE,WAAW,EAAE,gBAG7F,CAAC;AAGF,eAAO,MAAM,0BAA0B,OAAc,oBAAoB,OAAO,WAAW,EAAE,kBA+B5F,CAAC;AAEF,eAAO,MAAM,WAAW,gBAAiB,MAAM,oBAU9C,CAAC;AAEF,eAAO,MAAM,wBAAwB,cAAe,oBAAoB,KAAG,WACxB,CAAC"}
@@ -56,12 +56,12 @@ export async function getSimulationProvider(config, logger) {
56
56
  logger?.info('Using WASM ACVM simulation');
57
57
  return new WASMSimulator();
58
58
  }
59
- export const makeBloatedProcessedTx = async (builderDb, seed = 0x1) => {
59
+ export const makeBloatedProcessedTx = (builderDb, seed = 0x1) => {
60
60
  seed *= MAX_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
61
61
  const tx = mockTx(seed);
62
62
  const kernelOutput = KernelCircuitPublicInputs.empty();
63
63
  kernelOutput.constants.vkTreeRoot = getVKTreeRoot();
64
- kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
64
+ kernelOutput.constants.historicalHeader = builderDb.getInitialHeader();
65
65
  kernelOutput.end.publicDataUpdateRequests = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20), seed + 0x500);
66
66
  kernelOutput.end.publicDataUpdateRequests = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20), seed + 0x600);
67
67
  const processedTx = makeProcessedTx(tx, kernelOutput, []);
@@ -73,8 +73,8 @@ export const makeBloatedProcessedTx = async (builderDb, seed = 0x1) => {
73
73
  processedTx.data.end.encryptedLogsHash = Fr.fromBuffer(processedTx.encryptedLogs.hash());
74
74
  return processedTx;
75
75
  };
76
- export const makeEmptyProcessedTx = async (builderDb, chainId, version) => {
77
- const header = await builderDb.buildInitialHeader();
76
+ export const makeEmptyProcessedTx = (builderDb, chainId, version) => {
77
+ const header = builderDb.getInitialHeader();
78
78
  return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version, getVKTreeRoot());
79
79
  };
80
80
  // Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
@@ -90,7 +90,5 @@ export const updateExpectedTreesFromTxs = async (db, txs) => {
90
90
  export const makeGlobals = (blockNumber) => {
91
91
  return new GlobalVariables(Fr.ZERO, Fr.ZERO, new Fr(blockNumber), Fr.ZERO, EthAddress.ZERO, AztecAddress.ZERO, GasFees.empty());
92
92
  };
93
- export const makeEmptyProcessedTestTx = (builderDb) => {
94
- return makeEmptyProcessedTx(builderDb, Fr.ZERO, Fr.ZERO);
95
- };
96
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"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"}
93
+ export const makeEmptyProcessedTestTx = (builderDb) => makeEmptyProcessedTx(builderDb, Fr.ZERO, Fr.ZERO);
94
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import { type BBProverConfig } from '@aztec/bb-prover';
2
- import { type BlockProver, type ProcessedTx, type ServerCircuitProver, type Tx, type TxValidator } from '@aztec/circuit-types';
2
+ import { type BlockProver, type ProcessedTx, type PublicExecutionRequest, type ServerCircuitProver, type Tx, type TxValidator } from '@aztec/circuit-types';
3
3
  import { type Gas, GlobalVariables, type Nullifier, type TxContext } from '@aztec/circuits.js';
4
4
  import { type Fr } from '@aztec/foundation/fields';
5
5
  import { type DebugLogger } from '@aztec/foundation/log';
6
- import { type ContractsDataSourcePublicDB, type PublicExecutionRequest, type PublicExecutionResult, type PublicExecutor, PublicProcessor, type SimulationProvider, type WorldStatePublicDB } from '@aztec/simulator';
6
+ import { type ContractsDataSourcePublicDB, type PublicExecutionResult, type PublicExecutor, PublicProcessor, type SimulationProvider, type WorldStatePublicDB } from '@aztec/simulator';
7
7
  import { type MerkleTreeOperations } from '@aztec/world-state';
8
8
  import { type MockProxy } from 'jest-mock-extended';
9
9
  import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
@@ -1 +1 @@
1
- {"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
@@ -95,7 +95,7 @@ export class TestContext {
95
95
  : [...tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall];
96
96
  for (const request of allCalls) {
97
97
  if (execution.contractAddress.equals(request.contractAddress)) {
98
- const result = PublicExecutionResultBuilder.fromPublicCallRequest({ request }).build({
98
+ const result = PublicExecutionResultBuilder.fromPublicExecutionRequest({ request }).build({
99
99
  startGasLeft: availableGas,
100
100
  endGasLeft: availableGas,
101
101
  transactionFee,
@@ -115,4 +115,4 @@ export class TestContext {
115
115
  return await this.publicProcessor.process(txs, maxTransactions, blockProver, txValidator);
116
116
  }
117
117
  }
118
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBQVksZUFBZSxFQUFFLE1BQU0sRUFBa0MsTUFBTSxvQkFBb0IsQ0FBQztBQUd2RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUlMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQztRQUFqQyxpQkFBWSxHQUFaLFlBQVksQ0FBcUI7SUFBRyxDQUFDO0lBQ3pELGFBQWEsQ0FBQyxNQUFjLEVBQUUsZUFBZ0MsRUFBRSxjQUFvQjtRQUNsRixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxlQUFlLEVBQUUsY0FBYyxDQUFDLENB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
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBQVksZUFBZSxFQUFFLE1BQU0sRUFBa0MsTUFBTSxvQkFBb0IsQ0FBQztBQUd2RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUdMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQztRQUFqQyxpQkFBWSxHQUFaLFlBQVksQ0FBcUI7SUFBRyxDQUFDO0lBQ3pELGFBQWEsQ0FBQyxNQUFjLEVBQUUsZUFBZ0MsRUFBRSxjQUFvQjtRQUNsRixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxlQUFlLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDbEYsQ0FBQztJQUNELFFBQVEsQ0FBQyxFQUFlO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUNELFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDekMsQ0FBQztJQUNELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDM0MsQ0FBQztJQUNELGlCQUFpQjtRQUNmLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQy9DLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxXQUFXO0lBRXRCLFlBQ1MsY0FBeUMsRUFDekMsaUJBQXlELEVBQ3pELGtCQUFpRCxFQUNqRCxlQUFnQyxFQUNoQyxrQkFBc0MsRUFDdEMsZUFBZ0MsRUFDaEMsUUFBOEIsRUFDOUIsTUFBMkIsRUFDM0IsV0FBd0IsRUFDeEIsWUFBaUMsRUFDakMsV0FBbUIsRUFDbkIsb0JBQThCLEVBQzlCLE1BQW1CO1FBWm5CLG1CQUFjLEdBQWQsY0FBYyxDQUEyQjtRQUN6QyxzQkFBaUIsR0FBakIsaUJBQWlCLENBQXdDO1FBQ3pELHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBK0I7UUFDakQsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2hDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQ2hDLGFBQVEsR0FBUixRQUFRLENBQXNCO1FBQzlCLFdBQU0sR0FBTixNQUFNLENBQXFCO1FBQzNCLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQ3hCLGlCQUFZLEdBQVosWUFBWSxDQUFxQjtRQUNqQyxnQkFBVyxHQUFYLFdBQVcsQ0FBUTtRQUNuQix5QkFBb0IsR0FBcEIsb0JBQW9CLENBQVU7UUFDOUIsV0FBTSxHQUFOLE1BQU0sQ0FBYTtRQUUxQixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksaUJBQWlCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FDZCxNQUFtQixFQUNuQixXQUFXLEdBQUcsQ0FBQyxFQUNmLGVBQTJFLENBQUMsQ0FBQyxFQUFFLENBQzdFLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLG1CQUFtQixFQUFFLEVBQUUsSUFBSSxhQUFhLEVBQUUsQ0FBQyxDQUFDLEVBQ3hGLFdBQVcsR0FBRyxDQUFDO1FBRWYsTUFBTSxlQUFlLEdBQUcsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRWpELE1BQU0sY0FBYyxHQUFHLElBQUksRUFBa0IsQ0FBQztRQUM5QyxNQUFNLGlCQUFpQixHQUFHLElBQUksRUFBK0IsQ0FBQztRQUM5RCxNQUFNLGtCQUFrQixHQUFHLElBQUksRUFBc0IsQ0FBQztRQUN0RCxNQUFNLFlBQVksR0FBRyxJQUFJLGdDQUFnQyxDQUFDLElBQUksYUFBYSxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLFFBQVEsR0FBRyxNQUFNLFdBQVcsQ0FBQyxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLFNBQVMsR0FBRyxJQUFJLG1CQUFtQixFQUFFLENBQUM7UUFDNUMsTUFBTSxTQUFTLEdBQUcsSUFBSSxlQUFlLENBQ25DLFFBQVEsRUFDUixjQUFjLEVBQ2QsWUFBWSxFQUNaLGVBQWUsQ0FBQyxLQUFLLEVBQUUsRUFDdkIsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUNkLGlCQUFpQixFQUNqQixrQkFBa0IsRUFDbEIsU0FBUyxDQUNWLENBQUM7UUFFRixJQUFJLFdBQWdDLENBQUM7UUFDckMsTUFBTSxNQUFNLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsRCxNQUFNLGtCQUFrQixHQUFHLE1BQU0scUJBQXFCLENBQUM7WUFDckQsb0JBQW9CLEVBQUUsTUFBTSxFQUFFLG9CQUFvQjtZQUNsRCxjQUFjLEVBQUUsTUFBTSxFQUFFLGdCQUFnQjtTQUN6QyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWixXQUFXLEdBQUcsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLG1CQUFtQixFQUFFLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztRQUNyRixDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sUUFBUSxHQUFtQjtnQkFDL0IsY0FBYyxFQUFFLE1BQU0sQ0FBQyxnQkFBZ0I7Z0JBQ3ZDLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyxvQkFBb0I7Z0JBQ2pELFlBQVksRUFBRSxNQUFNLENBQUMsY0FBYztnQkFDbkMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLGtCQUFrQjthQUM5QyxDQUFDO1lBQ0YsV0FBVyxHQUFHLE1BQU0sWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFFRCxNQUFNLEtBQUssR0FBRyxJQUFJLGtCQUFrQixFQUFFLENBQUM7UUFDdkMsTUFBTSxZQUFZLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3pFLE1BQU0sS0FBSyxHQUFHLElBQUksV0FBVyxDQUFDLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUV4RCxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDZCxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLE9BQU8sSUFBSSxJQUFJLENBQ2IsY0FBYyxFQUNkLGlCQUFpQixFQUNqQixrQkFBa0IsRUFDbEIsU0FBUyxFQUNULGtCQUFrQixFQUNsQixlQUFlLEVBQ2YsUUFBUSxFQUNSLFdBQVcsRUFDWCxLQUFLLEVBQ0wsWUFBWSxFQUNaLFdBQVcsRUFDWCxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsSUFBSSxFQUFFLENBQUMsRUFDbEMsTUFBTSxDQUNQLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDOUIsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsb0JBQW9CLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDbEUsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsc0JBQXNCLENBQ2pDLEdBQVMsRUFDVCxlQUF1QixFQUN2QixXQUF5QixFQUN6QixXQUFzQztRQUV0QyxNQUFNLDZCQUE2QixHQUFHLENBQ3BDLFNBQWlDLEVBQ2pDLGdCQUFpQyxFQUNqQyxZQUFpQixFQUNqQixVQUFxQixFQUNyQixrQkFBK0IsRUFDL0IsY0FBbUIsRUFDbkIsa0JBQTJCLEVBQzNCLEVBQUU7WUFDRixLQUFLLE1BQU0sRUFBRSxJQUFJLEdBQUcsRUFBRSxDQUFDO2dCQUNyQixNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsMEJBQTBCLENBQUMsT0FBTyxFQUFFO29CQUN0RCxDQUFDLENBQUMsRUFBRSxDQUFDLDJCQUEyQjtvQkFDaEMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsMkJBQTJCLEVBQUUsRUFBRSxDQUFDLDBCQUEwQixDQUFDLENBQUM7Z0JBQ3ZFLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7b0JBQy9CLElBQUksU0FBUyxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUM7d0JBQzlELE1BQU0sTUFBTSxHQUFHLDRCQUE0QixDQUFDLDBCQUEwQixDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUM7NEJBQ3hGLFlBQVksRUFBRSxZQUFZOzRCQUMxQixVQUFVLEVBQUUsWUFBWTs0QkFDeEIsY0FBYzt5QkFDZixDQUFDLENBQUM7d0JBQ0gsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUNqQyxDQUFDO2dCQUNILENBQUM7WUFDSCxDQUFDO1lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUNoRSxDQUFDLENBQUM7UUFDRixPQUFPLE1BQU0sSUFBSSxDQUFDLG9EQUFvRCxDQUNwRSxHQUFHLEVBQ0gsZUFBZSxFQUNmLFdBQVcsRUFDWCxXQUFXLEVBQ1gsNkJBQTZCLENBQzlCLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLG9EQUFvRCxDQUMvRCxHQUFTLEVBQ1QsZUFBdUIsRUFDdkIsV0FBeUIsRUFDekIsV0FBc0MsRUFDdEMsWUFRbUM7UUFFbkMsSUFBSSxZQUFZLEVBQUUsQ0FBQztZQUNqQixJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNoRSxDQUFDO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxlQUFlLEVBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQzVGLENBQUM7Q0FDRiJ9
@@ -1,6 +1,6 @@
1
1
  import { type ProcessedTx } from '@aztec/circuit-types';
2
2
  import { type BlockResult, type ProvingTicket, type ServerCircuitProver } from '@aztec/circuit-types/interfaces';
3
- import { Fr, type GlobalVariables, type Header } from '@aztec/circuits.js';
3
+ import { Fr, type GlobalVariables } from '@aztec/circuits.js';
4
4
  import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
5
5
  import { type MerkleTreeOperations } from '@aztec/world-state';
6
6
  /**
@@ -19,12 +19,11 @@ import { type MerkleTreeOperations } from '@aztec/world-state';
19
19
  export declare class ProvingOrchestrator {
20
20
  private db;
21
21
  private prover;
22
- private initialHeader?;
23
22
  private provingState;
24
23
  private pendingProvingJobs;
25
24
  private paddingTx;
26
25
  readonly tracer: Tracer;
27
- constructor(db: MerkleTreeOperations, prover: ServerCircuitProver, telemetryClient: TelemetryClient, initialHeader?: Header | undefined);
26
+ constructor(db: MerkleTreeOperations, prover: ServerCircuitProver, telemetryClient: TelemetryClient);
28
27
  /**
29
28
  * Resets the orchestrator's cached padding tx.
30
29
  */
@@ -1 +1 @@
1
- {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EASjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAElB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAML,EAAE,EACF,KAAK,eAAe,EACpB,KAAK,MAAM,EAiBZ,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAmB/D;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,aAAa,CAAC;IAVxB,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,SAAS,CAA6C;IAE9D,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGrB,EAAE,EAAE,oBAAoB,EACxB,MAAM,EAAE,mBAAmB,EACnC,eAAe,EAAE,eAAe,EACxB,aAAa,CAAC,oBAAQ;IAKhC;;OAEG;IACI,KAAK;IAIZ;;;;;;;OAOG;IAKU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,GACnB,OAAO,CAAC,aAAa,CAAC;IAyEzB;;;OAGG;IAIU,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD;;OAEG;IAYU,iBAAiB;IA2C9B,OAAO,CAAC,iBAAiB;IA2CzB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAiBhC;;OAEG;IACI,WAAW;IAQlB;;;OAGG;IAQU,aAAa;IAoE1B;;;;OAIG;YACW,kBAAkB;IAShC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAwCrC,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,iBAAiB;IA8EzB,OAAO,CAAC,kBAAkB;YAiCZ,iBAAiB;IAmD/B,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,wBAAwB;YAmBlB,yBAAyB;IAQvC;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;IA0BrC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAkDjB,OAAO,CAAC,2BAA2B;IAkBnC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;CAmE5B"}
1
+ {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EASjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAElB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAML,EAAE,EACF,KAAK,eAAe,EAiBrB,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAmB/D;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,MAAM;IAN5D,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,SAAS,CAA6C;IAE9D,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAEX,EAAE,EAAE,oBAAoB,EAAU,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe;IAInH;;OAEG;IACI,KAAK;IAIZ;;;;;;;OAOG;IAKU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,GACnB,OAAO,CAAC,aAAa,CAAC;IAoEzB;;;OAGG;IAIU,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD;;OAEG;IAYU,iBAAiB;IA2C9B,OAAO,CAAC,iBAAiB;IA2CzB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAiBhC;;OAEG;IACI,WAAW;IAQlB;;;OAGG;IAQU,aAAa;IAoE1B;;;;OAIG;YACW,kBAAkB;IAShC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAwCrC,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,iBAAiB;IA8EzB,OAAO,CAAC,kBAAkB;YAiCZ,iBAAiB;IAmD/B,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,wBAAwB;YAmBlB,yBAAyB;IAQvC;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;IA0BrC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAkDjB,OAAO,CAAC,2BAA2B;IAkBnC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;CAmE5B"}
@@ -38,10 +38,9 @@ let ProvingOrchestrator = (() => {
38
38
  let _finaliseBlock_decorators;
39
39
  let _prepareBaseRollupInputs_decorators;
40
40
  return _a = class ProvingOrchestrator {
41
- constructor(db, prover, telemetryClient, initialHeader) {
41
+ constructor(db, prover, telemetryClient) {
42
42
  this.db = (__runInitializers(this, _instanceExtraInitializers), db);
43
43
  this.prover = prover;
44
- this.initialHeader = initialHeader;
45
44
  this.provingState = undefined;
46
45
  this.pendingProvingJobs = [];
47
46
  this.paddingTx = undefined;
@@ -62,10 +61,6 @@ let ProvingOrchestrator = (() => {
62
61
  * @returns A proving ticket, containing a promise notifying of proving completion
63
62
  */
64
63
  async startNewBlock(numTxs, globalVariables, l1ToL2Messages) {
65
- // Create initial header if not done so yet
66
- if (!this.initialHeader) {
67
- this.initialHeader = await this.db.buildInitialHeader();
68
- }
69
64
  if (!Number.isInteger(numTxs) || numTxs < 2) {
70
65
  throw new Error(`Length of txs for the block should be at least two (got ${numTxs})`);
71
66
  }
@@ -145,7 +140,7 @@ let ProvingOrchestrator = (() => {
145
140
  // Insert it into the tree the required number of times to get all of the
146
141
  // base rollup inputs
147
142
  // Then enqueue the proving of all the transactions
148
- const unprovenPaddingTx = makeEmptyProcessedTx(this.initialHeader ?? (await this.db.buildInitialHeader()), this.provingState.globalVariables.chainId, this.provingState.globalVariables.version, getVKTreeRoot());
143
+ const unprovenPaddingTx = makeEmptyProcessedTx(this.db.getInitialHeader(), this.provingState.globalVariables.chainId, this.provingState.globalVariables.version, getVKTreeRoot());
149
144
  const txInputs = [];
150
145
  for (let i = 0; i < paddingTxCount; i++) {
151
146
  const [inputs, snapshot] = await this.prepareTransaction(unprovenPaddingTx, this.provingState);
@@ -353,7 +348,7 @@ let ProvingOrchestrator = (() => {
353
348
  }
354
349
  const getBaseInputsEmptyTx = async () => {
355
350
  const inputs = {
356
- header: await this.db.buildInitialHeader(),
351
+ header: this.db.getInitialHeader(),
357
352
  chainId: tx.data.constants.globalVariables.chainId,
358
353
  version: tx.data.constants.globalVariables.version,
359
354
  vkTreeRoot: tx.data.constants.vkTreeRoot,
@@ -682,4 +677,4 @@ function extractAggregationObject(proof, numPublicInputs) {
682
677
  }
683
678
  return BufferReader.asReader(buffer).readArray(AGGREGATION_OBJECT_LENGTH, Fr);
684
679
  }
685
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
680
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
@@ -40,7 +40,7 @@ export declare class ProvingState {
40
40
  get transactionsReceived(): number;
41
41
  get finalRootParityInput(): RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined;
42
42
  set finalRootParityInput(input: RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined);
43
- get rootParityInput(): (RootParityInput<393> | undefined)[];
43
+ get rootParityInput(): (RootParityInput<409> | undefined)[];
44
44
  verifyState(): boolean;
45
45
  isAcceptingTransactions(): boolean;
46
46
  get allTxs(): TxProvingState[];
@@ -1 +1 @@
1
- {"version":3,"file":"prover-agent.d.ts","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAIrB,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAO9B;;GAEG;AACH,qBAAa,WAAW;IAKpB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IACrB,8DAA8D;IAC9D,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,GAAG;IAVb,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,cAAc,CAAC,CAAiB;;IAGtC,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,8DAA8D;IACtD,cAAc,SAAI;IAC1B,oCAAoC;IAC5B,cAAc,SAAM,EACpB,GAAG,yCAAwD;IAGrE,iBAAiB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAO/C,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS;IAIT,KAAK,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IA8BlC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAWb,IAAI;IAkClB,OAAO,CAAC,QAAQ;CAuDjB"}
1
+ {"version":3,"file":"prover-agent.d.ts","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAIrB,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAO9B;;GAEG;AACH,qBAAa,WAAW;IAKpB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IACrB,8DAA8D;IAC9D,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,GAAG;IAVb,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,cAAc,CAAC,CAAiB;;IAGtC,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,8DAA8D;IACtD,cAAc,SAAI;IAC1B,oCAAoC;IAC5B,cAAc,SAAM,EACpB,GAAG,yCAAwD;IAGrE,iBAAiB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAO/C,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS;IAIT,KAAK,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAoClC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAWb,IAAI;IAkClB,OAAO,CAAC,QAAQ;CAuDjB"}
@@ -47,11 +47,16 @@ export class ProverAgent {
47
47
  // job source is fully drained, sleep for a bit and try again
48
48
  return;
49
49
  }
50
- const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
51
- this.inFlightPromises.set(job.id, promise);
50
+ try {
51
+ const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
52
+ this.inFlightPromises.set(job.id, promise);
53
+ }
54
+ catch (err) {
55
+ this.log.warn(`Error processing job! type=${ProvingRequestType[job.request.type]}: ${err}. ${err.stack}`);
56
+ }
52
57
  }
53
58
  catch (err) {
54
- this.log.warn(`Error processing job: ${err}`);
59
+ // no-op
55
60
  }
56
61
  }
57
62
  }, this.pollIntervalMs);
@@ -134,4 +139,4 @@ export class ProverAgent {
134
139
  }
135
140
  }
136
141
  }
137
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLWFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9wcm92ZXItYWdlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLGtCQUFrQixHQUVuQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFdBQVc7SUFJdEI7SUFDRSxpREFBaUQ7SUFDekMsYUFBa0M7SUFDMUMsOERBQThEO0lBQ3RELGlCQUFpQixDQUFDO0lBQzFCLG9DQUFvQztJQUM1QixpQkFBaUIsR0FBRyxFQUNwQixNQUFNLGlCQUFpQixDQUFDLGtDQUFrQyxDQUFDO1FBTDNELGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUVsQyxtQkFBYyxHQUFkLGNBQWMsQ0FBSTtRQUVsQixtQkFBYyxHQUFkLGNBQWMsQ0FBTTtRQUNwQixRQUFHLEdBQUgsR0FBRyxDQUF3RDtRQVY3RCxxQkFBZ0IsR0FBRyxJQUFJLEdBQUcsRUFBd0IsQ0FBQztJQVd4RCxDQUFDO0lBRUosaUJBQWlCLENBQUMsY0FBc0I7UUFDdEMsSUFBSSxjQUFjLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFDRCxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsYUFBa0M7UUFDakQsSUFBSSxDQUFDLGFBQWEsR0FBRyxhQUFhLENBQUM7SUFDckMsQ0FBQztJQUVE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
142
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLWFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9wcm92ZXItYWdlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLGtCQUFrQixHQUVuQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFdBQVc7SUFJdEI7SUFDRSxpREFBaUQ7SUFDekMsYUFBa0M7SUFDMUMsOERBQThEO0lBQ3RELGlCQUFpQixDQUFDO0lBQzFCLG9DQUFvQztJQUM1QixpQkFBaUIsR0FBRyxFQUNwQixNQUFNLGlCQUFpQixDQUFDLGtDQUFrQyxDQUFDO1FBTDNELGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUVsQyxtQkFBYyxHQUFkLGNBQWMsQ0FBSTtRQUVsQixtQkFBYyxHQUFkLGNBQWMsQ0FBTTtRQUNwQixRQUFHLEdBQUgsR0FBRyxDQUF3RDtRQVY3RCxxQkFBZ0IsR0FBRyxJQUFJLEdBQUcsRUFBd0IsQ0FBQztJQVd4RCxDQUFDO0lBRUosaUJBQWlCLENBQUMsY0FBc0I7UUFDdEMsSUFBSSxjQUFjLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFDRCxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsYUFBa0M7UUFDakQsSUFBSSxDQUFDLGFBQWEsR0FBRyxhQUFhLENBQUM7SUFDckMsQ0FBQztJQUVE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
@@ -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;AAuB7D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CA2BnF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,yFAA8B,GAClC,gBAAgB,CA8BlB"}
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;AAwB7D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CA4BnF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,yFAA8B,GAClC,gBAAgB,CA+BlB"}
@@ -1,53 +1,55 @@
1
- import { AvmCircuitInputs, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, Proof, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelTailCircuitPrivateInputs, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, VerificationKeyData, } from '@aztec/circuits.js';
1
+ import { AvmCircuitInputs, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, 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
- Header,
8
- Fr,
9
7
  AvmCircuitInputs,
10
- BaseParityInputs,
11
8
  BaseOrMergeRollupPublicInputs,
9
+ BaseParityInputs,
12
10
  BaseRollupInputs,
11
+ Fr,
12
+ Header,
13
+ KernelCircuitPublicInputs,
13
14
  MergeRollupInputs,
14
15
  ParityPublicInputs,
15
16
  Proof,
16
- RootParityInput,
17
- RootParityInputs,
18
- RootRollupInputs,
19
- RootRollupPublicInputs,
17
+ ProvingError,
20
18
  PublicKernelCircuitPrivateInputs,
21
19
  PublicKernelCircuitPublicInputs,
22
20
  PublicKernelTailCircuitPrivateInputs,
23
- KernelCircuitPublicInputs,
24
- ProvingError,
25
21
  RecursiveProof,
22
+ RootParityInput,
23
+ RootParityInputs,
24
+ RootRollupInputs,
25
+ RootRollupPublicInputs,
26
+ TubeInputs,
26
27
  VerificationKeyData,
27
28
  }, {});
28
29
  }
29
30
  export function createProvingJobSourceClient(url, namespace, fetch = makeFetch([1, 2, 3], false)) {
30
31
  return createJsonRpcClient(url, {
31
- Header,
32
- Fr,
33
32
  AvmCircuitInputs,
34
- BaseParityInputs,
35
33
  BaseOrMergeRollupPublicInputs,
34
+ BaseParityInputs,
36
35
  BaseRollupInputs,
36
+ Fr,
37
+ Header,
38
+ KernelCircuitPublicInputs,
37
39
  MergeRollupInputs,
38
40
  ParityPublicInputs,
39
41
  Proof,
40
- RootParityInput,
41
- RootParityInputs,
42
- RootRollupInputs,
43
- RootRollupPublicInputs,
42
+ ProvingError,
44
43
  PublicKernelCircuitPrivateInputs,
45
44
  PublicKernelCircuitPublicInputs,
46
45
  PublicKernelTailCircuitPrivateInputs,
47
- KernelCircuitPublicInputs,
48
- ProvingError,
49
46
  RecursiveProof,
47
+ RootParityInput,
48
+ RootParityInputs,
49
+ RootRollupPublicInputs,
50
+ RootRollupInputs,
51
+ TubeInputs,
50
52
  VerificationKeyData,
51
53
  }, {}, false, namespace, fetch);
52
54
  }
53
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLGdCQUFnQixFQUNoQiw2QkFBNkIsRUFDN0IsZ0JBQWdCLEVBQ2hCLGdCQUFnQixFQUNoQixFQUFFLEVBQ0YsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLEtBQUssRUFDTCxnQ0FBZ0MsRUFDaEMsK0JBQStCLEVBQy9CLG9DQUFvQyxFQUNwQyxjQUFjLEVBQ2QsZUFBZSxFQUNmLGdCQUFnQixFQUNoQixnQkFBZ0IsRUFDaEIsc0JBQXNCLEVBQ3RCLG1CQUFtQixHQUNwQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxELE1BQU0sVUFBVSw0QkFBNEIsQ0FBQyxLQUF1QjtJQUNsRSxPQUFPLElBQUksYUFBYSxDQUN0QixLQUFLLEVBQ0w7UUFDRSxNQUFNO1FBQ04sRUFBRTtRQUNGLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsNkJBQTZCO1FBQzdCLGdCQUFnQjtRQUNoQixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLEtBQUs7UUFDTCxlQUFlO1FBQ2YsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixzQkFBc0I7UUFDdEIsZ0NBQWdDO1FBQ2hDLCtCQUErQjtRQUMvQixvQ0FBb0M7UUFDcEMseUJBQXlCO1FBQ3pCLFlBQVk7UUFDWixjQUFjO1FBQ2QsbUJBQW1CO0tBQ3BCLEVBQ0QsRUFBRSxDQUNILENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLDRCQUE0QixDQUMxQyxHQUFXLEVBQ1gsU0FBa0IsRUFDbEIsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBRW5DLE9BQU8sbUJBQW1CLENBQ3hCLEdBQUcsRUFDSDtRQUNFLE1BQU07UUFDTixFQUFFO1FBQ0YsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQiw2QkFBNkI7UUFDN0IsZ0JBQWdCO1FBQ2hCLGlCQUFpQjtRQUNqQixrQkFBa0I7UUFDbEIsS0FBSztRQUNMLGVBQWU7UUFDZixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLHNCQUFzQjtRQUN0QixnQ0FBZ0M7UUFDaEMsK0JBQStCO1FBQy9CLG9DQUFvQztRQUNwQyx5QkFBeUI7UUFDekIsWUFBWTtRQUNaLGNBQWM7UUFDZCxtQkFBbUI7S0FDcEIsRUFDRCxFQUFFLEVBQ0YsS0FBSyxFQUNMLFNBQVMsRUFDVCxLQUFLLENBQ2MsQ0FBQztBQUN4QixDQUFDIn0=
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLGdCQUFnQixFQUNoQiw2QkFBNkIsRUFDN0IsZ0JBQWdCLEVBQ2hCLGdCQUFnQixFQUNoQixFQUFFLEVBQ0YsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLEtBQUssRUFDTCxnQ0FBZ0MsRUFDaEMsK0JBQStCLEVBQy9CLG9DQUFvQyxFQUNwQyxjQUFjLEVBQ2QsZUFBZSxFQUNmLGdCQUFnQixFQUNoQixnQkFBZ0IsRUFDaEIsc0JBQXNCLEVBQ3RCLFVBQVUsRUFDVixtQkFBbUIsR0FDcEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDbkYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRWxFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRCxNQUFNLFVBQVUsNEJBQTRCLENBQUMsS0FBdUI7SUFDbEUsT0FBTyxJQUFJLGFBQWEsQ0FDdEIsS0FBSyxFQUNMO1FBQ0UsZ0JBQWdCO1FBQ2hCLDZCQUE2QjtRQUM3QixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLEVBQUU7UUFDRixNQUFNO1FBQ04seUJBQXlCO1FBQ3pCLGlCQUFpQjtRQUNqQixrQkFBa0I7UUFDbEIsS0FBSztRQUNMLFlBQVk7UUFDWixnQ0FBZ0M7UUFDaEMsK0JBQStCO1FBQy9CLG9DQUFvQztRQUNwQyxjQUFjO1FBQ2QsZUFBZTtRQUNmLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsc0JBQXNCO1FBQ3RCLFVBQVU7UUFDVixtQkFBbUI7S0FDcEIsRUFDRCxFQUFFLENBQ0gsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsNEJBQTRCLENBQzFDLEdBQVcsRUFDWCxTQUFrQixFQUNsQixLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFFbkMsT0FBTyxtQkFBbUIsQ0FDeEIsR0FBRyxFQUNIO1FBQ0UsZ0JBQWdCO1FBQ2hCLDZCQUE2QjtRQUM3QixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLEVBQUU7UUFDRixNQUFNO1FBQ04seUJBQXlCO1FBQ3pCLGlCQUFpQjtRQUNqQixrQkFBa0I7UUFDbEIsS0FBSztRQUNMLFlBQVk7UUFDWixnQ0FBZ0M7UUFDaEMsK0JBQStCO1FBQy9CLG9DQUFvQztRQUNwQyxjQUFjO1FBQ2QsZUFBZTtRQUNmLGdCQUFnQjtRQUNoQixzQkFBc0I7UUFDdEIsZ0JBQWdCO1FBQ2hCLFVBQVU7UUFDVixtQkFBbUI7S0FDcEIsRUFDRCxFQUFFLEVBQ0YsS0FBSyxFQUNMLFNBQVMsRUFDVCxLQUFLLENBQ2MsQ0FBQztBQUN4QixDQUFDIn0=
@@ -0,0 +1,7 @@
1
+ import { type L2BlockSource } from '@aztec/circuit-types';
2
+ import { type TelemetryClient } from '@aztec/telemetry-client';
3
+ import { type WorldStateSynchronizer } from '@aztec/world-state';
4
+ import { type ProverClientConfig } from '../config.js';
5
+ import { TxProver } from './tx-prover.js';
6
+ export declare function createProverClient(config: ProverClientConfig, worldStateSynchronizer: WorldStateSynchronizer, blockSource: L2BlockSource, telemetry?: TelemetryClient): Promise<TxProver> | undefined;
7
+ //# sourceMappingURL=factory.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/tx-prover/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,kBAAkB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,aAAa,EAC1B,SAAS,GAAE,eAA2C,iCAGvD"}
@@ -0,0 +1,6 @@
1
+ import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
2
+ import { TxProver } from './tx-prover.js';
3
+ export function createProverClient(config, worldStateSynchronizer, blockSource, telemetry = new NoopTelemetryClient()) {
4
+ return config.disableProver ? undefined : TxProver.new(config, worldStateSynchronizer, blockSource, telemetry);
5
+ }
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC1wcm92ZXIvZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUluRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFMUMsTUFBTSxVQUFVLGtCQUFrQixDQUNoQyxNQUEwQixFQUMxQixzQkFBOEMsRUFDOUMsV0FBMEIsRUFDMUIsWUFBNkIsSUFBSSxtQkFBbUIsRUFBRTtJQUV0RCxPQUFPLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsc0JBQXNCLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQ2pILENBQUMifQ==
@@ -1,6 +1,6 @@
1
- import { type ProcessedTx } from '@aztec/circuit-types';
1
+ import { type L2BlockSource, type ProcessedTx } from '@aztec/circuit-types';
2
2
  import { type BlockResult, type ProverClient, type ProvingJobSource, type ProvingTicket } from '@aztec/circuit-types/interfaces';
3
- import { type Fr, type GlobalVariables, type Header } from '@aztec/circuits.js';
3
+ import { type Fr, type GlobalVariables } from '@aztec/circuits.js';
4
4
  import { type TelemetryClient } from '@aztec/telemetry-client';
5
5
  import { type WorldStateSynchronizer } from '@aztec/world-state';
6
6
  import { type ProverClientConfig } from '../config.js';
@@ -32,7 +32,7 @@ export declare class TxProver implements ProverClient {
32
32
  * @param worldStateSynchronizer - An instance of the world state
33
33
  * @returns An instance of the prover, constructed and started.
34
34
  */
35
- static new(config: ProverClientConfig, worldStateSynchronizer: WorldStateSynchronizer, telemetry: TelemetryClient, initialHeader?: Header): Promise<TxProver>;
35
+ static new(config: ProverClientConfig, worldStateSynchronizer: WorldStateSynchronizer, blockSource: L2BlockSource, telemetry: TelemetryClient): Promise<TxProver>;
36
36
  private static buildCircuitProver;
37
37
  /**
38
38
  * Cancels any block that is currently being built and prepares for a new one to be built
@@ -1 +1 @@
1
- {"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAEnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEhF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD;;GAEG;AACH,qBAAa,QAAS,YAAW,YAAY;IAMzC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IARhB,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAgBD,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IASjB;;;;;;OAMG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,eAAe,EAC1B,aAAa,CAAC,EAAE,MAAM;mBAeH,kBAAkB;IAevC;;;;;OAKG;IACU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC;IAMzB;;;OAGG;IACI,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C;;OAEG;IACI,WAAW,IAAI,IAAI;IAI1B;;OAEG;IACI,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC;IAI5C;;;OAGG;IACI,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,mBAAmB,IAAI,gBAAgB;CAG/C"}
1
+ {"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAEnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD;;GAEG;AACH,qBAAa,QAAS,YAAW,YAAY;IAMzC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IARhB,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAUD,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IASjB;;;;;;OAMG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,aAAa,EAC1B,SAAS,EAAE,eAAe;mBAeP,kBAAkB;IAevC;;;;;OAKG;IACU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC;IAMzB;;;OAGG;IACI,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C;;OAEG;IACI,WAAW,IAAI,IAAI;IAI1B;;OAEG;IACI,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC;IAI5C;;;OAGG;IACI,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,mBAAmB,IAAI,gBAAgB;CAG/C"}
@@ -7,14 +7,14 @@ import { ProverAgent } from '../prover-agent/prover-agent.js';
7
7
  * A prover accepting individual transaction requests
8
8
  */
9
9
  export class TxProver {
10
- constructor(config, worldStateSynchronizer, telemetry, agent, initialHeader) {
10
+ constructor(config, worldStateSynchronizer, telemetry, agent) {
11
11
  this.config = config;
12
12
  this.worldStateSynchronizer = worldStateSynchronizer;
13
13
  this.telemetry = telemetry;
14
14
  this.agent = agent;
15
15
  this.running = false;
16
16
  this.queue = new MemoryProvingQueue(config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
17
- this.orchestrator = new ProvingOrchestrator(worldStateSynchronizer.getLatest(), this.queue, telemetry, initialHeader);
17
+ this.orchestrator = new ProvingOrchestrator(worldStateSynchronizer.getLatest(), this.queue, telemetry);
18
18
  }
19
19
  async updateProverConfig(config) {
20
20
  const newConfig = { ...this.config, ...config };
@@ -60,11 +60,11 @@ export class TxProver {
60
60
  * @param worldStateSynchronizer - An instance of the world state
61
61
  * @returns An instance of the prover, constructed and started.
62
62
  */
63
- static async new(config, worldStateSynchronizer, telemetry, initialHeader) {
63
+ static async new(config, worldStateSynchronizer, blockSource, telemetry) {
64
64
  const agent = config.proverAgentEnabled
65
65
  ? new ProverAgent(await TxProver.buildCircuitProver(config, telemetry), config.proverAgentConcurrency, config.proverAgentPollInterval)
66
66
  : undefined;
67
- const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent, initialHeader);
67
+ const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent);
68
68
  await prover.start();
69
69
  return prover;
70
70
  }
@@ -118,4 +118,4 @@ export class TxProver {
118
118
  return this.queue;
119
119
  }
120
120
  }
121
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFVM0UsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFLdkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDN0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFLbkIsWUFDVSxNQUEwQixFQUMxQixzQkFBOEMsRUFDOUMsU0FBMEIsRUFDMUIsS0FBbUIsRUFDM0IsYUFBc0I7UUFKZCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUMxQiwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQXdCO1FBQzlDLGNBQVMsR0FBVCxTQUFTLENBQWlCO1FBQzFCLFVBQUssR0FBTCxLQUFLLENBQWM7UUFOckIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQVN0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksa0JBQWtCLENBQUMsTUFBTSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQy9GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxtQkFBbUIsQ0FDekMsc0JBQXNCLENBQUMsU0FBUyxFQUFFLEVBQ2xDLElBQUksQ0FBQyxLQUFLLEVBQ1YsU0FBUyxFQUNULGFBQWEsQ0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxNQUFtQztRQUMxRCxNQUFNLFNBQVMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE1B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
121
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFVM0UsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFLdkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDN0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFLbkIsWUFDVSxNQUEwQixFQUMxQixzQkFBOEMsRUFDOUMsU0FBMEIsRUFDMUIsS0FBbUI7UUFIbkIsV0FBTSxHQUFOLE1BQU0sQ0FBb0I7UUFDMUIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUF3QjtRQUM5QyxjQUFTLEdBQVQsU0FBUyxDQUFpQjtRQUMxQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBTnJCLFlBQU8sR0FBRyxLQUFLLENBQUM7UUFRdEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQUMvRixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksbUJBQW1CLENBQUMsc0JBQXNCLENBQUMsU0FBUyxFQUFFLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQztJQUN6RyxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLE1BQW1DO1FBQzFELE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsTUFBTSxFQUFFLENBQUM7UUFFaEQsSUFB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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-client",
3
- "version": "0.46.7",
3
+ "version": "0.47.1",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -58,15 +58,15 @@
58
58
  ]
59
59
  },
60
60
  "dependencies": {
61
- "@aztec/bb-prover": "0.46.7",
62
- "@aztec/circuit-types": "0.46.7",
63
- "@aztec/circuits.js": "0.46.7",
64
- "@aztec/foundation": "0.46.7",
65
- "@aztec/kv-store": "0.46.7",
66
- "@aztec/noir-protocol-circuits-types": "0.46.7",
67
- "@aztec/simulator": "0.46.7",
68
- "@aztec/telemetry-client": "0.46.7",
69
- "@aztec/world-state": "0.46.7",
61
+ "@aztec/bb-prover": "0.47.1",
62
+ "@aztec/circuit-types": "0.47.1",
63
+ "@aztec/circuits.js": "0.47.1",
64
+ "@aztec/foundation": "0.47.1",
65
+ "@aztec/kv-store": "0.47.1",
66
+ "@aztec/noir-protocol-circuits-types": "0.47.1",
67
+ "@aztec/simulator": "0.47.1",
68
+ "@aztec/telemetry-client": "0.47.1",
69
+ "@aztec/world-state": "0.47.1",
70
70
  "@noir-lang/types": "portal:../../noir/packages/types",
71
71
  "commander": "^12.1.0",
72
72
  "lodash.chunk": "^4.2.0",
package/src/config.ts CHANGED
@@ -14,6 +14,8 @@ export type ProverClientConfig = ProverConfig & {
14
14
  bbWorkingDirectory: string;
15
15
  /** The path to the bb binary */
16
16
  bbBinaryPath: string;
17
+ /** True to disable proving altogether. */
18
+ disableProver: boolean;
17
19
  };
18
20
 
19
21
  /**
@@ -28,6 +30,7 @@ export function getProverEnvVars(): ProverClientConfig {
28
30
  ACVM_BINARY_PATH = '',
29
31
  BB_WORKING_DIRECTORY = tmpdir(),
30
32
  BB_BINARY_PATH = '',
33
+ PROVER_DISABLED = '',
31
34
  /** @deprecated */
32
35
  PROVER_AGENTS = '1',
33
36
  PROVER_AGENT_ENABLED = '1',
@@ -44,6 +47,7 @@ export function getProverEnvVars(): ProverClientConfig {
44
47
  const proverAgentPollInterval = safeParseNumber(PROVER_AGENT_POLL_INTERVAL_MS, 100);
45
48
  const proverJobTimeoutMs = safeParseNumber(PROVER_JOB_TIMEOUT_MS, 60000);
46
49
  const proverJobPollIntervalMs = safeParseNumber(PROVER_JOB_POLL_INTERVAL_MS, 1000);
50
+ const disableProver = ['1', 'true'].includes(PROVER_DISABLED);
47
51
 
48
52
  return {
49
53
  acvmWorkingDirectory: ACVM_WORKING_DIRECTORY,
@@ -51,6 +55,7 @@ export function getProverEnvVars(): ProverClientConfig {
51
55
  bbBinaryPath: BB_BINARY_PATH,
52
56
  bbWorkingDirectory: BB_WORKING_DIRECTORY,
53
57
  realProofs,
58
+ disableProver,
54
59
  proverAgentEnabled,
55
60
  proverAgentPollInterval,
56
61
  proverAgentConcurrency,
package/src/index.ts CHANGED
@@ -2,3 +2,4 @@ export { ProverClient } from '@aztec/circuit-types';
2
2
 
3
3
  export * from './tx-prover/tx-prover.js';
4
4
  export * from './config.js';
5
+ export * from './tx-prover/factory.js';
@@ -96,12 +96,12 @@ export async function getSimulationProvider(
96
96
  return new WASMSimulator();
97
97
  }
98
98
 
99
- export const makeBloatedProcessedTx = async (builderDb: MerkleTreeOperations, seed = 0x1) => {
99
+ export const makeBloatedProcessedTx = (builderDb: MerkleTreeOperations, seed = 0x1) => {
100
100
  seed *= MAX_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
101
101
  const tx = mockTx(seed);
102
102
  const kernelOutput = KernelCircuitPublicInputs.empty();
103
103
  kernelOutput.constants.vkTreeRoot = getVKTreeRoot();
104
- kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
104
+ kernelOutput.constants.historicalHeader = builderDb.getInitialHeader();
105
105
  kernelOutput.end.publicDataUpdateRequests = makeTuple(
106
106
  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
107
107
  i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20),
@@ -127,8 +127,8 @@ export const makeBloatedProcessedTx = async (builderDb: MerkleTreeOperations, se
127
127
  return processedTx;
128
128
  };
129
129
 
130
- export const makeEmptyProcessedTx = async (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => {
131
- const header = await builderDb.buildInitialHeader();
130
+ export const makeEmptyProcessedTx = (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => {
131
+ const header = builderDb.getInitialHeader();
132
132
  return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version, getVKTreeRoot());
133
133
  };
134
134
 
@@ -178,6 +178,5 @@ export const makeGlobals = (blockNumber: number) => {
178
178
  );
179
179
  };
180
180
 
181
- export const makeEmptyProcessedTestTx = (builderDb: MerkleTreeOperations): Promise<ProcessedTx> => {
182
- return makeEmptyProcessedTx(builderDb, Fr.ZERO, Fr.ZERO);
183
- };
181
+ export const makeEmptyProcessedTestTx = (builderDb: MerkleTreeOperations): ProcessedTx =>
182
+ makeEmptyProcessedTx(builderDb, Fr.ZERO, Fr.ZERO);
@@ -4,6 +4,7 @@ import {
4
4
  type BlockResult,
5
5
  type ProcessedTx,
6
6
  type ProvingTicket,
7
+ type PublicExecutionRequest,
7
8
  type ServerCircuitProver,
8
9
  type Tx,
9
10
  type TxValidator,
@@ -14,7 +15,6 @@ import { type DebugLogger } from '@aztec/foundation/log';
14
15
  import { openTmpStore } from '@aztec/kv-store/utils';
15
16
  import {
16
17
  type ContractsDataSourcePublicDB,
17
- type PublicExecutionRequest,
18
18
  type PublicExecutionResult,
19
19
  PublicExecutionResultBuilder,
20
20
  type PublicExecutor,
@@ -171,7 +171,7 @@ export class TestContext {
171
171
  : [...tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall];
172
172
  for (const request of allCalls) {
173
173
  if (execution.contractAddress.equals(request.contractAddress)) {
174
- const result = PublicExecutionResultBuilder.fromPublicCallRequest({ request }).build({
174
+ const result = PublicExecutionResultBuilder.fromPublicExecutionRequest({ request }).build({
175
175
  startGasLeft: availableGas,
176
176
  endGasLeft: availableGas,
177
177
  transactionFee,
@@ -31,7 +31,6 @@ import {
31
31
  type BaseRollupInputs,
32
32
  Fr,
33
33
  type GlobalVariables,
34
- type Header,
35
34
  type KernelCircuitPublicInputs,
36
35
  L1_TO_L2_MSG_SUBTREE_HEIGHT,
37
36
  L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
@@ -98,12 +97,7 @@ export class ProvingOrchestrator {
98
97
 
99
98
  public readonly tracer: Tracer;
100
99
 
101
- constructor(
102
- private db: MerkleTreeOperations,
103
- private prover: ServerCircuitProver,
104
- telemetryClient: TelemetryClient,
105
- private initialHeader?: Header,
106
- ) {
100
+ constructor(private db: MerkleTreeOperations, private prover: ServerCircuitProver, telemetryClient: TelemetryClient) {
107
101
  this.tracer = telemetryClient.getTracer('ProvingOrchestrator');
108
102
  }
109
103
 
@@ -131,11 +125,6 @@ export class ProvingOrchestrator {
131
125
  globalVariables: GlobalVariables,
132
126
  l1ToL2Messages: Fr[],
133
127
  ): Promise<ProvingTicket> {
134
- // Create initial header if not done so yet
135
- if (!this.initialHeader) {
136
- this.initialHeader = await this.db.buildInitialHeader();
137
- }
138
-
139
128
  if (!Number.isInteger(numTxs) || numTxs < 2) {
140
129
  throw new Error(`Length of txs for the block should be at least two (got ${numTxs})`);
141
130
  }
@@ -268,7 +257,7 @@ export class ProvingOrchestrator {
268
257
  // base rollup inputs
269
258
  // Then enqueue the proving of all the transactions
270
259
  const unprovenPaddingTx = makeEmptyProcessedTx(
271
- this.initialHeader ?? (await this.db.buildInitialHeader()),
260
+ this.db.getInitialHeader(),
272
261
  this.provingState.globalVariables.chainId,
273
262
  this.provingState.globalVariables.version,
274
263
  getVKTreeRoot(),
@@ -564,7 +553,7 @@ export class ProvingOrchestrator {
564
553
 
565
554
  const getBaseInputsEmptyTx = async () => {
566
555
  const inputs = {
567
- header: await this.db.buildInitialHeader(),
556
+ header: this.db.getInitialHeader(),
568
557
  chainId: tx.data.constants.globalVariables.chainId,
569
558
  version: tx.data.constants.globalVariables.version,
570
559
  vkTreeRoot: tx.data.constants.vkTreeRoot,
@@ -62,10 +62,16 @@ export class ProverAgent {
62
62
  return;
63
63
  }
64
64
 
65
- const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
66
- this.inFlightPromises.set(job.id, promise);
65
+ try {
66
+ const promise = this.work(jobSource, job).finally(() => this.inFlightPromises.delete(job.id));
67
+ this.inFlightPromises.set(job.id, promise);
68
+ } catch (err) {
69
+ this.log.warn(
70
+ `Error processing job! type=${ProvingRequestType[job.request.type]}: ${err}. ${(err as Error).stack}`,
71
+ );
72
+ }
67
73
  } catch (err) {
68
- this.log.warn(`Error processing job: ${err}`);
74
+ // no-op
69
75
  }
70
76
  }
71
77
  }, this.pollIntervalMs);
@@ -18,6 +18,7 @@ import {
18
18
  RootParityInputs,
19
19
  RootRollupInputs,
20
20
  RootRollupPublicInputs,
21
+ TubeInputs,
21
22
  VerificationKeyData,
22
23
  } from '@aztec/circuits.js';
23
24
  import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
@@ -29,25 +30,26 @@ export function createProvingJobSourceServer(queue: ProvingJobSource): JsonRpcSe
29
30
  return new JsonRpcServer(
30
31
  queue,
31
32
  {
32
- Header,
33
- Fr,
34
33
  AvmCircuitInputs,
35
- BaseParityInputs,
36
34
  BaseOrMergeRollupPublicInputs,
35
+ BaseParityInputs,
37
36
  BaseRollupInputs,
37
+ Fr,
38
+ Header,
39
+ KernelCircuitPublicInputs,
38
40
  MergeRollupInputs,
39
41
  ParityPublicInputs,
40
42
  Proof,
41
- RootParityInput,
42
- RootParityInputs,
43
- RootRollupInputs,
44
- RootRollupPublicInputs,
43
+ ProvingError,
45
44
  PublicKernelCircuitPrivateInputs,
46
45
  PublicKernelCircuitPublicInputs,
47
46
  PublicKernelTailCircuitPrivateInputs,
48
- KernelCircuitPublicInputs,
49
- ProvingError,
50
47
  RecursiveProof,
48
+ RootParityInput,
49
+ RootParityInputs,
50
+ RootRollupInputs,
51
+ RootRollupPublicInputs,
52
+ TubeInputs,
51
53
  VerificationKeyData,
52
54
  },
53
55
  {},
@@ -62,25 +64,26 @@ export function createProvingJobSourceClient(
62
64
  return createJsonRpcClient(
63
65
  url,
64
66
  {
65
- Header,
66
- Fr,
67
67
  AvmCircuitInputs,
68
- BaseParityInputs,
69
68
  BaseOrMergeRollupPublicInputs,
69
+ BaseParityInputs,
70
70
  BaseRollupInputs,
71
+ Fr,
72
+ Header,
73
+ KernelCircuitPublicInputs,
71
74
  MergeRollupInputs,
72
75
  ParityPublicInputs,
73
76
  Proof,
74
- RootParityInput,
75
- RootParityInputs,
76
- RootRollupInputs,
77
- RootRollupPublicInputs,
77
+ ProvingError,
78
78
  PublicKernelCircuitPrivateInputs,
79
79
  PublicKernelCircuitPublicInputs,
80
80
  PublicKernelTailCircuitPrivateInputs,
81
- KernelCircuitPublicInputs,
82
- ProvingError,
83
81
  RecursiveProof,
82
+ RootParityInput,
83
+ RootParityInputs,
84
+ RootRollupPublicInputs,
85
+ RootRollupInputs,
86
+ TubeInputs,
84
87
  VerificationKeyData,
85
88
  },
86
89
  {},
@@ -0,0 +1,16 @@
1
+ import { type L2BlockSource } from '@aztec/circuit-types';
2
+ import { type TelemetryClient } from '@aztec/telemetry-client';
3
+ import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
4
+ import { type WorldStateSynchronizer } from '@aztec/world-state';
5
+
6
+ import { type ProverClientConfig } from '../config.js';
7
+ import { TxProver } from './tx-prover.js';
8
+
9
+ export function createProverClient(
10
+ config: ProverClientConfig,
11
+ worldStateSynchronizer: WorldStateSynchronizer,
12
+ blockSource: L2BlockSource,
13
+ telemetry: TelemetryClient = new NoopTelemetryClient(),
14
+ ) {
15
+ return config.disableProver ? undefined : TxProver.new(config, worldStateSynchronizer, blockSource, telemetry);
16
+ }
@@ -1,5 +1,5 @@
1
1
  import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
2
- import { type ProcessedTx } from '@aztec/circuit-types';
2
+ import { type L2BlockSource, type ProcessedTx } from '@aztec/circuit-types';
3
3
  import {
4
4
  type BlockResult,
5
5
  type ProverClient,
@@ -7,7 +7,7 @@ import {
7
7
  type ProvingTicket,
8
8
  type ServerCircuitProver,
9
9
  } from '@aztec/circuit-types/interfaces';
10
- import { type Fr, type GlobalVariables, type Header } from '@aztec/circuits.js';
10
+ import { type Fr, type GlobalVariables } from '@aztec/circuits.js';
11
11
  import { NativeACVMSimulator } from '@aztec/simulator';
12
12
  import { type TelemetryClient } from '@aztec/telemetry-client';
13
13
  import { type WorldStateSynchronizer } from '@aztec/world-state';
@@ -30,15 +30,9 @@ export class TxProver implements ProverClient {
30
30
  private worldStateSynchronizer: WorldStateSynchronizer,
31
31
  private telemetry: TelemetryClient,
32
32
  private agent?: ProverAgent,
33
- initialHeader?: Header,
34
33
  ) {
35
34
  this.queue = new MemoryProvingQueue(config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
36
- this.orchestrator = new ProvingOrchestrator(
37
- worldStateSynchronizer.getLatest(),
38
- this.queue,
39
- telemetry,
40
- initialHeader,
41
- );
35
+ this.orchestrator = new ProvingOrchestrator(worldStateSynchronizer.getLatest(), this.queue, telemetry);
42
36
  }
43
37
 
44
38
  async updateProverConfig(config: Partial<ProverClientConfig>): Promise<void> {
@@ -96,8 +90,8 @@ export class TxProver implements ProverClient {
96
90
  public static async new(
97
91
  config: ProverClientConfig,
98
92
  worldStateSynchronizer: WorldStateSynchronizer,
93
+ blockSource: L2BlockSource,
99
94
  telemetry: TelemetryClient,
100
- initialHeader?: Header,
101
95
  ) {
102
96
  const agent = config.proverAgentEnabled
103
97
  ? new ProverAgent(
@@ -107,7 +101,7 @@ export class TxProver implements ProverClient {
107
101
  )
108
102
  : undefined;
109
103
 
110
- const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent, initialHeader);
104
+ const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent);
111
105
  await prover.start();
112
106
  return prover;
113
107
  }