@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.
Files changed (32) hide show
  1. package/dest/config.js +2 -2
  2. package/dest/mocks/test_context.d.ts +2 -1
  3. package/dest/mocks/test_context.d.ts.map +1 -1
  4. package/dest/mocks/test_context.js +6 -3
  5. package/dest/orchestrator/block-proving-state.d.ts +9 -10
  6. package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
  7. package/dest/orchestrator/block-proving-state.js +70 -52
  8. package/dest/orchestrator/epoch-proving-state.d.ts +5 -5
  9. package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
  10. package/dest/orchestrator/epoch-proving-state.js +8 -29
  11. package/dest/orchestrator/orchestrator.d.ts +3 -2
  12. package/dest/orchestrator/orchestrator.d.ts.map +1 -1
  13. package/dest/orchestrator/orchestrator.js +20 -33
  14. package/dest/prover-agent/rpc.d.ts +1 -1
  15. package/dest/prover-agent/rpc.d.ts.map +1 -1
  16. package/dest/prover-agent/rpc.js +6 -6
  17. package/dest/prover-client/server-epoch-prover.d.ts +1 -1
  18. package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
  19. package/dest/prover-client/server-epoch-prover.js +3 -3
  20. package/dest/proving_broker/rpc.d.ts +3 -3
  21. package/dest/proving_broker/rpc.d.ts.map +1 -1
  22. package/dest/proving_broker/rpc.js +7 -7
  23. package/dest/test/mock_prover.d.ts +1 -1
  24. package/package.json +11 -11
  25. package/src/config.ts +1 -1
  26. package/src/mocks/test_context.ts +5 -2
  27. package/src/orchestrator/block-proving-state.ts +81 -57
  28. package/src/orchestrator/epoch-proving-state.ts +16 -45
  29. package/src/orchestrator/orchestrator.ts +38 -64
  30. package/src/prover-agent/rpc.ts +5 -5
  31. package/src/prover-client/server-epoch-prover.ts +6 -2
  32. package/src/proving_broker/rpc.ts +13 -6
@@ -1,6 +1,6 @@
1
1
  import { L2Block, type ProcessedTx, type ServerCircuitProver, type Tx } from '@aztec/circuit-types';
2
2
  import { type EpochProver, type ForkMerkleTreeOperations } from '@aztec/circuit-types/interfaces';
3
- import { type AppendOnlyTreeSnapshot, BlockHeader, Fr, GlobalVariables } from '@aztec/circuits.js';
3
+ import { type AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables } from '@aztec/circuits.js';
4
4
  import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
5
5
  /**
6
6
  * Implements an event driven proving scheduler to build the recursive proof tree. The idea being:
@@ -35,7 +35,7 @@ export declare class ProvingOrchestrator implements EpochProver {
35
35
  * @param l1ToL2Messages - The l1 to l2 messages for the block
36
36
  * @returns A proving ticket, containing a promise notifying of proving completion
37
37
  */
38
- startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void>;
38
+ startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], previousBlockHeader: BlockHeader): Promise<void>;
39
39
  /**
40
40
  * The interface to add simulated transactions to the scheduler. This can only be called once per block.
41
41
  * @param txs - The transactions to be proven
@@ -79,6 +79,7 @@ export declare class ProvingOrchestrator implements EpochProver {
79
79
  * @param job - The actual job, returns a promise notifying of the job's completion
80
80
  */
81
81
  private deferredProving;
82
+ private prepareBaseParityInputs;
82
83
  private prepareBaseRollupInputs;
83
84
  private enqueueBaseRollup;
84
85
  private getOrEnqueueTube;
