@aztec/prover-client 0.45.1 → 0.46.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"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;AAEzD,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,cAAqB,oBAAoB,wCA8B3E,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"}
@@ -5,6 +5,7 @@ import { makeTuple } from '@aztec/foundation/array';
5
5
  import { padArrayEnd } from '@aztec/foundation/collection';
6
6
  import { randomBytes } from '@aztec/foundation/crypto';
7
7
  import { fileURLToPath } from '@aztec/foundation/url';
8
+ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
8
9
  import { NativeACVMSimulator, WASMSimulator } from '@aztec/simulator';
9
10
  import * as fs from 'fs/promises';
10
11
  import path from 'path';
@@ -59,6 +60,7 @@ export const makeBloatedProcessedTx = async (builderDb, seed = 0x1) => {
59
60
  seed *= MAX_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
60
61
  const tx = mockTx(seed);
61
62
  const kernelOutput = KernelCircuitPublicInputs.empty();
63
+ kernelOutput.constants.vkTreeRoot = getVKTreeRoot();
62
64
  kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
63
65
  kernelOutput.end.publicDataUpdateRequests = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20), seed + 0x500);
64
66
  kernelOutput.end.publicDataUpdateRequests = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20), seed + 0x600);
@@ -74,7 +76,7 @@ export const makeBloatedProcessedTx = async (builderDb, seed = 0x1) => {
74
76
  };
75
77
  export const makeEmptyProcessedTx = async (builderDb, chainId, version) => {
76
78
  const header = await builderDb.buildInitialHeader();
77
- return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version);
79
+ return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version, getVKTreeRoot());
78
80
  };
79
81
  // Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
80
82
  export const updateExpectedTreesFromTxs = async (db, txs) => {
@@ -92,4 +94,4 @@ export const makeGlobals = (blockNumber) => {
92
94
  export const makeEmptyProcessedTestTx = (builderDb) => {
93
95
  return makeEmptyProcessedTx(builderDb, Fr.ZERO, Fr.ZERO);
94
96
  };
95
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"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"}
97
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"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"}
@@ -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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"}
@@ -1,4 +1,4 @@
1
- import { GlobalVariables, Header, getMockVerificationKeys, } from '@aztec/circuits.js';
1
+ import { GlobalVariables, Header } from '@aztec/circuits.js';
2
2
  import { openTmpStore } from '@aztec/kv-store/utils';
3
3
  import { PublicExecutionResultBuilder, PublicProcessor, RealPublicKernelCircuitSimulator, WASMSimulator, } from '@aztec/simulator';
4
4
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
@@ -11,12 +11,11 @@ import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
11
11
  import { ProverAgent } from '../prover-agent/prover-agent.js';
12
12
  import { getEnvironmentConfig, getSimulationProvider, makeGlobals } from './fixtures.js';