@@ -1 +1 @@
1
- {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,KAAK,WAAW,EAChB,KAAK,mBAAmB,EACxB,KAAK,EAAE,EAER,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,wBAAwB,EAG9B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,sBAAsB,EAE3B,WAAW,EAEX,EAAE,EACF,eAAe,EAUhB,MAAM,oBAAoB,CAAC;AAkB5B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAoBjC;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAoB,YAAW,WAAW;IASnD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,kBAAkB,CAAyB;IAEnD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,GAAG,CAAqD;gBAGtD,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,mBAAmB,EAClB,QAAQ,GAAE,EAAY,EACvC,eAAe,GAAE,eAAsC;IAKzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,WAAW,IAAI,EAAE;IAIjB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAW1F;;;;;OAKG;IAIU,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE;IA0FjF;;;OAGG;IAIU,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDtD;;;OAGG;IAEI,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE;IAclC;;;OAGG;IAIU,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBnG,oDAAoD;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;YAQzB,UAAU;cAmCR,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB;IAWvG;;OAEG;IACI,MAAM;IAQb;;OAEG;IACU,aAAa;;;;IAoB1B;;;;OAIG;YACW,kBAAkB;IAShC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAmCrC,OAAO,CAAC,iBAAiB;IA+CzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,sBAAsB;IA2D9B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,wBAAwB;IA4BhC,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,mBAAmB;IA8B3B,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,8BAA8B;IAyBtC,OAAO,CAAC,mCAAmC;IAa3C,OAAO,CAAC,yBAAyB;IASjC;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IA8CjB,OAAO,CAAC,4BAA4B;CAWrC"}
1
+ {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,KAAK,WAAW,EAChB,KAAK,mBAAmB,EACxB,KAAK,EAAE,EAER,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,wBAAwB,EAG9B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,KAAK,sBAAsB,EAE3B,KAAK,WAAW,EAChB,EAAE,EACF,KAAK,eAAe,EAQrB,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAoBjC;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAoB,YAAW,WAAW;IASnD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,kBAAkB,CAAyB;IAEnD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,GAAG,CAAqD;gBAGtD,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,mBAAmB,EAClB,QAAQ,GAAE,EAAY,EACvC,eAAe,GAAE,eAAsC;IAKzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,WAAW,IAAI,EAAE;IAIjB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAW1F;;;;;OAKG;IAIU,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,mBAAmB,EAAE,WAAW;IAyCnH;;;OAGG;IAIU,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDtD;;;OAGG;IAEI,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE;IAclC;;;OAGG;IAIU,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBnG,oDAAoD;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;YAQzB,UAAU;cAmCR,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB;IAWvG;;OAEG;IACI,MAAM;IAQb;;OAEG;IACU,aAAa;;;;IAoB1B;;;;OAIG;YACW,kBAAkB;IAShC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YAwDT,uBAAuB;YA+BvB,uBAAuB;IAmCrC,OAAO,CAAC,iBAAiB;IA+CzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,sBAAsB;IA2D9B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,wBAAwB;IA4BhC,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,mBAAmB;IA8B3B,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,8BAA8B;IAyBtC,OAAO,CAAC,mCAAmC;IAa3C,OAAO,CAAC,yBAAyB;IASjC;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IA8CjB,OAAO,CAAC,4BAA4B;CAWrC"}
@@ -1,12 +1,12 @@
1
1
  import { __esDecorate, __runInitializers } from "tslib";
2
2
  import { L2Block, MerkleTreeId, toNumBlobFields, } from '@aztec/circuit-types';
3
- import { AVM_PROOF_LENGTH_IN_FIELDS, AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, BaseParityInputs, BlockHeader, ContentCommitment, Fr, GlobalVariables, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, PartialStateReference, StateReference, VerificationKeyData, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
3
+ import { AVM_PROOF_LENGTH_IN_FIELDS, AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, BaseParityInputs, Fr, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, VerificationKeyData, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
4
4
  import { EmptyBlockRootRollupInputs, PrivateBaseRollupInputs, SingleTxBlockRootRollupInputs, TubeInputs, } from '@aztec/circuits.js/rollup';
5
- import { makeTuple } from '@aztec/foundation/array';
6
5
  import { padArrayEnd } from '@aztec/foundation/collection';
7
6
  import { AbortError } from '@aztec/foundation/error';
8
7
  import { createLogger } from '@aztec/foundation/log';
9
8
  import { promiseWithResolvers } from '@aztec/foundation/promise';
9
+ import { assertLength } from '@aztec/foundation/serialize';
10
10
  import { pushTestData } from '@aztec/foundation/testing';
11
11
  import { elapsed } from '@aztec/foundation/timer';
12
12
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
@@ -75,7 +75,7 @@ let ProvingOrchestrator = (() => {
75
75
  * @param l1ToL2Messages - The l1 to l2 messages for the block
76
76
  * @returns A proving ticket, containing a promise notifying of proving completion
77
77
  */
78
- async startNewBlock(globalVariables, l1ToL2Messages) {
78
+ async startNewBlock(globalVariables, l1ToL2Messages, previousBlockHeader) {
79
79
  if (!this.provingState) {
80
80
  throw new Error(`Invalid proving state, call startNewEpoch before starting a block`);
81
81
  }
@@ -87,37 +87,11 @@ let ProvingOrchestrator = (() => {
87
87
  const db = await this.dbProvider.fork(globalVariables.blockNumber.toNumber() - 1);
88
88
  this.dbs.set(globalVariables.blockNumber.toNumber(), db);
89
89
  // we start the block by enqueueing all of the base parity circuits
90
- let baseParityInputs = [];
91
- let l1ToL2MessagesPadded;
92
- try {
93
- l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
94
- }
95
- catch (err) {
96
- throw new Error('Too many L1 to L2 messages');
97
- }
98
- baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()));
99
- const messageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
100
- const newL1ToL2MessageTreeRootSiblingPathArray = await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db);
101
- const newL1ToL2MessageTreeRootSiblingPath = makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, i => i < newL1ToL2MessageTreeRootSiblingPathArray.length ? newL1ToL2MessageTreeRootSiblingPathArray[i] : Fr.ZERO, 0);
102
- // Update the local trees to include the new l1 to l2 messages
103
- await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
104
- const messageTreeSnapshotAfterInsertion = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
90
+ const { l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, baseParityInputs } = await this.prepareBaseParityInputs(l1ToL2Messages, db);
105
91
  // Get archive snapshot before this block lands
106
- const startArchiveSnapshot = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
92
+ const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
107
93
  const newArchiveSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE, db);
108
- const previousBlockHash = await db.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(startArchiveSnapshot.nextAvailableLeafIndex - 1));
109
- const partial = new PartialStateReference(await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE, db), await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE, db), await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE, db));
110
- const state = new StateReference(messageTreeSnapshot, partial);
111
- // TODO: Construct the full previousBlockHeader.
112
- const previousBlockHeader = BlockHeader.from({
113
- lastArchive: startArchiveSnapshot,
114
- contentCommitment: ContentCommitment.empty(),
115
- state,
116
- globalVariables: GlobalVariables.empty(),
117
- totalFees: Fr.ZERO,
118
- totalManaUsed: Fr.ZERO,
119
- });
120
- const blockProvingState = this.provingState.startNewBlock(globalVariables, l1ToL2MessagesPadded, messageTreeSnapshot, newL1ToL2MessageTreeRootSiblingPath, messageTreeSnapshotAfterInsertion, startArchiveSnapshot, newArchiveSiblingPath, previousBlockHeader, previousBlockHash);
94
+ const blockProvingState = this.provingState.startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchive, newArchiveSiblingPath, previousBlockHeader);
121
95
  // Enqueue base parity circuits for the block
122
96
  for (let i = 0; i < baseParityInputs.length; i++) {
123
97
  this.enqueueBaseParityCircuit(blockProvingState, baseParityInputs[i], i);
@@ -337,6 +311,19 @@ let ProvingOrchestrator = (() => {
337
311
  // let the callstack unwind before adding the job to the queue
338
312
  setImmediate(safeJob);
339
313
  }
314
+ async prepareBaseParityInputs(l1ToL2Messages, db) {
315
+ const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 'Too many L1 to L2 messages');
316
+ const baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()));
317
+ const l1ToL2MessageSubtreeSiblingPath = assertLength(await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db), L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH);
318
+ // Update the local trees to include the new l1 to l2 messages
319
+ await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
320
+ const l1ToL2MessageTreeSnapshotAfterInsertion = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
321
+ return {
322
+ l1ToL2MessageSubtreeSiblingPath,
323
+ l1ToL2MessageTreeSnapshotAfterInsertion,
324
+ baseParityInputs,
325
+ };
326
+ }
340
327
  // Updates the merkle trees for a transaction. The first enqueued job for a transaction
341
328
  async prepareBaseRollupInputs(provingState, tx) {
342
329
  if (!provingState.verifyState() || !provingState.spongeBlobState) {
@@ -698,4 +685,4 @@ let ProvingOrchestrator = (() => {
698
685
  _a;
699
686
  })();
700
687
  export { ProvingOrchestrator };
701
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
688
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { type ProvingJobSource } from '@aztec/circuit-types';
2
2
  import { type ProverAgent } from './prover-agent.js';
3
3
  export declare function createProvingJobSourceServer(queue: ProvingJobSource): import("@aztec/foundation/json-rpc/server").SafeJsonRpcServer;
4
- export declare function createProvingJobSourceClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, noRetry?: boolean | undefined) => Promise<any>): ProvingJobSource;
4
+ export declare function createProvingJobSourceClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<any>): ProvingJobSource;
5
5
  /**
6
6
  * Wrap a ProverAgent instance with a JSON RPC HTTP server.
7
7
  * @param agent - The Prover Agent
@@ -1 +1 @@
1
- {"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,gBAAgB,EAA0B,MAAM,sBAAsB,CAAC;AAI3G,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,iEAEnE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,wHAA8B,GAAG,gBAAgB,CAE/G;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,iEAE5D"}
1
+ {"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,gBAAgB,EAA0B,MAAM,sBAAsB,CAAC;AAI3G,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,iEAEnE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,2KAAoC,GAAG,gBAAgB,CAErH;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,iEAE5D"}
@@ -1,10 +1,10 @@
1
1
  import { ProverAgentApiSchema, ProvingJobSourceSchema } from '@aztec/circuit-types';
2
- import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
3
- import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
2
+ import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
3
+ import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
4
4
  export function createProvingJobSourceServer(queue) {
5
- return createSafeJsonRpcServer(queue, ProvingJobSourceSchema);
5
+ return createTracedJsonRpcServer(queue, ProvingJobSourceSchema);
6
6
  }
7
- export function createProvingJobSourceClient(url, fetch = makeFetch([1, 2, 3], false)) {
7
+ export function createProvingJobSourceClient(url, fetch = makeTracedFetch([1, 2, 3], false)) {
8
8
  return createSafeJsonRpcClient(url, ProvingJobSourceSchema, false, 'provingJobSource', fetch);
9
9
  }
10
10
  /**
@@ -13,6 +13,6 @@ export function createProvingJobSourceClient(url, fetch = makeFetch([1, 2, 3], f
13
13
  * @returns An JSON-RPC HTTP server
14
14
  */