13
13
  class DummyProverClient {
14
- constructor(orchestrator, verificationKeys = getMockVerificationKeys()) {
14
+ constructor(orchestrator) {
15
15
  this.orchestrator = orchestrator;
16
- this.verificationKeys = verificationKeys;
17
16
  }
18
17
  startNewBlock(numTxs, globalVariables, l1ToL2Messages) {
19
- return this.orchestrator.startNewBlock(numTxs, globalVariables, l1ToL2Messages, this.verificationKeys);
18
+ return this.orchestrator.startNewBlock(numTxs, globalVariables, l1ToL2Messages);
20
19
  }
21
20
  addNewTx(tx) {
22
21
  return this.orchestrator.addNewTx(tx);
@@ -116,4 +115,4 @@ export class TestContext {
116
115
  return await this.publicProcessor.process(txs, maxTransactions, blockProver, txValidator);
117
116
  }
118
117
  }
119
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBRUwsZUFBZSxFQUNmLE1BQU0sRUFHTix1QkFBdUIsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUc1QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUlMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQyxFQUFVLG1CQUFtQix1QkFBdUIsRUFBRTtRQUF2RixpQkFBWSxHQUFaLFlBQVksQ0FBcUI7UUFBVSxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQTRCO0lBQUcsQ0FBQztJQUMvRyxhQUFhLENBQUMsTUFBYyxFQUFFLGVBQWdDLEVBQUUsY0FBb0I7UUFDbEYsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUN6RyxDQUFDO0lBQ0QsUUFBUSxDQUFDLEVBQWU7UUFDdEIsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBQ0QsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBQ0QsYUFBYTtRQUNYLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUMzQyxDQUFDO0lBQ0QsaUJBQWlCO1FBQ2YsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDL0MsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLFdBQVc7SUFFdEIsWUFDUyxjQUF5QyxFQUN6QyxpQkFBeUQsRUFDekQsa0JBQWlELEVBQ2pELGVBQWdDLEVBQ2hDLGtCQUFzQyxFQUN0QyxlQUFnQyxFQUNoQyxRQUE4QixFQUM5QixNQUEyQixFQUMzQixXQUF3QixFQUN4QixZQUFpQyxFQUNqQyxXQUFtQixFQUNuQixvQkFBOEIsRUFDOUIsTUFBbUI7UUFabkIsbUJBQWMsR0FBZCxjQUFjLENBQTJCO1FBQ3pDLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBd0M7UUFDekQsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUErQjtRQUNqRCxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsYUFBUSxHQUFSLFFBQVEsQ0FBc0I7UUFDOUIsV0FBTSxHQUFOLE1BQU0sQ0FBcUI7UUFDM0IsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFDeEIsaUJBQVksR0FBWixZQUFZLENBQXFCO1FBQ2pDLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQ25CLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBVTtRQUM5QixXQUFNLEdBQU4sTUFBTSxDQUFhO1FBRTFCLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNkLE1BQW1CLEVBQ25CLFdBQVcsR0FBRyxDQUFDLEVBQ2YsZUFBMkUsQ0FBQyxDQUFDLEVBQUUsQ0FDN0UsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLGlCQUFpQixDQUFDLElBQUksbUJBQW1CLEVBQUUsRUFBRSxJQUFJLGFBQWEsRUFBRSxDQUFDLENBQUMsRUFDeEYsV0FBVyxHQUFHLENBQUM7UUFFZixNQUFNLGVBQWUsR0FBRyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFakQsTUFBTSxjQUFjLEdBQUcsSUFBSSxFQUFrQixDQUFDO1FBQzlDLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxFQUErQixDQUFDO1FBQzlELE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxFQUFzQixDQUFDO1FBQ3RELE1BQU0sWUFBWSxHQUFHLElBQUksZ0NBQWdDLENBQUMsSUFBSSxhQUFhLEVBQUUsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sUUFBUSxHQUFHLE1BQU0sV0FBVyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQy9FLE1BQU0sU0FBUyxHQUFHLElBQUksbUJBQW1CLEVBQUUsQ0FBQztRQUM1QyxNQUFNLFNBQVMsR0FBRyxJQUFJLGVBQWUsQ0FDbkMsUUFBUSxFQUNSLGNBQWMsRUFDZCxZQUFZLEVBQ1osZUFBZSxDQUFDLEtBQUssRUFBRSxFQUN2QixNQUFNLENBQUMsS0FBSyxFQUFFLEVBQ2QsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixTQUFTLENBQ1YsQ0FBQztRQUVGLElBQUksV0FBZ0MsQ0FBQztRQUNyQyxNQUFNLE1BQU0sR0FBRyxNQUFNLG9CQUFvQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2xELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxxQkFBcUIsQ0FBQztZQUNyRCxvQkFBb0IsRUFBRSxNQUFNLEVBQUUsb0JBQW9CO1lBQ2xELGNBQWMsRUFBRSxNQUFNLEVBQUUsZ0JBQWdCO1NBQ3pDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLFdBQVcsR0FBRyxJQUFJLGlCQUFpQixDQUFDLElBQUksbUJBQW1CLEVBQUUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3JGLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxRQUFRLEdBQW1CO2dCQUMvQixjQUFjLEVBQUUsTUFBTSxDQUFDLGdCQUFnQjtnQkFDdkMsb0JBQW9CLEVBQUUsTUFBTSxDQUFDLG9CQUFvQjtnQkFDakQsWUFBWSxFQUFFLE1BQU0sQ0FBQyxjQUFjO2dCQUNuQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsa0JBQWtCO2FBQzlDLENBQUM7WUFDRixXQUFXLEdBQUcsTUFBTSxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUVELE1BQU0sS0FBSyxHQUFHLElBQUksa0JBQWtCLEVBQUUsQ0FBQztRQUN2QyxNQUFNLFlBQVksR0FBRyxJQUFJLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDekUsTUFBTSxLQUFLLEdBQUcsSUFBSSxXQUFXLENBQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBRXhELEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNkLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFbkIsT0FBTyxJQUFJLElBQUksQ0FDYixjQUFjLEVBQ2QsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixTQUFTLEVBQ1Qsa0JBQWtCLEVBQ2xCLGVBQWUsRUFDZixRQUFRLEVBQ1IsV0FBVyxFQUNYLEtBQUssRUFDTCxZQUFZLEVBQ1osV0FBVyxFQUNYLENBQUMsTUFBTSxFQUFFLGtCQUFrQixJQUFJLEVBQUUsQ0FBQyxFQUNsQyxNQUFNLENBQ1AsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM5QixLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNsRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNyRCxDQUFDO0lBQ0gsQ0FBQztJQUVNLEtBQUssQ0FBQyxzQkFBc0IsQ0FDakMsR0FBUyxFQUNULGVBQXVCLEVBQ3ZCLFdBQXlCLEVBQ3pCLFdBQXNDO1FBRXRDLE1BQU0sNkJBQTZCLEdBQUcsQ0FDcEMsU0FBaUMsRUFDakMsZ0JBQWlDLEVBQ2pDLFlBQWlCLEVBQ2pCLFVBQXFCLEVBQ3JCLGtCQUErQixFQUMvQixjQUFtQixFQUNuQixrQkFBMkIsRUFDM0IsRUFBRTtZQUNGLEtBQUssTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQ3JCLE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxPQUFPLEVBQUU7b0JBQ3RELENBQUMsQ0FBQyxFQUFFLENBQUMsMkJBQTJCO29CQUNoQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQywyQkFBMkIsRUFBRSxFQUFFLENBQUMsMEJBQTBCLENBQUMsQ0FBQztnQkFDdkUsS0FBSyxNQUFNLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztvQkFDL0IsSUFBSSxTQUFTLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQzt3QkFDOUQsTUFBTSxNQUFNLEdBQUcsNEJBQTRCLENBQUMscUJBQXFCLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQzs0QkFDbkYsWUFBWSxFQUFFLFlBQVk7NEJBQzFCLFVBQVUsRUFBRSxZQUFZOzRCQUN4QixjQUFjO3lCQUNmLENBQUMsQ0FBQzt3QkFDSCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ2pDLENBQUM7Z0JBQ0gsQ0FBQztZQUNILENBQUM7WUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLENBQUMsQ0FBQztRQUNGLE9BQU8sTUFBTSxJQUFJLENBQUMsb0RBQW9ELENBQ3BFLEdBQUcsRUFDSCxlQUFlLEVBQ2YsV0FBVyxFQUNYLFdBQVcsRUFDWCw2QkFBNkIsQ0FDOUIsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsb0RBQW9ELENBQy9ELEdBQVMsRUFDVCxlQUF1QixFQUN2QixXQUF5QixFQUN6QixXQUFzQyxFQUN0QyxZQVFtQztRQUVuQyxJQUFJLFlBQVksRUFBRSxDQUFDO1lBQ2pCLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxPQUFPLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDNUYsQ0FBQztDQUNGIn0=
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBQVksZUFBZSxFQUFFLE1BQU0sRUFBa0MsTUFBTSxvQkFBb0IsQ0FBQztBQUd2RyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUlMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQztRQUFqQyxpQkFBWSxHQUFaLFlBQVksQ0FBcUI7SUFBRyxDQUFDO0lBQ3pELGFBQWEsQ0FBQyxNQUFjLEVBQUUsZUFBZ0MsRUFBRSxjQUFvQjtRQUNsRixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxlQUFlLEVBQUUsY0FBYyxDQUFDLENB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
@@ -1 +1 @@
1
- {"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,10 @@
1
1
  import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, ConstantRollupData, Fr, KernelData, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, NOTE_HASH_SUBTREE_HEIGHT, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousRollupData, PublicDataHint, PublicDataTreeLeaf, PublicDataUpdateRequest, ROLLUP_VK_TREE_HEIGHT, RootRollupInputs, StateDiffHints, VK_TREE_HEIGHT, makeRecursiveProofFromBinary, } from '@aztec/circuits.js';
2
+ import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, ConstantRollupData, Fr, KernelData, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, NOTE_HASH_SUBTREE_HEIGHT, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousRollupData, PublicDataHint, PublicDataTreeLeaf, PublicDataUpdateRequest, RootRollupInputs, StateDiffHints, VK_TREE_HEIGHT, makeRecursiveProofFromBinary, } from '@aztec/circuits.js';
3
3
  import { assertPermutation, makeTuple } from '@aztec/foundation/array';
4
4
  import { padArrayEnd } from '@aztec/foundation/collection';
5
5
  import { assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
6
+ import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
6
7
  import { HintsBuilder, computeFeePayerBalanceLeafSlot } from '@aztec/simulator';
7
- // Denotes fields that are not used now, but will be in the future
8
- const FUTURE_FR = new Fr(0n);
9
- const FUTURE_NUM = 0;
10
- // Denotes fields that should be deleted
11
- const DELETE_FR = new Fr(0n);
12
8
  // Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
13
9
  export async function buildBaseRollupInput(tx, globalVariables, db, kernelVk) {
14
10
  // Get trees info before any changes hit
@@ -119,16 +115,12 @@ export async function getRootRollupInput(rollupOutputLeft, rollupProofLeft, veri
119
115
  });
120
116
  }
121
117
  export function getPreviousRollupDataFromPublicInputs(rollupOutput, rollupProof, vk) {
122
- return new PreviousRollupData(rollupOutput, rollupProof, vk,
123
- // MembershipWitness for a VK tree to be implemented in the future
124
- FUTURE_NUM, new MembershipWitness(ROLLUP_VK_TREE_HEIGHT, BigInt(FUTURE_NUM), makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR)));
118
+ const leafIndex = getVKIndex(vk);
119
+ return new PreviousRollupData(rollupOutput, rollupProof, vk, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
125
120
  }
126
121
  export async function getConstantRollupData(globalVariables, db) {
127
122
  return ConstantRollupData.from({
128
- baseRollupVkHash: DELETE_FR,
129
- mergeRollupVkHash: DELETE_FR,
130
- privateKernelVkTreeRoot: FUTURE_FR,
131
- publicKernelVkTreeRoot: FUTURE_FR,
123
+ vkTreeRoot: getVKTreeRoot(),
132
124
  lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
133
125
  globalVariables,
134
126
  });
@@ -139,11 +131,10 @@ export async function getTreeSnapshot(id, db) {
139
131
  }
140
132
  export function getKernelDataFor(tx, vk) {
141
133
  const recursiveProof = makeRecursiveProofFromBinary(tx.proof, NESTED_RECURSIVE_PROOF_LENGTH);
134
+ const leafIndex = getVKIndex(vk);
142
135
  return new KernelData(tx.data, recursiveProof,
143
136
  // VK for the kernel circuit
144
- vk,
145
- // MembershipWitness for a VK tree to be implemented in the future
146
- FUTURE_NUM, assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT));
137
+ vk, leafIndex, getVKSiblingPath(leafIndex));
147
138
  }