15
15
  export function createProverAgentRpcServer(agent) {
16
- return createSafeJsonRpcServer(agent, ProverAgentApiSchema);
16
+ return createTracedJsonRpcServer(agent, ProverAgentApiSchema);
17
17
  }
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUF5QixzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNHLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUN2RixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUk1RSxNQUFNLFVBQVUsNEJBQTRCLENBQUMsS0FBdUI7SUFDbEUsT0FBTyx1QkFBdUIsQ0FBQyxLQUFLLEVBQUUsc0JBQXNCLENBQUMsQ0FBQztBQUNoRSxDQUFDO0FBRUQsTUFBTSxVQUFVLDRCQUE0QixDQUFDLEdBQVcsRUFBRSxLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFDM0YsT0FBTyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsc0JBQXNCLEVBQUUsS0FBSyxFQUFFLGtCQUFrQixFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2hHLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLDBCQUEwQixDQUFDLEtBQWtCO0lBQzNELE9BQU8sdUJBQXVCLENBQUMsS0FBSyxFQUFFLG9CQUFvQixDQUFDLENBQUM7QUFDOUQsQ0FBQyJ9
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUF5QixzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNHLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQzVFLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUlyRixNQUFNLFVBQVUsNEJBQTRCLENBQUMsS0FBdUI7SUFDbEUsT0FBTyx5QkFBeUIsQ0FBQyxLQUFLLEVBQUUsc0JBQXNCLENBQUMsQ0FBQztBQUNsRSxDQUFDO0FBRUQsTUFBTSxVQUFVLDRCQUE0QixDQUFDLEdBQVcsRUFBRSxLQUFLLEdBQUcsZUFBZSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFDakcsT0FBTyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsc0JBQXNCLEVBQUUsS0FBSyxFQUFFLGtCQUFrQixFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2hHLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLDBCQUEwQixDQUFDLEtBQWtCO0lBQzNELE9BQU8seUJBQXlCLENBQUMsS0FBSyxFQUFFLG9CQUFvQixDQUFDLENBQUM7QUFDaEUsQ0FBQyJ9
@@ -19,7 +19,7 @@ export declare class ServerEpochProver implements EpochProver {
19
19
  getProverId(): Fr;
20
20
  getBlock(index: number): L2Block;
21
21
  stop(): Promise<void>;
22
- startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void>;
22
+ startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], previousBlockHeader: BlockHeader): Promise<void>;
23
23
  addTxs(txs: ProcessedTx[]): Promise<void>;
24
24
  }
25
25
  //# sourceMappingURL=server-epoch-prover.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"server-epoch-prover.d.ts","sourceRoot":"","sources":["../../src/prover-client/server-epoch-prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAE3F,kEAAkE;AAClE,qBAAa,iBAAkB,YAAW,WAAW;IACvC,OAAO,CAAC,MAAM;IAA6B,OAAO,CAAC,YAAY;gBAAvD,MAAM,EAAE,yBAAyB,EAAU,YAAY,EAAE,mBAAmB;IAEhG,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAI1F,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI;IAGlC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAG3F,aAAa,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,sBAAsB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAGhF,MAAM,IAAI,IAAI;IAGd,WAAW,IAAI,EAAE;IAGjB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAG1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAGpF,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1C"}
1
+ {"version":3,"file":"server-epoch-prover.d.ts","sourceRoot":"","sources":["../../src/prover-client/server-epoch-prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,eAAe,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAE3F,kEAAkE;AAClE,qBAAa,iBAAkB,YAAW,WAAW;IACvC,OAAO,CAAC,MAAM;IAA6B,OAAO,CAAC,YAAY;gBAAvD,MAAM,EAAE,yBAAyB,EAAU,YAAY,EAAE,mBAAmB;IAEhG,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAI1F,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI;IAGlC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAG3F,aAAa,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,sBAAsB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAGhF,MAAM,IAAI,IAAI;IAGd,WAAW,IAAI,EAAE;IAGjB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAG1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CACX,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,mBAAmB,EAAE,WAAW,GAC/B,OAAO,CAAC,IAAI,CAAC;IAGhB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1C"}
@@ -30,11 +30,11 @@ export class ServerEpochProver {
30
30
  await this.facade.stop();
31
31
  await this.orchestrator.stop();
32
32
  }
33
- startNewBlock(globalVariables, l1ToL2Messages) {
34
- return this.orchestrator.startNewBlock(globalVariables, l1ToL2Messages);
33
+ startNewBlock(globalVariables, l1ToL2Messages, previousBlockHeader) {
34
+ return this.orchestrator.startNewBlock(globalVariables, l1ToL2Messages, previousBlockHeader);
35
35
  }
36
36
  addTxs(txs) {
37
37
  return this.orchestrator.addTxs(txs);
38
38
  }
39
39
  }
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLWVwb2NoLXByb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92ZXItY2xpZW50L3NlcnZlci1lcG9jaC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0Esa0VBQWtFO0FBQ2xFLE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsWUFBb0IsTUFBaUMsRUFBVSxZQUFpQztRQUE1RSxXQUFNLEdBQU4sTUFBTSxDQUEyQjtRQUFVLGlCQUFZLEdBQVosWUFBWSxDQUFxQjtJQUFHLENBQUM7SUFFcEcsYUFBYSxDQUFDLFdBQW1CLEVBQUUsZ0JBQXdCLEVBQUUsY0FBc0I7UUFDakYsSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsV0FBVyxFQUFFLGdCQUFnQixFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQy9FLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUNELGlCQUFpQixDQUFDLEdBQVM7UUFDekIsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBQ0QsaUJBQWlCLENBQUMsV0FBbUIsRUFBRSxtQkFBaUM7UUFDdEUsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQy9FLENBQUM7SUFDRCxhQUFhO1FBQ1gsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQzNDLENBQUM7SUFDRCxNQUFNO1FBQ0osSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBQ0QsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBQ0QsUUFBUSxDQUFDLEtBQWE7UUFDcEIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBQ0QsS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDekIsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ2pDLENBQUM7SUFDRCxhQUFhLENBQUMsZUFBZ0MsRUFBRSxjQUFvQjtRQUNsRSxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLGVBQWUsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUMxRSxDQUFDO0lBQ0QsTUFBTSxDQUFDLEdBQWtCO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdkMsQ0FBQztDQUNGIn0=
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLWVwb2NoLXByb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92ZXItY2xpZW50L3NlcnZlci1lcG9jaC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0Esa0VBQWtFO0FBQ2xFLE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsWUFBb0IsTUFBaUMsRUFBVSxZQUFpQztRQUE1RSxXQUFNLEdBQU4sTUFBTSxDQUEyQjtRQUFVLGlCQUFZLEdBQVosWUFBWSxDQUFxQjtJQUFHLENBQUM7SUFFcEcsYUFBYSxDQUFDLFdBQW1CLEVBQUUsZ0JBQXdCLEVBQUUsY0FBc0I7UUFDakYsSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsV0FBVyxFQUFFLGdCQUFnQixFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQy9FLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUNELGlCQUFpQixDQUFDLEdBQVM7UUFDekIsSUFBSSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBQ0QsaUJBQWlCLENBQUMsV0FBbUIsRUFBRSxtQkFBaUM7UUFDdEUsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQy9FLENBQUM7SUFDRCxhQUFhO1FBQ1gsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQzNDLENBQUM7SUFDRCxNQUFNO1FBQ0osSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBQ0QsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBQ0QsUUFBUSxDQUFDLEtBQWE7UUFDcEIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBQ0QsS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDekIsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ2pDLENBQUM7SUFDRCxhQUFhLENBQ1gsZUFBZ0MsRUFDaEMsY0FBb0IsRUFDcEIsbUJBQWdDO1FBRWhDLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsZUFBZSxFQUFFLGNBQWMsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQy9GLENBQUM7SUFDRCxNQUFNLENBQUMsR0FBa0I7UUFDdkIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2QyxDQUFDO0NBQ0YifQ==
@@ -5,7 +5,7 @@ export declare const ProvingJobProducerSchema: ApiSchemaFor<ProvingJobProducer>;
5
5
  export declare const ProvingJobConsumerSchema: ApiSchemaFor<ProvingJobConsumer>;
6
6
  export declare const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker>;
7
7
  export declare function createProvingBrokerServer(broker: ProvingJobBroker): SafeJsonRpcServer;
8
- export declare function createProvingJobBrokerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, noRetry?: boolean | undefined) => Promise<any>): ProvingJobBroker;
9
- export declare function createProvingJobProducerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, noRetry?: boolean | undefined) => Promise<any>): ProvingJobProducer;
10
- export declare function createProvingJobConsumerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, noRetry?: boolean | undefined) => Promise<any>): ProvingJobConsumer;
8
+ export declare function createProvingJobBrokerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<any>): ProvingJobBroker;
9
+ export declare function createProvingJobProducerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<any>): ProvingJobProducer;
10
+ export declare function createProvingJobConsumerClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<any>): ProvingJobConsumer;
11
11
  //# sourceMappingURL=rpc.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/proving_broker/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EAGxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,2BAA2B,CAAC;AAaxE,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,kBAAkB,CAKrE,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,kBAAkB,CAQrE,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAGjE,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAErF;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,wHAA8B,GAAG,gBAAgB,CAE/G;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,wHAA8B,GAAG,kBAAkB,CAEnH;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,wHAA8B,GAAG,kBAAkB,CAEnH"}