148
139
  export function makeEmptyMembershipWitness(height) {
149
140
  return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
@@ -233,4 +224,4 @@ export function validateTx(tx) {
233
224
  throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
234
225
  }
235
226
  }
236
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-building-helpers.js","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
227
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-building-helpers.js","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":"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"}
@@ -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, type VerificationKeys } from '@aztec/circuits.js';
3
+ import { Fr, type GlobalVariables, type Header } 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
  /**
@@ -37,7 +37,7 @@ export declare class ProvingOrchestrator {
37
37
  * @param verificationKeys - The private kernel verification keys
38
38
  * @returns A proving ticket, containing a promise notifying of proving completion
39
39
  */
40
- startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[], verificationKeys: VerificationKeys): Promise<ProvingTicket>;
40
+ startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<ProvingTicket>;
41
41
  /**
42
42
  * The interface to add a simulated transaction to the scheduler
43
43
  * @param tx - The transaction to be proven
@@ -1 +1 @@
1
- {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EAQjB,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,EAeX,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAQ5B,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,EACpB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,aAAa,CAAC;IA0EzB;;;OAGG;IAIU,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD;;OAEG;IAYU,iBAAiB;IA0C9B,OAAO,CAAC,iBAAiB;IA0CzB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAchC;;OAEG;IACI,WAAW;IAQlB;;;OAGG;IAQU,aAAa;IAoE1B;;;;OAIG;YACW,kBAAkB;IAahC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAyBrC,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,iBAAiB;IA4EzB,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;CA6D5B"}
1
+ {"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EAQjB,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,EAgBZ,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;IAahC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAyBrC,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,iBAAiB;IA4EzB,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;CAkE5B"}
@@ -9,6 +9,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
9
9
  import { promiseWithResolvers } from '@aztec/foundation/promise';
10
10
  import { BufferReader } from '@aztec/foundation/serialize';
11
11
  import { pushTestData } from '@aztec/foundation/testing';
12
+ import { ProtocolCircuitVks, getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
12
13
  import { Attributes, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
13
14
  import { inspect } from 'util';
14
15
  import { buildBaseRollupInput, createMergeRollupInputs, getRootRollupInput, getSubtreeSiblingPath, getTreeSnapshot, validatePartialState, validateRootOutput, validateTx, } from './block-building-helpers.js';
@@ -60,7 +61,7 @@ let ProvingOrchestrator = (() => {
60
61
  * @param verificationKeys - The private kernel verification keys
61
62
  * @returns A proving ticket, containing a promise notifying of proving completion
62
63
  */
63
- async startNewBlock(numTxs, globalVariables, l1ToL2Messages, verificationKeys) {
64
+ async startNewBlock(numTxs, globalVariables, l1ToL2Messages) {
64
65
  // Create initial header if not done so yet
65
66
  if (!this.initialHeader) {
66
67
  this.initialHeader = await this.db.buildInitialHeader();
@@ -80,7 +81,7 @@ let ProvingOrchestrator = (() => {
80
81
  catch (err) {
81
82
  throw new Error('Too many L1 to L2 messages');
82
83
  }
83
- baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i));
84
+ baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()));
84
85
  const messageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.db);
85
86
  const newL1ToL2MessageTreeRootSiblingPathArray = await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, this.db);
86
87
  const newL1ToL2MessageTreeRootSiblingPath = makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, i => i < newL1ToL2MessageTreeRootSiblingPathArray.length ? newL1ToL2MessageTreeRootSiblingPathArray[i] : Fr.ZERO, 0);
@@ -91,7 +92,7 @@ let ProvingOrchestrator = (() => {
91
92
  status: PROVING_STATUS.FAILURE,
92
93
  reason,
93
94
  }));
94
- const provingState = new ProvingState(numTxs, resolve, reject, globalVariables, l1ToL2MessagesPadded, baseParityInputs.length, messageTreeSnapshot, newL1ToL2MessageTreeRootSiblingPath, verificationKeys);
95
+ const provingState = new ProvingState(numTxs, resolve, reject, globalVariables, l1ToL2MessagesPadded, baseParityInputs.length, messageTreeSnapshot, newL1ToL2MessageTreeRootSiblingPath);
95
96
  for (let i = 0; i < baseParityInputs.length; i++) {
96
97
  this.enqueueBaseParityCircuit(provingState, baseParityInputs[i], i);
97
98
  }
@@ -144,7 +145,7 @@ let ProvingOrchestrator = (() => {
144
145
  // Insert it into the tree the required number of times to get all of the
145
146
  // base rollup inputs
146
147
  // Then enqueue the proving of all the transactions
147
- const unprovenPaddingTx = makeEmptyProcessedTx(this.initialHeader ?? (await this.db.buildInitialHeader()), this.provingState.globalVariables.chainId, this.provingState.globalVariables.version);
148
+ const unprovenPaddingTx = makeEmptyProcessedTx(this.initialHeader ?? (await this.db.buildInitialHeader()), this.provingState.globalVariables.chainId, this.provingState.globalVariables.version, getVKTreeRoot());
148
149
  const txInputs = [];
149
150
  for (let i = 0; i < paddingTxCount; i++) {
150
151
  const [inputs, snapshot] = await this.prepareTransaction(unprovenPaddingTx, this.provingState);
@@ -177,6 +178,7 @@ let ProvingOrchestrator = (() => {
177
178
  chainId: unprovenPaddingTx.data.constants.txContext.chainId,
178
179
  version: unprovenPaddingTx.data.constants.txContext.version,
179
180
  header: unprovenPaddingTx.data.constants.historicalHeader,
181
+ vkTreeRoot: getVKTreeRoot(),
180
182
  }, signal)), result => {
181
183
  logger.debug(`Completed proof for padding tx, now enqueuing ${txInputs.length} padding txs`);
182
184
  this.paddingTx = makePaddingProcessedTx(result);
@@ -195,6 +197,8 @@ let ProvingOrchestrator = (() => {
195
197
  for (let i = 0; i < txInputs.length; i++) {
196
198
  txInputs[i].inputs.kernelData.vk = paddingTx.verificationKey;
197
199
  txInputs[i].inputs.kernelData.proof = paddingTx.recursiveProof;
200
+ txInputs[i].inputs.kernelData.vkIndex = getVKIndex(paddingTx.verificationKey);
201
+ txInputs[i].inputs.kernelData.vkPath = getVKSiblingPath(txInputs[i].inputs.kernelData.vkIndex);
198
202
  this.enqueueFirstProof(txInputs[i].inputs, txInputs[i].snapshot, paddingTx, provingState);
199
203
  }
200
204
  }
@@ -267,7 +271,7 @@ let ProvingOrchestrator = (() => {
267
271
  async prepareTransaction(tx, provingState) {
268
272
  // Pass the private kernel tail vk here as the previous one.
269
273
  // If there are public functions then this key will be overwritten once the public tail has been proven
270
- const previousKernelVerificationKey = provingState.privateKernelVerificationKeys.privateKernelCircuit;
274
+ const previousKernelVerificationKey = ProtocolCircuitVks.PrivateKernelTailArtifact;
271
275
  const txInputs = await this.prepareBaseRollupInputs(provingState, tx, previousKernelVerificationKey);
272
276
  if (!txInputs) {
273
277
  // This should not be possible
@@ -276,7 +280,7 @@ let ProvingOrchestrator = (() => {
276
280
  return txInputs;
277
281
  }
278
282
  enqueueFirstProof(inputs, treeSnapshots, tx, provingState) {
279
- const txProvingState = new TxProvingState(tx, inputs, treeSnapshots, provingState.privateKernelVerificationKeys.privateKernelToPublicCircuit);
283
+ const txProvingState = new TxProvingState(tx, inputs, treeSnapshots, ProtocolCircuitVks.PrivateKernelTailToPublicArtifact);
280
284
  const txIndex = provingState.addNewTx(txProvingState);
281
285
  const numPublicKernels = txProvingState.getNumPublicKernels();
282
286
  if (!numPublicKernels) {
@@ -603,6 +607,8 @@ let ProvingOrchestrator = (() => {
603
607
  // Take the final public tail proof and verification key and pass them to the base rollup
604
608
  txProvingState.baseRollupInputs.kernelData.proof = result.proof;
605
609
  txProvingState.baseRollupInputs.kernelData.vk = result.verificationKey;
610
+ txProvingState.baseRollupInputs.kernelData.vkIndex = getVKIndex(result.verificationKey);
611
+ txProvingState.baseRollupInputs.kernelData.vkPath = getVKSiblingPath(txProvingState.baseRollupInputs.kernelData.vkIndex);
606
612
  this.enqueueBaseRollup(provingState, BigInt(txIndex), txProvingState);
607
613
  return;
608
614
  }
@@ -662,4 +668,4 @@ function extractAggregationObject(proof, numPublicInputs) {
662
668
  }
663
669
  return BufferReader.asReader(buffer).readArray(AGGREGATION_OBJECT_LENGTH, Fr);
664
670
  }
665
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
671
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { type L2Block, type MerkleTreeId, type ProvingResult } from '@aztec/circuit-types';
2
- import { type AppendOnlyTreeSnapshot, type BaseOrMergeRollupPublicInputs, type Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_PROOF_LENGTH, type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, type Proof, type RECURSIVE_PROOF_LENGTH, type RecursiveProof, type RootParityInput, type RootRollupPublicInputs, type VerificationKeyAsFields, type VerificationKeys } from '@aztec/circuits.js';
2
+ import { type AppendOnlyTreeSnapshot, type BaseOrMergeRollupPublicInputs, type Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_PROOF_LENGTH, type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, type Proof, type RECURSIVE_PROOF_LENGTH, type RecursiveProof, type RootParityInput, type RootRollupPublicInputs, type VerificationKeyAsFields } from '@aztec/circuits.js';
3
3
  import { type Tuple } from '@aztec/foundation/serialize';
4
4
  import { type TxProvingState } from './tx-proving-state.js';
5
5
  export type MergeRollupInputData = {
@@ -24,7 +24,6 @@ export declare class ProvingState {
24
24
  readonly newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>;
25
25
  readonly messageTreeSnapshot: AppendOnlyTreeSnapshot;
26
26
  readonly messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>;
27
- readonly privateKernelVerificationKeys: VerificationKeys;
28
27
  private provingStateLifecycle;
29
28
  private mergeRollupInputs;
30
29
  private rootParityInputs;
@@ -34,7 +33,7 @@ export declare class ProvingState {
34
33
  finalProof: Proof | undefined;
35
34
  block: L2Block | undefined;
36
35
  private txs;
37
- constructor(totalNumTxs: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void, globalVariables: GlobalVariables, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, numRootParityInputs: number, messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, privateKernelVerificationKeys: VerificationKeys);
36
+ constructor(totalNumTxs: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void, globalVariables: GlobalVariables, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, numRootParityInputs: number, messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>);
38
37
  get numMergeLevels(): bigint;
39
38
  findMergeLevel(currentLevel: bigint, currentIndex: bigint): bigint[];
40
39
  addNewTx(tx: TxProvingState): number;
@@ -1 +1 @@
1
- {"version":3,"file":"proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/proving-state.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,EAAE,EACP,KAAK,eAAe,EACpB,KAAK,wCAAwC,EAC7C,KAAK,6BAA6B,EAClC,KAAK,mCAAmC,EACxC,KAAK,KAAK,EACV,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,CAAC,6BAA6B,GAAG,SAAS,EAAE,6BAA6B,GAAG,SAAS,CAAC,CAAC;IAC/F,MAAM,EAAE;QACN,cAAc,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS;QAChE,cAAc,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS;KACjE,CAAC;IACF,gBAAgB,EAAE,CAAC,uBAAuB,GAAG,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CAC9F,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;AAStE;;;;GAIG;AACH,qBAAa,YAAY;aAWL,WAAW,EAAE,MAAM;IACnC,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,iBAAiB;aACT,eAAe,EAAE,eAAe;aAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC;aAExE,mBAAmB,EAAE,sBAAsB;aAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IAjBxG,OAAO,CAAC,qBAAqB,CAAiD;IAC9E,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,gBAAgB,CAAyE;IACjG,OAAO,CAAC,qBAAqB,CAAoE;IAC1F,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC3D,sBAAsB,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IACzC,UAAU,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,OAAO,CAAC,GAAG,CAAwB;gBAEjB,WAAW,EAAE,MAAM,EAC3B,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,EACnD,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EACnC,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC,EACxF,mBAAmB,EAAE,MAAM,EACX,mBAAmB,EAAE,sBAAsB,EAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;IAMxG,IAAW,cAAc,WAExB;IAIM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IA0BzD,QAAQ,CAAC,EAAE,EAAE,cAAc;IASlC,IAAW,oBAAoB,WAE9B;IAGD,IAAW,oBAAoB,IAKQ,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,CAHvG;IAGD,IAAW,oBAAoB,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,EAEvG;IAGD,IAAW,eAAe,wCAEzB;IAGM,WAAW;IAQX,uBAAuB;IAK9B,IAAW,MAAM,qBAEhB;IAED;;;;;;OAMG;IACI,gBAAgB,CACrB,WAAW,EAAE;QACX,6BAA6B;QAC7B,cAAc,CAAC,OAAO,6BAA6B,CAAC;QACpD,uBAAuB;KACxB,EACD,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM;IAsBf,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAKjC,cAAc,CAAC,YAAY,EAAE,MAAM;IAKnC,oBAAoB;IASpB,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,sBAAsB,CAAC,EAAE,KAAK,EAAE,MAAM;IAKzF,wBAAwB;IAKxB,MAAM;IAMN,MAAM,CAAC,MAAM,EAAE,MAAM;IAUrB,OAAO,CAAC,MAAM,EAAE,aAAa;CAOrC"}
@@ -11,7 +11,7 @@ var PROVING_STATE_LIFECYCLE;
11
11
  * Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
12
12
  */
13
13
  export class ProvingState {
14
- constructor(totalNumTxs, completionCallback, rejectionCallback, globalVariables, newL1ToL2Messages, numRootParityInputs, messageTreeSnapshot, messageTreeRootSiblingPath, privateKernelVerificationKeys) {
14
+ constructor(totalNumTxs, completionCallback, rejectionCallback, globalVariables, newL1ToL2Messages, numRootParityInputs, messageTreeSnapshot, messageTreeRootSiblingPath) {
15
15
  this.totalNumTxs = totalNumTxs;
16
16
  this.completionCallback = completionCallback;
17
17
  this.rejectionCallback = rejectionCallback;
@@ -19,7 +19,6 @@ export class ProvingState {
19
19
  this.newL1ToL2Messages = newL1ToL2Messages;
20
20
  this.messageTreeSnapshot = messageTreeSnapshot;
21
21
  this.messageTreeRootSiblingPath = messageTreeRootSiblingPath;
22
- this.privateKernelVerificationKeys = privateKernelVerificationKeys;
23
22
  this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED;
24
23
  this.mergeRollupInputs = [];
25
24
  this.rootParityInputs = [];
@@ -164,4 +163,4 @@ export class ProvingState {
164
163
  this.completionCallback(result);
165
164
  }
166
165
  }
167
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFnQ0EsSUFBSyx1QkFLSjtBQUxELFdBQUssdUJBQXVCO0lBQzFCLHVHQUFxQixDQUFBO0lBQ3JCLGlHQUFrQixDQUFBO0lBQ2xCLHlHQUFzQixDQUFBO0lBQ3RCLHlHQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMSSx1QkFBdUIsS0FBdkIsdUJBQXVCLFFBSzNCO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBVXZCLFlBQ2tCLFdBQW1CLEVBQzNCLGtCQUFtRCxFQUNuRCxpQkFBMkMsRUFDbkMsZUFBZ0MsRUFDaEMsaUJBQXdFLEVBQ3hGLG1CQUEyQixFQUNYLG1CQUEyQyxFQUMzQywwQkFBc0YsRUFDdEYsNkJBQStDO1FBUi9DLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQzNCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBaUM7UUFDbkQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUEwQjtRQUNuQyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUF1RDtRQUV4RSx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQXdCO1FBQzNDLCtCQUEwQixHQUExQiwwQkFBMEIsQ0FBNEQ7UUFDdEYsa0NBQTZCLEdBQTdCLDZCQUE2QixDQUFrQjtRQWxCekQsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFDdEUsc0JBQWlCLEdBQTJCLEVBQUUsQ0FBQztRQUMvQyxxQkFBZ0IsR0FBc0UsRUFBRSxDQUFDO1FBTXpGLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBWWpDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxHQUFHLENB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
166
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUErQkEsSUFBSyx1QkFLSjtBQUxELFdBQUssdUJBQXVCO0lBQzFCLHVHQUFxQixDQUFBO0lBQ3JCLGlHQUFrQixDQUFBO0lBQ2xCLHlHQUFzQixDQUFBO0lBQ3RCLHlHQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMSSx1QkFBdUIsS0FBdkIsdUJBQXVCLFFBSzNCO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBVXZCLFlBQ2tCLFdBQW1CLEVBQzNCLGtCQUFtRCxFQUNuRCxpQkFBMkMsRUFDbkMsZUFBZ0MsRUFDaEMsaUJBQXdFLEVBQ3hGLG1CQUEyQixFQUNYLG1CQUEyQyxFQUMzQywwQkFBc0Y7UUFQdEYsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFDM0IsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFpQztRQUNuRCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQTBCO1FBQ25DLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxzQkFBaUIsR0FBakIsaUJBQWlCLENBQXVEO1FBRXhFLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBd0I7UUFDM0MsK0JBQTBCLEdBQTFCLDBCQUEwQixDQUE0RDtRQWpCaEcsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFDdEUsc0JBQWlCLEdBQTJCLEVBQUUsQ0FBQztRQUMvQyxxQkFBZ0IsR0FBc0UsRUFBRSxDQUFDO1FBTXpGLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBV2pDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMxRixD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
@@ -1,6 +1,6 @@
1
1
  import { 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, type VerificationKeys } from '@aztec/circuits.js';
3
+ import { type Fr, type GlobalVariables, type Header } 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';
@@ -10,16 +10,13 @@ import { type ProverClientConfig } from '../config.js';
10
10
  export declare class TxProver implements ProverClient {
11
11
  private config;
12
12
  private worldStateSynchronizer;
13
- private vks;
14
13
  private telemetry;
15
14
  private agent?;
16
15
  private orchestrator;
17
16
  private queue;
18
17
  private running;
19
18
  private constructor();
20
- updateProverConfig(config: Partial<ProverClientConfig & {
21
- vks: VerificationKeys;
22
- }>): Promise<void>;
19
+ updateProverConfig(config: Partial<ProverClientConfig>): Promise<void>;
23
20
  /**
24
21
  * Starts the prover instance
25
22
  */
@@ -35,7 +32,7 @@ export declare class TxProver implements ProverClient {
35
32
  * @param worldStateSynchronizer - An instance of the world state
36
33
  * @returns An instance of the prover, constructed and started.
37
34
  */
38
- static new(config: ProverClientConfig, vks: VerificationKeys, worldStateSynchronizer: WorldStateSynchronizer, telemetry: TelemetryClient, initialHeader?: Header): Promise<TxProver>;
35
+ static new(config: ProverClientConfig, worldStateSynchronizer: WorldStateSynchronizer, telemetry: TelemetryClient, initialHeader?: Header): Promise<TxProver>;
39
36
  private static buildCircuitProver;
40
37
  /**
41
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,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEvG,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,GAAG;IACX,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IAThB,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAiBD,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,GAAG;QAAE,GAAG,EAAE,gBAAgB,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxG;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IASjB;;;;;;OAMG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,gBAAgB,EACrB,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,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"}
@@ -7,10 +7,9 @@ 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, vks, telemetry, agent, initialHeader) {
10
+ constructor(config, worldStateSynchronizer, telemetry, agent, initialHeader) {
11
11
  this.config = config;
12
12
  this.worldStateSynchronizer = worldStateSynchronizer;
13
- this.vks = vks;
14
13
  this.telemetry = telemetry;
15
14
  this.agent = agent;
16
15
  this.running = false;
@@ -19,9 +18,6 @@ export class TxProver {
19
18
  }
20
19
  async updateProverConfig(config) {
21
20
  const newConfig = { ...this.config, ...config };
22
- if (config.vks) {
23
- this.vks = config.vks;
24
- }
25
21
  if (newConfig.realProofs !== this.config.realProofs && this.agent) {
26
22
  const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
27
23
  this.agent.setCircuitProver(circuitProver);
@@ -64,11 +60,11 @@ export class TxProver {
64
60
  * @param worldStateSynchronizer - An instance of the world state
65
61
  * @returns An instance of the prover, constructed and started.
66
62
  */
67
- static async new(config, vks, worldStateSynchronizer, telemetry, initialHeader) {
63
+ static async new(config, worldStateSynchronizer, telemetry, initialHeader) {
68
64
  const agent = config.proverAgentEnabled
69
65
  ? new ProverAgent(await TxProver.buildCircuitProver(config, telemetry), config.proverAgentConcurrency, config.proverAgentPollInterval)
70
66
  : undefined;
71
- const prover = new TxProver(config, worldStateSynchronizer, vks, telemetry, agent, initialHeader);
67
+ const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent, initialHeader);
72
68
  await prover.start();
73
69
  return prover;
74
70
  }
@@ -90,7 +86,7 @@ export class TxProver {
90
86
  async startNewBlock(numTxs, globalVariables, newL1ToL2Messages) {
91
87
  const previousBlockNumber = globalVariables.blockNumber.toNumber() - 1;
92
88
  await this.worldStateSynchronizer.syncImmediate(previousBlockNumber);
93
- return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages, this.vks);
89
+ return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages);
94
90
  }
95
91
  /**
96
92
  * Add a processed transaction to the current block
@@ -122,4 +118,4 @@ export class TxProver {
122
118
  return this.queue;
123
119
  }
124
120
  }
125
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFVM0UsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFLdkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDN0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFLbkIsWUFDVSxNQUEwQixFQUMxQixzQkFBOEMsRUFDOUMsR0FBcUIsRUFDckIsU0FBMEIsRUFDMUIsS0FBbUIsRUFDM0IsYUFBc0I7UUFMZCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUMxQiwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQXdCO1FBQzlDLFFBQUcsR0FBSCxHQUFHLENBQWtCO1FBQ3JCLGNBQVMsR0FBVCxTQUFTLENBQWlCO1FBQzFCLFVBQUssR0FBTCxLQUFLLENBQWM7UUFQckIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQVV0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksa0JBQWtCLENBQUMsTUFBTSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQy9GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxtQkFBbUIsQ0FDekMsc0JBQXNCLENBQUMsU0FBUyxFQUFFLEVBQ2xDLElBQUksQ0FBQyxLQUFLLEVBQ1YsU0FBUyxFQUNULGFBQWEsQ0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxNQUErRDtRQUN0RixNQUFNLFNBQVMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDO1FBRWhELElBQUksTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ2YsSUFBSSxDQUFDLEdBQUcsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3hCLENBQUM7UUFFRCxJQUFJLFNBQVMsQ0FBQyxVQUFVLEtBQUssSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2xFLE1BQU0sYUFBYSxHQUFHLE1BQU0sUUFBUSxDQUFDLGtCQUFrQixDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDbkYsSUFBSSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM3QyxDQUFDO1FBRUQsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLHNCQUFzQixLQUFLLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO1lBQzVFLElBQUksQ0FBQyxLQUFLLEVBQUUsaUJBQWlCLENBQUMsU0FBUyxDQUFDLHNCQUFzQixDQUFDLENBQUM7UUFDbEUsQ0FBQztRQUVELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsSUFBSSxTQUFTLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDcEQsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM1QixDQUFDO1FBRUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDMUIsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSztRQUNWLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQzNCLENBQUM7UUFFRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUNwQixJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ25CLElBQUksQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM5QixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDbEIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQztRQUNyQixNQUFNLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDekIsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzFCLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSSxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FDckIsTUFBMEIsRUFDMUIsR0FBcUIsRUFDckIsc0JBQThDLEVBQzlDLFNBQTBCLEVBQzFCLGFBQXNCO1FBRXRCLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxrQkFBa0I7WUFDckMsQ0FBQyxDQUFDLElBQUksV0FBVyxDQUNiLE1BQU0sUUFBUSxDQUFDLGtCQUFrQixDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsRUFDcEQsTUFBTSxDQUFDLHNCQUFzQixFQUM3QixNQUFNLENBQUMsdUJBQXVCLENBQy9CO1lBQ0gsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUVkLE1BQU0sTUFBTSxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sRUFBRSxzQkFBc0IsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxhQUFhLENBQUMsQ0FBQztRQUNsRyxNQUFNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNyQixPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FDckMsTUFBMEIsRUFDMUIsU0FBMEI7UUFFMUIsSUFBSSxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDdEIsT0FBTyxNQUFNLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDM0QsQ0FBQztRQUVELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxDQUFDLGNBQWM7WUFDOUMsQ0FBQyxDQUFDLElBQUksbUJBQW1CLENBQUMsTUFBTSxDQUFDLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUM7WUFDN0UsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUVkLE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsYUFBYSxDQUN4QixNQUFjLEVBQ2QsZUFBZ0MsRUFDaEMsaUJBQXVCO1FBRXZCLE1BQU0sbUJBQW1CLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDdkUsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsYUFBYSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDckUsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvRixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksUUFBUSxDQUFDLEVBQWU7UUFDN0IsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxXQUFXO1FBQ2hCLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDbEMsQ0FBQztJQUVEOztPQUVHO0lBQ0ksYUFBYTtRQUNsQixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDM0MsQ0FBQztJQUVEOzs7T0FHRztJQUNJLGlCQUFpQjtRQUN0QixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUMvQyxDQUFDO0lBRU0sbUJBQW1CO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztJQUNwQixDQUFDO0NBQ0YifQ==
121
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFVM0UsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFLdkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDN0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFLbkIsWUFDVSxNQUEwQixFQUMxQixzQkFBOEMsRUFDOUMsU0FBMEIsRUFDMUIsS0FBbUIsRUFDM0IsYUFBc0I7UUFKZCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUMxQiwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQXdCO1FBQzlDLGNBQVMsR0FBVCxTQUFTLENBQWlCO1FBQzFCLFVBQUssR0FBTCxLQUFLLENBQWM7UUFOckIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQVN0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksa0JBQWtCLENBQUMsTUFBTSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO1FBQy9GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxtQkFBbUIsQ0FDekMsc0JBQXNCLENBQUMsU0FBUyxFQUFFLEVBQ2xDLElBQUksQ0FBQyxLQUFLLEVBQ1YsU0FBUyxFQUNULGFBQWEsQ0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxNQUFtQztRQUMxRCxNQUFNLFNBQVMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE1B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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-client",
3
- "version": "0.45.1",
3
+ "version": "0.46.2",
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.45.1",
62
- "@aztec/circuit-types": "0.45.1",
63
- "@aztec/circuits.js": "0.45.1",
64
- "@aztec/foundation": "0.45.1",
65
- "@aztec/kv-store": "0.45.1",
66
- "@aztec/noir-protocol-circuits-types": "0.45.1",
67
- "@aztec/simulator": "0.45.1",
68
- "@aztec/telemetry-client": "0.45.1",
69
- "@aztec/world-state": "0.45.1",
61
+ "@aztec/bb-prover": "0.46.2",
62
+ "@aztec/circuit-types": "0.46.2",
63
+ "@aztec/circuits.js": "0.46.2",
64
+ "@aztec/foundation": "0.46.2",
65
+ "@aztec/kv-store": "0.46.2",
66
+ "@aztec/noir-protocol-circuits-types": "0.46.2",
67
+ "@aztec/simulator": "0.46.2",
68
+ "@aztec/telemetry-client": "0.46.2",
69
+ "@aztec/world-state": "0.46.2",
70
70
  "@noir-lang/types": "portal:../../noir/packages/types",
71
71
  "commander": "^9.0.0",
72
72
  "lodash.chunk": "^4.2.0",
@@ -27,6 +27,7 @@ import { padArrayEnd } from '@aztec/foundation/collection';
27
27
  import { randomBytes } from '@aztec/foundation/crypto';
28
28
  import { type DebugLogger } from '@aztec/foundation/log';
29
29
  import { fileURLToPath } from '@aztec/foundation/url';
30
+ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
30
31
  import { NativeACVMSimulator, type SimulationProvider, WASMSimulator } from '@aztec/simulator';
31
32
  import { type MerkleTreeOperations } from '@aztec/world-state';
32
33
 
@@ -99,6 +100,7 @@ export const makeBloatedProcessedTx = async (builderDb: MerkleTreeOperations, se
99
100
  seed *= MAX_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
100
101
  const tx = mockTx(seed);
101
102
  const kernelOutput = KernelCircuitPublicInputs.empty();
103
+ kernelOutput.constants.vkTreeRoot = getVKTreeRoot();
102
104
  kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
103
105
  kernelOutput.end.publicDataUpdateRequests = makeTuple(
104
106
  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
@@ -128,7 +130,7 @@ export const makeBloatedProcessedTx = async (builderDb: MerkleTreeOperations, se
128
130
 
129
131
  export const makeEmptyProcessedTx = async (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => {
130
132
  const header = await builderDb.buildInitialHeader();
131
- return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version);
133
+ return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version, getVKTreeRoot());
132
134
  };
133
135
 
134
136
  // Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
@@ -8,14 +8,7 @@ import {
8
8
  type Tx,
9
9
  type TxValidator,
10
10
  } from '@aztec/circuit-types';
11
- import {
12
- type Gas,
13
- GlobalVariables,
14
- Header,
15
- type Nullifier,
16
- type TxContext,
17
- getMockVerificationKeys,
18
- } from '@aztec/circuits.js';
11
+ import { type Gas, GlobalVariables, Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
19
12
  import { type Fr } from '@aztec/foundation/fields';
20
13
  import { type DebugLogger } from '@aztec/foundation/log';
21
14
  import { openTmpStore } from '@aztec/kv-store/utils';
@@ -44,9 +37,9 @@ import { ProverAgent } from '../prover-agent/prover-agent.js';
44
37
  import { getEnvironmentConfig, getSimulationProvider, makeGlobals } from './fixtures.js';
45
38
 
46
39
  class DummyProverClient implements BlockProver {
47
- constructor(private orchestrator: ProvingOrchestrator, private verificationKeys = getMockVerificationKeys()) {}
40
+ constructor(private orchestrator: ProvingOrchestrator) {}
48
41
  startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<ProvingTicket> {
49
- return this.orchestrator.startNewBlock(numTxs, globalVariables, l1ToL2Messages, this.verificationKeys);
42
+ return this.orchestrator.startNewBlock(numTxs, globalVariables, l1ToL2Messages);
50
43
  }
51
44
  addNewTx(tx: ProcessedTx): Promise<void> {
52
45
  return this.orchestrator.addNewTx(tx);
@@ -30,7 +30,6 @@ import {
30
30
  PublicDataTreeLeaf,
31
31
  type PublicDataTreeLeafPreimage,
32
32
  PublicDataUpdateRequest,
33
- ROLLUP_VK_TREE_HEIGHT,
34
33
  type RecursiveProof,
35
34
  type RootParityInput,
36
35
  RootRollupInputs,
@@ -45,16 +44,10 @@ import {
45
44
  import { assertPermutation, makeTuple } from '@aztec/foundation/array';
46
45
  import { padArrayEnd } from '@aztec/foundation/collection';
47
46
  import { type Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
47
+ import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
48
48
  import { HintsBuilder, computeFeePayerBalanceLeafSlot } from '@aztec/simulator';
49
49
  import { type MerkleTreeOperations } from '@aztec/world-state';
50
50
 
51
- // Denotes fields that are not used now, but will be in the future
52
- const FUTURE_FR = new Fr(0n);
53
- const FUTURE_NUM = 0;
54
-
55
- // Denotes fields that should be deleted
56
- const DELETE_FR = new Fr(0n);
57
-
58
51
  /**
59
52
  * Type representing the names of the trees for the base rollup.
60
53
  */
@@ -267,18 +260,13 @@ export function getPreviousRollupDataFromPublicInputs(
267
260
  rollupProof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
268
261
  vk: VerificationKeyAsFields,
269
262
  ) {
263
+ const leafIndex = getVKIndex(vk);
264
+
270
265
  return new PreviousRollupData(
271
266
  rollupOutput,
272
267
  rollupProof,
273
268
  vk,
274
-
275
- // MembershipWitness for a VK tree to be implemented in the future
276
- FUTURE_NUM,
277
- new MembershipWitness(
278
- ROLLUP_VK_TREE_HEIGHT,
279
- BigInt(FUTURE_NUM),
280
- makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR),
281
- ),
269
+ new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)),
282
270
  );
283
271
  }
284
272
 
@@ -287,10 +275,7 @@ export async function getConstantRollupData(
287
275
  db: MerkleTreeOperations,
288
276
  ): Promise<ConstantRollupData> {
289
277
  return ConstantRollupData.from({
290
- baseRollupVkHash: DELETE_FR,
291
- mergeRollupVkHash: DELETE_FR,
292
- privateKernelVkTreeRoot: FUTURE_FR,
293
- publicKernelVkTreeRoot: FUTURE_FR,
278
+ vkTreeRoot: getVKTreeRoot(),
294
279
  lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
295
280
  globalVariables,
296
281
  });
@@ -303,6 +288,8 @@ export async function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeOperations
303
288
 
304
289
  export function getKernelDataFor(tx: ProcessedTx, vk: VerificationKeyData): KernelData {
305
290
  const recursiveProof = makeRecursiveProofFromBinary(tx.proof, NESTED_RECURSIVE_PROOF_LENGTH);
291
+ const leafIndex = getVKIndex(vk);
292
+
306
293
  return new KernelData(
307
294
  tx.data,
308
295
  recursiveProof,
@@ -310,9 +297,8 @@ export function getKernelDataFor(tx: ProcessedTx, vk: VerificationKeyData): Kern
310
297
  // VK for the kernel circuit
311
298
  vk,
312
299
 
313
- // MembershipWitness for a VK tree to be implemented in the future
314
- FUTURE_NUM,
315
- assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT),
300
+ leafIndex,
301
+ getVKSiblingPath(leafIndex),
316
302
  );
317
303
  }
318
304
 
@@ -45,7 +45,6 @@ import {
45
45
  RootParityInputs,
46
46
  type VerificationKeyAsFields,
47
47
  VerificationKeyData,
48
- type VerificationKeys,
49
48
  makeEmptyProof,
50
49
  } from '@aztec/circuits.js';
51
50
  import { makeTuple } from '@aztec/foundation/array';
@@ -55,6 +54,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
55
54
  import { promiseWithResolvers } from '@aztec/foundation/promise';
56
55
  import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
57
56
  import { pushTestData } from '@aztec/foundation/testing';
57
+ import { ProtocolCircuitVks, getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
58
58
  import { Attributes, type TelemetryClient, type Tracer, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
59
59
  import { type MerkleTreeOperations } from '@aztec/world-state';
60
60
 
@@ -128,7 +128,6 @@ export class ProvingOrchestrator {
128
128
  numTxs: number,
129
129
  globalVariables: GlobalVariables,
130
130
  l1ToL2Messages: Fr[],
131
- verificationKeys: VerificationKeys,
132
131
  ): Promise<ProvingTicket> {
133
132
  // Create initial header if not done so yet
134
133
  if (!this.initialHeader) {
@@ -150,7 +149,7 @@ export class ProvingOrchestrator {
150
149
  throw new Error('Too many L1 to L2 messages');
151
150
  }
152
151
  baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) =>
153
- BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i),
152
+ BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()),
154
153
  );
155
154
 
156
155
  const messageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.db);
@@ -188,7 +187,6 @@ export class ProvingOrchestrator {
188
187
  baseParityInputs.length,
189
188
  messageTreeSnapshot,
190
189
  newL1ToL2MessageTreeRootSiblingPath,
191
- verificationKeys,
192
190
  );
193
191
 
194
192
  for (let i = 0; i < baseParityInputs.length; i++) {
@@ -271,6 +269,7 @@ export class ProvingOrchestrator {
271
269
  this.initialHeader ?? (await this.db.buildInitialHeader()),
272
270
  this.provingState.globalVariables.chainId,
273
271
  this.provingState.globalVariables.version,
272
+ getVKTreeRoot(),
274
273
  );
275
274
  const txInputs: Array<{ inputs: BaseRollupInputs; snapshot: TreeSnapshots }> = [];
276
275
  for (let i = 0; i < paddingTxCount; i++) {
@@ -318,6 +317,7 @@ export class ProvingOrchestrator {
318
317
  chainId: unprovenPaddingTx.data.constants.txContext.chainId,
319
318
  version: unprovenPaddingTx.data.constants.txContext.version,
320
319
  header: unprovenPaddingTx.data.constants.historicalHeader,
320
+ vkTreeRoot: getVKTreeRoot(),
321
321
  },
322
322
  signal,
323
323
  ),
@@ -346,6 +346,9 @@ export class ProvingOrchestrator {
346
346
  for (let i = 0; i < txInputs.length; i++) {
347
347
  txInputs[i].inputs.kernelData.vk = paddingTx.verificationKey;
348
348
  txInputs[i].inputs.kernelData.proof = paddingTx.recursiveProof;
349
+
350
+ txInputs[i].inputs.kernelData.vkIndex = getVKIndex(paddingTx.verificationKey);
351
+ txInputs[i].inputs.kernelData.vkPath = getVKSiblingPath(txInputs[i].inputs.kernelData.vkIndex);
349
352
  this.enqueueFirstProof(txInputs[i].inputs, txInputs[i].snapshot, paddingTx, provingState);
350
353
  }
351
354
  }
@@ -448,7 +451,7 @@ export class ProvingOrchestrator {
448
451
  private async prepareTransaction(tx: ProcessedTx, provingState: ProvingState) {
449
452
  // Pass the private kernel tail vk here as the previous one.
450
453
  // If there are public functions then this key will be overwritten once the public tail has been proven
451
- const previousKernelVerificationKey = provingState.privateKernelVerificationKeys.privateKernelCircuit;
454
+ const previousKernelVerificationKey = ProtocolCircuitVks.PrivateKernelTailArtifact;
452
455
 
453
456
  const txInputs = await this.prepareBaseRollupInputs(provingState, tx, previousKernelVerificationKey);
454
457
  if (!txInputs) {
@@ -468,7 +471,7 @@ export class ProvingOrchestrator {
468
471
  tx,
469
472
  inputs,
470
473
  treeSnapshots,
471
- provingState.privateKernelVerificationKeys.privateKernelToPublicCircuit,
474
+ ProtocolCircuitVks.PrivateKernelTailToPublicArtifact,
472
475
  );
473
476
  const txIndex = provingState.addNewTx(txProvingState);
474
477
  const numPublicKernels = txProvingState.getNumPublicKernels();
@@ -982,6 +985,11 @@ export class ProvingOrchestrator {
982
985
  // Take the final public tail proof and verification key and pass them to the base rollup
983
986
  txProvingState.baseRollupInputs.kernelData.proof = result.proof;
984
987
  txProvingState.baseRollupInputs.kernelData.vk = result.verificationKey;
988
+ txProvingState.baseRollupInputs.kernelData.vkIndex = getVKIndex(result.verificationKey);
989
+ txProvingState.baseRollupInputs.kernelData.vkPath = getVKSiblingPath(
990
+ txProvingState.baseRollupInputs.kernelData.vkIndex,
991
+ );
992
+
985
993
  this.enqueueBaseRollup(provingState, BigInt(txIndex), txProvingState);
986
994
  return;
987
995
  }
@@ -13,7 +13,6 @@ import {
13
13
  type RootParityInput,
14
14
  type RootRollupPublicInputs,
15
15
  type VerificationKeyAsFields,
16
- type VerificationKeys,
17
16
  } from '@aztec/circuits.js';
18
17
  import { type Tuple } from '@aztec/foundation/serialize';
19
18
 
@@ -61,7 +60,6 @@ export class ProvingState {
61
60
  numRootParityInputs: number,
62
61
  public readonly messageTreeSnapshot: AppendOnlyTreeSnapshot,
63
62
  public readonly messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>,
64
- public readonly privateKernelVerificationKeys: VerificationKeys,
65
63
  ) {
66
64
  this.rootParityInputs = Array.from({ length: numRootParityInputs }).map(_ => undefined);
67
65
  }
@@ -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, type VerificationKeys } from '@aztec/circuits.js';
10
+ import { type Fr, type GlobalVariables, type Header } 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';
@@ -28,7 +28,6 @@ export class TxProver implements ProverClient {
28
28
  private constructor(
29
29
  private config: ProverClientConfig,
30
30
  private worldStateSynchronizer: WorldStateSynchronizer,
31
- private vks: VerificationKeys,
32
31
  private telemetry: TelemetryClient,
33
32
  private agent?: ProverAgent,
34
33
  initialHeader?: Header,
@@ -42,13 +41,9 @@ export class TxProver implements ProverClient {
42
41
  );
43
42
  }
44
43
 
45
- async updateProverConfig(config: Partial<ProverClientConfig & { vks: VerificationKeys }>): Promise<void> {
44
+ async updateProverConfig(config: Partial<ProverClientConfig>): Promise<void> {
46
45
  const newConfig = { ...this.config, ...config };
47
46
 
48
- if (config.vks) {
49
- this.vks = config.vks;
50
- }
51
-
52
47
  if (newConfig.realProofs !== this.config.realProofs && this.agent) {
53
48
  const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
54
49
  this.agent.setCircuitProver(circuitProver);
@@ -100,7 +95,6 @@ export class TxProver implements ProverClient {
100
95
  */
101
96
  public static async new(
102
97
  config: ProverClientConfig,
103
- vks: VerificationKeys,
104
98
  worldStateSynchronizer: WorldStateSynchronizer,
105
99
  telemetry: TelemetryClient,
106
100
  initialHeader?: Header,
@@ -113,7 +107,7 @@ export class TxProver implements ProverClient {
113
107
  )
114
108
  : undefined;
115
109
 
116
- const prover = new TxProver(config, worldStateSynchronizer, vks, telemetry, agent, initialHeader);
110
+ const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent, initialHeader);
117
111
  await prover.start();
118
112
  return prover;
119
113
  }
@@ -146,7 +140,7 @@ export class TxProver implements ProverClient {
146
140
  ): Promise<ProvingTicket> {
147
141
  const previousBlockNumber = globalVariables.blockNumber.toNumber() - 1;
148
142
  await this.worldStateSynchronizer.syncImmediate(previousBlockNumber);
149
- return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages, this.vks);
143
+ return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages);
150
144
  }
151
145
 
152
146
  /**