1
+ {"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/proving_broker/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,kBAAkB,EAGxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,2BAA2B,CAAC;AAcxE,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,kBAAkB,CAKrE,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,kBAAkB,CAQrE,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAGjE,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAErF;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,2KAAoC,GAAG,gBAAgB,CAErH;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,MAAM,EACX,KAAK,2KAAoC,GACxC,kBAAkB,CAEpB;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,MAAM,EACX,KAAK,2KAAoC,GACxC,kBAAkB,CAEpB"}
@@ -1,7 +1,7 @@
1
1
  import { ProofUri, ProvingJob, ProvingJobId, ProvingJobStatus, ProvingRequestType, } from '@aztec/circuit-types';
2
- import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
3
- import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
2
+ import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
4
3
  import { optional } from '@aztec/foundation/schemas';
4
+ import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
5
5
  import { z } from 'zod';
6
6
  const ProvingJobFilterSchema = z.object({
7
7
  allowList: z.array(z.nativeEnum(ProvingRequestType)),
@@ -30,15 +30,15 @@ export const ProvingJobBrokerSchema = {
30
30
  ...ProvingJobProducerSchema,
31
31
  };
32
32
  export function createProvingBrokerServer(broker) {
33
- return createSafeJsonRpcServer(broker, ProvingJobBrokerSchema);
33
+ return createTracedJsonRpcServer(broker, ProvingJobBrokerSchema);
34
34
  }
35
- export function createProvingJobBrokerClient(url, fetch = makeFetch([1, 2, 3], false)) {
35
+ export function createProvingJobBrokerClient(url, fetch = makeTracedFetch([1, 2, 3], false)) {
36
36
  return createSafeJsonRpcClient(url, ProvingJobBrokerSchema, false, 'proverBroker', fetch);
37
37
  }
38
- export function createProvingJobProducerClient(url, fetch = makeFetch([1, 2, 3], false)) {
38
+ export function createProvingJobProducerClient(url, fetch = makeTracedFetch([1, 2, 3], false)) {
39
39
  return createSafeJsonRpcClient(url, ProvingJobProducerSchema, false, 'provingJobProducer', fetch);
40
40
  }
41
- export function createProvingJobConsumerClient(url, fetch = makeFetch([1, 2, 3], false)) {
41
+ export function createProvingJobConsumerClient(url, fetch = makeTracedFetch([1, 2, 3], false)) {
42
42
  return createSafeJsonRpcClient(url, ProvingJobConsumerSchema, false, 'provingJobConsumer', fetch);
43
43
  }
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3JwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsUUFBUSxFQUNSLFVBQVUsRUFHVixZQUFZLEVBRVosZ0JBQWdCLEVBQ2hCLGtCQUFrQixHQUNuQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxTQUFTLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUN2RixPQUFPLEVBQTBCLHVCQUF1QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDcEcsT0FBTyxFQUFxQixRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV4RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUN0QyxTQUFTLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUFDLENBQUM7Q0FDckQsQ0FBQyxDQUFDO0FBRUgsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ3JDLEdBQUcsRUFBRSxVQUFVO0lBQ2YsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDakIsQ0FBQyxDQUFDO0FBRUgsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQXFDO0lBQ3hFLGlCQUFpQixFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDO0lBQzFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDO0lBQzlFLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNuRSxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztDQUMxRixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQXFDO0lBQ3hFLGFBQWEsRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzVHLHFCQUFxQixFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzNHLHdCQUF3QixFQUFFLENBQUM7U0FDeEIsUUFBUSxFQUFFO1NBQ1YsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsUUFBUSxDQUFDLHNCQUFzQixDQUFDLENBQUM7U0FDaEUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzVDLHVCQUF1QixFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7Q0FDckYsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFtQztJQUNwRSxHQUFHLHdCQUF3QjtJQUMzQixHQUFHLHdCQUF3QjtDQUM1QixDQUFDO0FBRUYsTUFBTSxVQUFVLHlCQUF5QixDQUFDLE1BQXdCO0lBQ2hFLE9BQU8sdUJBQXVCLENBQUMsTUFBTSxFQUFFLHNCQUFzQixDQUFDLENBQUM7QUFDakUsQ0FBQztBQUVELE1BQU0sVUFBVSw0QkFBNEIsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBQzNGLE9BQU8sdUJBQXVCLENBQUMsR0FBRyxFQUFFLHNCQUFzQixFQUFFLEtBQUssRUFBRSxjQUFjLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFDNUYsQ0FBQztBQUVELE1BQU0sVUFBVSw4QkFBOEIsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBQzdGLE9BQU8sdUJBQXVCLENBQUMsR0FBRyxFQUFFLHdCQUF3QixFQUFFLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxLQUFLLENBQUMsQ0FBQztBQUNwRyxDQUFDO0FBRUQsTUFBTSxVQUFVLDhCQUE4QixDQUFDLEdBQVcsRUFBRSxLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFDN0YsT0FBTyx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsd0JBQXdCLEVBQUUsS0FBSyxFQUFFLG9CQUFvQixFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ3BHLENBQUMifQ==
44
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3JwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsUUFBUSxFQUNSLFVBQVUsRUFHVixZQUFZLEVBRVosZ0JBQWdCLEVBQ2hCLGtCQUFrQixHQUNuQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRTVFLE9BQU8sRUFBcUIsUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDeEUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ3RDLFNBQVMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztDQUNyRCxDQUFDLENBQUM7QUFFSCxNQUFNLHFCQUFxQixHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDckMsR0FBRyxFQUFFLFVBQVU7SUFDZixJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtDQUNqQixDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBcUM7SUFDeEUsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUM7SUFDMUUsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUM7SUFDOUUsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxZ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
@@ -23,7 +23,7 @@ export declare class MockProver implements ServerCircuitProver {
23
23
  getPrivateBaseRollupProof(_baseRollupInput: PrivateBaseRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
24
24
  getPublicBaseRollupProof(_inputs: PublicBaseRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
25
25
  getMergeRollupProof(_input: MergeRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
26
- getBlockMergeRollupProof(_input: BlockMergeRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 534>>;
26
+ getBlockMergeRollupProof(_input: BlockMergeRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, 538>>;
27
27
  getEmptyBlockRootRollupProof(_input: EmptyBlockRootRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
28
28
  getBlockRootRollupProof(_input: BlockRootRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
29
29
  getSingleTxBlockRootRollupProof(_input: SingleTxBlockRootRollupInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-client",
3
- "version": "0.71.0",
3
+ "version": "0.72.1",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -67,16 +67,16 @@
67
67
  ]
68
68
  },
69
69
  "dependencies": {
70
- "@aztec/bb-prover": "0.71.0",
71
- "@aztec/circuit-types": "0.71.0",
72
- "@aztec/circuits.js": "0.71.0",
73
- "@aztec/foundation": "0.71.0",
74
- "@aztec/kv-store": "0.71.0",
75
- "@aztec/noir-protocol-circuits-types": "0.71.0",
76
- "@aztec/protocol-contracts": "0.71.0",
77
- "@aztec/simulator": "0.71.0",
78
- "@aztec/telemetry-client": "0.71.0",
79
- "@aztec/world-state": "0.71.0",
70
+ "@aztec/bb-prover": "0.72.1",
71
+ "@aztec/circuit-types": "0.72.1",
72
+ "@aztec/circuits.js": "0.72.1",
73
+ "@aztec/foundation": "0.72.1",
74
+ "@aztec/kv-store": "0.72.1",
75
+ "@aztec/noir-protocol-circuits-types": "0.72.1",
76
+ "@aztec/protocol-contracts": "0.72.1",
77
+ "@aztec/simulator": "0.72.1",
78
+ "@aztec/telemetry-client": "0.72.1",
79
+ "@aztec/world-state": "0.72.1",
80
80
  "@google-cloud/storage": "^7.15.0",
81
81
  "@noir-lang/types": "portal:../../noir/packages/types",
82
82
  "commander": "^12.1.0",
package/src/config.ts CHANGED
@@ -25,7 +25,7 @@ export const bbConfigMappings: ConfigMappingsType<BBConfig & ACVMConfig> = {
25
25
  },
26
26
  bbWorkingDirectory: {
27
27
  env: 'BB_WORKING_DIRECTORY',
28
- description: 'The working directory to for proving',
28
+ description: 'The working directory to use for proving',
29
29
  },
30
30
  bbBinaryPath: {
31
31
  env: 'BB_BINARY_PATH',
@@ -9,7 +9,7 @@ import {
9
9
  import { makeBloatedProcessedTx } from '@aztec/circuit-types/test';
10
10
  import {
11
11
  type AppendOnlyTreeSnapshot,
12
- BlockHeader,
12
+ type BlockHeader,
13
13
  type Gas,
14
14
  type GlobalVariables,
15
15
  TreeSnapshots,
@@ -87,7 +87,6 @@ export class TestContext {
87
87
  const processor = new PublicProcessor(
88
88
  publicDb,
89
89
  globalVariables,
90
- BlockHeader.empty(),
91
90
  worldStateDB,
92
91
  publicTxSimulator,
93
92
  new TestDateProvider(),
@@ -148,6 +147,10 @@ export class TestContext {
148
147
  return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
149
148
  }
150
149
 
150
+ public getPreviousBlockHeader(currentBlockNumber = this.blockNumber): BlockHeader {
151
+ return this.getBlockHeader(currentBlockNumber - 1)!;
152
+ }
153
+
151
154
  async cleanup() {
152
155
  await this.proverAgent.stop();
153
156
  for (const dir of this.directoriesToCleanup.filter(x => x !== '')) {