@aztec/prover-client 0.56.0 → 0.57.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/mocks/test_context.d.ts +5 -5
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +8 -8
- package/dest/orchestrator/block-proving-state.d.ts +6 -7
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +10 -33
- package/dest/orchestrator/epoch-proving-state.d.ts +8 -2
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +8 -16
- package/dest/orchestrator/orchestrator.d.ts +12 -15
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +134 -98
- package/dest/prover-agent/memory-proving-queue.d.ts +2 -2
- package/dest/prover-agent/memory-proving-queue.d.ts.map +1 -1
- package/dest/prover-agent/memory-proving-queue.js +3 -3
- package/dest/prover-agent/prover-agent.js +4 -4
- package/dest/prover-agent/rpc.d.ts.map +1 -1
- package/dest/prover-agent/rpc.js +4 -2
- package/dest/test/mock_prover.d.ts +3 -3
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +3 -3
- package/dest/tx-prover/tx-prover.d.ts +3 -3
- package/dest/tx-prover/tx-prover.d.ts.map +1 -1
- package/dest/tx-prover/tx-prover.js +1 -1
- package/package.json +13 -10
- package/src/index.ts +1 -1
- package/src/mocks/test_context.ts +8 -8
- package/src/orchestrator/block-proving-state.ts +9 -35
- package/src/orchestrator/epoch-proving-state.ts +9 -20
- package/src/orchestrator/orchestrator.ts +167 -131
- package/src/prover-agent/memory-proving-queue.ts +4 -3
- package/src/prover-agent/prover-agent.ts +4 -4
- package/src/prover-agent/rpc.ts +3 -0
- package/src/test/mock_prover.ts +2 -2
- package/src/tx-prover/tx-prover.ts +4 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type AvmProofAndVerificationKey, type ProvingJob, type ProvingJobSource, type ProvingRequest, type ProvingRequestResult, ProvingRequestType, type PublicInputsAndRecursiveProof, type ServerCircuitProver } from '@aztec/circuit-types';
|
|
2
|
-
import type { AvmCircuitInputs, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, KernelCircuitPublicInputs, MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputData, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelInnerCircuitPrivateInputs, PublicKernelTailCircuitPrivateInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VMCircuitPublicInputs, VerificationKeyData } from '@aztec/circuits.js';
|
|
2
|
+
import type { AvmCircuitInputs, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EmptyBlockRootRollupInputs, KernelCircuitPublicInputs, MergeRollupInputs, NESTED_RECURSIVE_PROOF_LENGTH, PrivateKernelEmptyInputData, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelInnerCircuitPrivateInputs, PublicKernelTailCircuitPrivateInputs, RECURSIVE_PROOF_LENGTH, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VMCircuitPublicInputs, VerificationKeyData } from '@aztec/circuits.js';
|
|
3
3
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
4
4
|
/**
|
|
5
5
|
* A helper class that sits in between services that need proofs created and agents that can create them.
|
|
@@ -62,7 +62,7 @@ export declare class MemoryProvingQueue implements ServerCircuitProver, ProvingJ
|
|
|
62
62
|
* @param input - Input to the circuit.
|
|
63
63
|
*/
|
|
64
64
|
getBlockRootRollupProof(input: BlockRootRollupInputs, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
65
|
-
|
|
65
|
+
getEmptyBlockRootRollupProof(input: EmptyBlockRootRollupInputs, signal?: AbortSignal, epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
66
66
|
/**
|
|
67
67
|
* Creates a proof for the given input.
|
|
68
68
|
* @param input - Input to the circuit.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-proving-queue.d.ts","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,kBAAkB,EAClB,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,gBAAgB,EAChB,6BAA6B,EAC7B,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,EACtB,iCAAiC,EACjC,qBAAqB,EACrB,yBAAyB,EACzB,iBAAiB,EACjB,6BAA6B,EAC7B,2BAA2B,EAC3B,gCAAgC,EAChC,+BAA+B,EAC/B,qCAAqC,EACrC,oCAAoC,EACpC,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,sBAAsB,EACtB,UAAU,EACV,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAgB/D;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB,EAAE,gBAAgB;IAa5E,mEAAmE;IACnE,OAAO,CAAC,YAAY;IAGpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAjBpB,OAAO,CAAC,GAAG,CAA8D;IACzE,OAAO,CAAC,KAAK,CAEX;IACF,OAAO,CAAC,cAAc,CAA8C;IAEpE,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,OAAO,CAAsB;gBAGnC,MAAM,EAAE,eAAe;IACvB,mEAAmE;IAC3D,YAAY,SAAY;IAChC,4CAA4C;IAC5C,iBAAiB,SAAO,EAChB,UAAU,eAAqB,EAC/B,UAAU,eAAoB;IAMjC,KAAK;IAUC,IAAI;IAUJ,aAAa,CAAC,EAAE,UAAc,EAAE;;KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IA8BpG,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB9G,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCjD,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAavC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI3C,OAAO,CAAC,IAAI,CAkBV;IAEF,OAAO,CAAC,OAAO;IAwCf,0BAA0B,CACxB,MAAM,EAAE,2BAA2B,EACnC,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAIpE,YAAY,CACV,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAA;KAAE,CAAC;IAIrG,iBAAiB,CACf,MAAM,EAAE,2BAA2B,EACnC,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAIpE;;;OAGG;IACH,kBAAkB,CAChB,MAAM,EAAE,gBAAgB,EACxB,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,eAAe,CAAC,OAAO,sBAAsB,CAAC,CAAC;IAI1D;;;OAGG;IACH,kBAAkB,CAChB,MAAM,EAAE,gBAAgB,EACxB,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,eAAe,CAAC,OAAO,6BAA6B,CAAC,CAAC;IAIjE;;;OAGG;IACH,kBAAkB,CAChB,eAAe,EAAE,gBAAgB,EACjC,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAIxE;;;OAGG;IACH,mBAAmB,CACjB,KAAK,EAAE,iBAAiB,EACxB,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAIxE;;;OAGG;IACH,uBAAuB,CACrB,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,WAAW,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAI5E,4BAA4B,CAC1B,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"memory-proving-queue.d.ts","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -214,8 +214,8 @@ export class MemoryProvingQueue {
|
|
|
214
214
|
getBlockRootRollupProof(input, signal, epochNumber) {
|
|
215
215
|
return this.enqueue({ type: ProvingRequestType.BLOCK_ROOT_ROLLUP, inputs: input }, signal, epochNumber);
|
|
216
216
|
}
|
|
217
|
-
|
|
218
|
-
return this.enqueue({ type: ProvingRequestType.
|
|
217
|
+
getEmptyBlockRootRollupProof(input, signal, epochNumber) {
|
|
218
|
+
return this.enqueue({ type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, inputs: input }, signal, epochNumber);
|
|
219
219
|
}
|
|
220
220
|
/**
|
|
221
221
|
* Creates a proof for the given input.
|
|
@@ -265,4 +265,4 @@ export class MemoryProvingQueue {
|
|
|
265
265
|
return Promise.reject('not implemented');
|
|
266
266
|
}
|
|
267
267
|
}
|
|
268
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory-proving-queue.js","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
268
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory-proving-queue.js","sourceRoot":"","sources":["../../src/prover-agent/memory-proving-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -140,12 +140,12 @@ export class ProverAgent {
|
|
|
140
140
|
case ProvingRequestType.MERGE_ROLLUP: {
|
|
141
141
|
return this.circuitProver.getMergeRollupProof(inputs);
|
|
142
142
|
}
|
|
143
|
+
case ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP: {
|
|
144
|
+
return this.circuitProver.getEmptyBlockRootRollupProof(inputs);
|
|
145
|
+
}
|
|
143
146
|
case ProvingRequestType.BLOCK_ROOT_ROLLUP: {
|
|
144
147
|
return this.circuitProver.getBlockRootRollupProof(inputs);
|
|
145
148
|
}
|
|
146
|
-
case ProvingRequestType.BLOCK_ROOT_ROLLUP_FINAL: {
|
|
147
|
-
return this.circuitProver.getBlockRootRollupFinalProof(inputs);
|
|
148
|
-
}
|
|
149
149
|
case ProvingRequestType.BLOCK_MERGE_ROLLUP: {
|
|
150
150
|
return this.circuitProver.getBlockMergeRollupProof(inputs);
|
|
151
151
|
}
|
|
@@ -171,4 +171,4 @@ export class ProverAgent {
|
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
173
|
}
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-agent.js","sourceRoot":"","sources":["../../src/prover-agent/prover-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/prover-agent/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAkC7D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAoCnF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,yFAA8B,GAClC,gBAAgB,CAuClB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,WAAW,iBAc5D"}
|
package/dest/prover-agent/rpc.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AvmCircuitInputs, AvmVerificationKeyData, AztecAddress, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EthAddress, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, PrivateKernelEmptyInputData, Proof, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelInnerCircuitPrivateInputs, PublicKernelTailCircuitPrivateInputs, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VMCircuitPublicInputs, VerificationKeyData, } from '@aztec/circuits.js';
|
|
1
|
+
import { AvmCircuitInputs, AvmVerificationKeyData, AztecAddress, BaseOrMergeRollupPublicInputs, BaseParityInputs, BaseRollupInputs, BlockMergeRollupInputs, BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EmptyBlockRootRollupInputs, EthAddress, Fr, Header, KernelCircuitPublicInputs, MergeRollupInputs, ParityPublicInputs, PrivateKernelEmptyInputData, Proof, PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, PublicKernelInnerCircuitPrivateInputs, PublicKernelTailCircuitPrivateInputs, RecursiveProof, RootParityInput, RootParityInputs, RootRollupInputs, RootRollupPublicInputs, TubeInputs, VMCircuitPublicInputs, VerificationKeyData, } from '@aztec/circuits.js';
|
|
2
2
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
3
3
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
4
4
|
import { ProvingError } from './proving-error.js';
|
|
@@ -32,6 +32,7 @@ export function createProvingJobSourceServer(queue) {
|
|
|
32
32
|
BlockRootOrBlockMergePublicInputs,
|
|
33
33
|
BlockMergeRollupInputs,
|
|
34
34
|
BlockRootRollupInputs,
|
|
35
|
+
EmptyBlockRootRollupInputs,
|
|
35
36
|
}, {});
|
|
36
37
|
}
|
|
37
38
|
export function createProvingJobSourceClient(url, namespace, fetch = makeFetch([1, 2, 3], false)) {
|
|
@@ -64,6 +65,7 @@ export function createProvingJobSourceClient(url, namespace, fetch = makeFetch([
|
|
|
64
65
|
BlockRootOrBlockMergePublicInputs,
|
|
65
66
|
BlockMergeRollupInputs,
|
|
66
67
|
BlockRootRollupInputs,
|
|
68
|
+
EmptyBlockRootRollupInputs,
|
|
67
69
|
}, {}, false, namespace, fetch);
|
|
68
70
|
}
|
|
69
71
|
/**
|
|
@@ -82,4 +84,4 @@ export function createProverAgentRpcServer(agent) {
|
|
|
82
84
|
['start', 'stop', 'setCircuitProver', 'work', 'getProof']);
|
|
83
85
|
return rpc;
|
|
84
86
|
}
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3Zlci1hZ2VudC9ycGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLGdCQUFnQixFQUNoQixzQkFBc0IsRUFDdEIsWUFBWSxFQUNaLDZCQUE2QixFQUM3QixnQkFBZ0IsRUFDaEIsZ0JBQWdCLEVBQ2hCLHNCQUFzQixFQUN0QixpQ0FBaUMsRUFDakMscUJBQXFCLEVBQ3JCLDBCQUEwQixFQUMxQixVQUFVLEVBQ1YsRUFBRSxFQUNGLE1BQU0sRUFDTix5QkFBeUIsRUFDekIsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQiwyQkFBMkIsRUFDM0IsS0FBSyxFQUNMLGdDQUFnQyxFQUNoQywrQkFBK0IsRUFDL0IscUNBQXFDLEVBQ3JDLG9DQUFvQyxFQUNwQyxjQUFjLEVBQ2QsZUFBZSxFQUNmLGdCQUFnQixFQUNoQixnQkFBZ0IsRUFDaEIsc0JBQXNCLEVBQ3RCLFVBQVUsRUFDVixxQkFBcUIsRUFDckIsbUJBQW1CLEdBQ3BCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLFNBQVMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsTUFBTSxVQUFVLDRCQUE0QixDQUFDLEtBQXVCO0lBQ2xFLE9BQU8sSUFBSSxhQUFhLENBQ3RCLEtBQUssRUFDTDtRQUNFLHNCQUFzQjtRQUN0QixnQkFBZ0I7UUFDaEIsNkJBQTZCO1FBQzdCLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsRUFBRTtRQUNGLE1BQU07UUFDTix5QkFBeUI7UUFDekIsaUJBQWlCO1FBQ2pCLGtCQUFrQjtRQUNsQixLQUFLO1FBQ0wsWUFBWTtRQUNaLDJCQUEyQjtRQUMzQixxQkFBcUI7UUFDckIscUNBQXFDO1FBQ3JDLGdDQUFnQztRQUNoQywrQkFBK0I7UUFDL0Isb0NBQW9DO1FBQ3BDLGNBQWM7UUFDZCxlQUFlO1FBQ2YsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixzQkFBc0I7UUFDdEIsVUFBVTtRQUNWLG1CQUFtQjtRQUNuQixpQ0FBaUM7UUFDakMsc0JBQXNCO1FBQ3RCLHFCQUFxQjtRQUNyQiwwQkFBMEI7S0FDM0IsRUFDRCxFQUFFLENBQ0gsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsNEJBQTRCLENBQzFDLEdBQVcsRUFDWCxTQUFrQixFQUNsQixLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7SUFFbkMsT0FBTyxtQkFBbUIsQ0FDeEIsR0FBRyxFQUNIO1FBQ0Usc0JBQXNCO1FBQ3RCLGdCQUFnQjtRQUNoQiw2QkFBNkI7UUFDN0IsZ0JBQWdCO1FBQ2hCLGdCQUFnQjtRQUNoQixFQUFFO1FBQ0YsTUFBTTtRQUNOLHlCQUF5QjtRQUN6QixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLEtBQUs7UUFDTCxZQUFZO1FBQ1osMkJBQTJCO1FBQzNCLHFCQUFxQjtRQUNyQixxQ0FBcUM7UUFDckMsZ0NBQWdDO1FBQ2hDLCtCQUErQjtRQUMvQixvQ0FBb0M7UUFDcEMsY0FBYztRQUNkLGVBQWU7UUFDZixnQkFBZ0I7UUFDaEIsc0JBQXNCO1FBQ3RCLGdCQUFnQjtRQUNoQixVQUFVO1FBQ1YsbUJBQW1CO1FBQ25CLGlDQUFpQztRQUNqQyxzQkFBc0I7UUFDdEIscUJBQXFCO1FBQ3JCLDBCQUEwQjtLQUMzQixFQUNELEVBQUUsRUFDRixLQUFLLEVBQ0wsU0FBUyxFQUNULEtBQUssQ0FDYyxDQUFDO0FBQ3hCLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLDBCQUEwQixDQUFDLEtBQWtCO0lBQzNELE1BQU0sR0FBRyxHQUFHLElBQUksYUFBYSxDQUMzQixLQUFLLEVBQ0w7UUFDRSxZQUFZO1FBQ1osVUFBVTtRQUNWLEVBQUU7UUFDRixNQUFNO0tBQ1AsRUFDRCxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQzFELENBQUM7SUFDRixPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMifQ==
|
|
@@ -6,13 +6,13 @@ export declare class MockProver implements ServerCircuitProver {
|
|
|
6
6
|
proof: import("@aztec/circuits.js").Proof;
|
|
7
7
|
verificationKey: AvmVerificationKeyData;
|
|
8
8
|
}>;
|
|
9
|
-
getBaseParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<
|
|
10
|
-
getRootParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<
|
|
9
|
+
getBaseParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<463>>;
|
|
10
|
+
getRootParityProof(): Promise<import("@aztec/circuits.js").RootParityInput<463>>;
|
|
11
11
|
getBaseRollupProof(): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
12
12
|
getMergeRollupProof(): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>>;
|
|
13
13
|
getBlockMergeRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
14
|
+
getEmptyBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
14
15
|
getBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
15
|
-
getBlockRootRollupFinalProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>>;
|
|
16
16
|
getEmptyPrivateKernelProof(): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>>;
|
|
17
17
|
getEmptyTubeProof(): Promise<PublicInputsAndTubeProof<KernelCircuitPublicInputs>>;
|
|
18
18
|
getPublicKernelInnerProof(): Promise<PublicInputsAndRecursiveProof<VMCircuitPublicInputs>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock_prover.d.ts","sourceRoot":"","sources":["../../src/test/mock_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,KAAK,yBAAyB,EAC9B,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,mBAAmB,EAGpB,MAAM,oBAAoB,CAAC;AAW5B,qBAAa,UAAW,YAAW,mBAAmB;;IAGpD,WAAW;;;;IASX,kBAAkB;IAIlB,kBAAkB;IAIlB,kBAAkB;IAUlB,mBAAmB,IAAI,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAU5F,wBAAwB;IAUxB,
|
|
1
|
+
{"version":3,"file":"mock_prover.d.ts","sourceRoot":"","sources":["../../src/test/mock_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,KAAK,yBAAyB,EAC9B,KAAK,+BAA+B,EACpC,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,mBAAmB,EAGpB,MAAM,oBAAoB,CAAC;AAW5B,qBAAa,UAAW,YAAW,mBAAmB;;IAGpD,WAAW;;;;IASX,kBAAkB;IAIlB,kBAAkB;IAIlB,kBAAkB;IAUlB,mBAAmB,IAAI,OAAO,CAAC,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;IAU5F,wBAAwB;IAUxB,4BAA4B,IAAI,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAUzG,uBAAuB,IAAI,OAAO,CAAC,6BAA6B,CAAC,iCAAiC,CAAC,CAAC;IAUpG,0BAA0B,IAAI,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAU/F,iBAAiB,IAAI,OAAO,CAAC,wBAAwB,CAAC,yBAAyB,CAAC,CAAC;IAUjF,yBAAyB,IAAI,OAAO,CAAC,6BAA6B,CAAC,qBAAqB,CAAC,CAAC;IAU1F,yBAAyB,IAAI,OAAO,CAAC,6BAA6B,CAAC,+BAA+B,CAAC,CAAC;IAUpG,kBAAkB,IAAI,OAAO,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,CAAC;IAUvF,kBAAkB,IAAI,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;IAUpF,YAAY,IAAI,OAAO,CAAC;QACtB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,SAAS,EAAE,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAAC;KAC1D,CAAC;CAMH"}
|
package/dest/test/mock_prover.js
CHANGED
|
@@ -24,10 +24,10 @@ export class MockProver {
|
|
|
24
24
|
getBlockMergeRollupProof() {
|
|
25
25
|
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
getEmptyBlockRootRollupProof() {
|
|
28
28
|
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
29
29
|
}
|
|
30
|
-
|
|
30
|
+
getBlockRootRollupProof() {
|
|
31
31
|
return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFake()));
|
|
32
32
|
}
|
|
33
33
|
getEmptyPrivateKernelProof() {
|
|
@@ -55,4 +55,4 @@ export class MockProver {
|
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19wcm92ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwsaUNBQWlDLEdBQ2xDLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUNMLHNCQUFzQixFQUt0QixzQkFBc0IsRUFJdEIsbUJBQW1CLEVBQ25CLGNBQWMsRUFDZCxrQkFBa0IsR0FDbkIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQ0wsaUNBQWlDLEVBQ2pDLDJDQUEyQyxFQUMzQyw2QkFBNkIsRUFDN0IsbUNBQW1DLEVBQ25DLG1CQUFtQixFQUNuQiwwQkFBMEIsRUFDMUIseUJBQXlCLEdBQzFCLE1BQU0sNEJBQTRCLENBQUM7QUFFcEMsTUFBTSxPQUFPLFVBQVU7SUFDckIsZ0JBQWUsQ0FBQztJQUVoQixXQUFXO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDO1lBQ2QsS0FBSyxFQUFFLGNBQWMsRUFBRTtZQUN2QixlQUFlLEVBQUUsc0JBQXNCLENBQUMsUUFBUSxFQUFFO1NBQ25ELENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELGtCQUFrQjtRQUNoQixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFRCxrQkFBa0I7UUFDaEIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBRUQsa0JBQWtCO1FBQ2hCLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FDcEIsaUNBQWlDLENBQy9CLGlDQUFpQyxFQUFFLEVBQ25DLGtCQUFrQixDQUFDLHNCQUFzQixDQUFDLEVBQzFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxDQUMvQixDQUNGLENBQUM7SUFD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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type EpochProver, type EpochProverManager, type ProvingJobSource } from '@aztec/circuit-types/interfaces';
|
|
2
2
|
import { Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
4
4
|
import { type MerkleTreeOperations } from '@aztec/world-state';
|
|
@@ -7,14 +7,14 @@ import { type ProverClientConfig } from '../config.js';
|
|
|
7
7
|
* A prover factory.
|
|
8
8
|
* TODO(palla/prover-node): Rename this class
|
|
9
9
|
*/
|
|
10
|
-
export declare class TxProver implements
|
|
10
|
+
export declare class TxProver implements EpochProverManager {
|
|
11
11
|
private config;
|
|
12
12
|
private telemetry;
|
|
13
13
|
private agent?;
|
|
14
14
|
private queue;
|
|
15
15
|
private running;
|
|
16
16
|
private constructor();
|
|
17
|
-
|
|
17
|
+
createEpochProver(db: MerkleTreeOperations): EpochProver;
|
|
18
18
|
getProverId(): Fr;
|
|
19
19
|
updateProverConfig(config: Partial<ProverClientConfig>): Promise<void>;
|
|
20
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,
|
|
1
|
+
{"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD;;;GAGG;AACH,qBAAa,QAAS,YAAW,kBAAkB;IAK/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IANhB,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAUA,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,WAAW;IAIxD,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IAWjB;;;;;;OAMG;WACiB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe;mBAczD,kBAAkB;IAehC,mBAAmB,IAAI,gBAAgB;CAG/C"}
|
|
@@ -18,7 +18,7 @@ export class TxProver {
|
|
|
18
18
|
// so it can be reused across multiple ones and not recomputed every time.
|
|
19
19
|
this.queue = new MemoryProvingQueue(telemetry, config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
createEpochProver(db) {
|
|
22
22
|
return new ProvingOrchestrator(db, this.queue, this.telemetry, this.config.proverId);
|
|
23
23
|
}
|
|
24
24
|
getProverId() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.57.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -42,6 +42,9 @@
|
|
|
42
42
|
"parser": {
|
|
43
43
|
"syntax": "typescript",
|
|
44
44
|
"decorators": true
|
|
45
|
+
},
|
|
46
|
+
"transform": {
|
|
47
|
+
"decoratorVersion": "2022-03"
|
|
45
48
|
}
|
|
46
49
|
}
|
|
47
50
|
}
|
|
@@ -60,15 +63,15 @@
|
|
|
60
63
|
]
|
|
61
64
|
},
|
|
62
65
|
"dependencies": {
|
|
63
|
-
"@aztec/bb-prover": "0.
|
|
64
|
-
"@aztec/circuit-types": "0.
|
|
65
|
-
"@aztec/circuits.js": "0.
|
|
66
|
-
"@aztec/foundation": "0.
|
|
67
|
-
"@aztec/kv-store": "0.
|
|
68
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
69
|
-
"@aztec/simulator": "0.
|
|
70
|
-
"@aztec/telemetry-client": "0.
|
|
71
|
-
"@aztec/world-state": "0.
|
|
66
|
+
"@aztec/bb-prover": "0.57.0",
|
|
67
|
+
"@aztec/circuit-types": "0.57.0",
|
|
68
|
+
"@aztec/circuits.js": "0.57.0",
|
|
69
|
+
"@aztec/foundation": "0.57.0",
|
|
70
|
+
"@aztec/kv-store": "0.57.0",
|
|
71
|
+
"@aztec/noir-protocol-circuits-types": "0.57.0",
|
|
72
|
+
"@aztec/simulator": "0.57.0",
|
|
73
|
+
"@aztec/telemetry-client": "0.57.0",
|
|
74
|
+
"@aztec/world-state": "0.57.0",
|
|
72
75
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
73
76
|
"commander": "^12.1.0",
|
|
74
77
|
"lodash.chunk": "^4.2.0",
|
package/src/index.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { type BBProverConfig } from '@aztec/bb-prover';
|
|
2
2
|
import {
|
|
3
|
-
type BlockProver,
|
|
4
3
|
type MerkleTreeAdminOperations,
|
|
5
4
|
type ProcessedTx,
|
|
5
|
+
type ProcessedTxHandler,
|
|
6
6
|
type PublicExecutionRequest,
|
|
7
7
|
type ServerCircuitProver,
|
|
8
8
|
type Tx,
|
|
9
9
|
type TxValidator,
|
|
10
10
|
} from '@aztec/circuit-types';
|
|
11
|
-
import { type Gas, GlobalVariables, Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
|
|
11
|
+
import { type Gas, type GlobalVariables, Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
|
|
12
12
|
import { type Fr } from '@aztec/foundation/fields';
|
|
13
13
|
import { type DebugLogger } from '@aztec/foundation/log';
|
|
14
14
|
import { openTmpStore } from '@aztec/kv-store/utils';
|
|
@@ -53,7 +53,7 @@ export class TestContext {
|
|
|
53
53
|
public logger: DebugLogger,
|
|
54
54
|
) {}
|
|
55
55
|
|
|
56
|
-
public get
|
|
56
|
+
public get epochProver() {
|
|
57
57
|
return this.orchestrator;
|
|
58
58
|
}
|
|
59
59
|
|
|
@@ -89,7 +89,7 @@ export class TestContext {
|
|
|
89
89
|
actualDb,
|
|
90
90
|
publicExecutor,
|
|
91
91
|
publicKernel,
|
|
92
|
-
|
|
92
|
+
globalVariables,
|
|
93
93
|
Header.empty(),
|
|
94
94
|
worldStateDB,
|
|
95
95
|
telemetry,
|
|
@@ -150,7 +150,7 @@ export class TestContext {
|
|
|
150
150
|
public async processPublicFunctions(
|
|
151
151
|
txs: Tx[],
|
|
152
152
|
maxTransactions: number,
|
|
153
|
-
|
|
153
|
+
txHandler?: ProcessedTxHandler,
|
|
154
154
|
txValidator?: TxValidator<ProcessedTx>,
|
|
155
155
|
) {
|
|
156
156
|
const defaultExecutorImplementation = (
|
|
@@ -182,7 +182,7 @@ export class TestContext {
|
|
|
182
182
|
return await this.processPublicFunctionsWithMockExecutorImplementation(
|
|
183
183
|
txs,
|
|
184
184
|
maxTransactions,
|
|
185
|
-
|
|
185
|
+
txHandler,
|
|
186
186
|
txValidator,
|
|
187
187
|
defaultExecutorImplementation,
|
|
188
188
|
);
|
|
@@ -191,7 +191,7 @@ export class TestContext {
|
|
|
191
191
|
public async processPublicFunctionsWithMockExecutorImplementation(
|
|
192
192
|
txs: Tx[],
|
|
193
193
|
maxTransactions: number,
|
|
194
|
-
|
|
194
|
+
txHandler?: ProcessedTxHandler,
|
|
195
195
|
txValidator?: TxValidator<ProcessedTx>,
|
|
196
196
|
executorMock?: (
|
|
197
197
|
execution: PublicExecutionRequest,
|
|
@@ -206,6 +206,6 @@ export class TestContext {
|
|
|
206
206
|
if (executorMock) {
|
|
207
207
|
this.publicExecutor.simulate.mockImplementation(executorMock);
|
|
208
208
|
}
|
|
209
|
-
return await this.publicProcessor.process(txs, maxTransactions,
|
|
209
|
+
return await this.publicProcessor.process(txs, maxTransactions, txHandler, txValidator);
|
|
210
210
|
}
|
|
211
211
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type L2Block, type MerkleTreeId
|
|
1
|
+
import { type L2Block, type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
3
|
type ARCHIVE_HEIGHT,
|
|
4
4
|
type AppendOnlyTreeSnapshot,
|
|
@@ -18,14 +18,9 @@ import {
|
|
|
18
18
|
} from '@aztec/circuits.js';
|
|
19
19
|
import { type Tuple } from '@aztec/foundation/serialize';
|
|
20
20
|
|
|
21
|
+
import { type EpochProvingState } from './epoch-proving-state.js';
|
|
21
22
|
import { type TxProvingState } from './tx-proving-state.js';
|
|
22
23
|
|
|
23
|
-
enum PROVING_STATE_LIFECYCLE {
|
|
24
|
-
PROVING_STATE_CREATED,
|
|
25
|
-
PROVING_STATE_RESOLVED,
|
|
26
|
-
PROVING_STATE_REJECTED,
|
|
27
|
-
}
|
|
28
|
-
|
|
29
24
|
export type MergeRollupInputData = {
|
|
30
25
|
inputs: [BaseOrMergeRollupPublicInputs | undefined, BaseOrMergeRollupPublicInputs | undefined];
|
|
31
26
|
proofs: [
|
|
@@ -46,12 +41,11 @@ export class BlockProvingState {
|
|
|
46
41
|
private rootParityInputs: Array<RootParityInput<typeof RECURSIVE_PROOF_LENGTH> | undefined> = [];
|
|
47
42
|
private finalRootParityInputs: RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined;
|
|
48
43
|
public blockRootRollupPublicInputs: BlockRootOrBlockMergePublicInputs | undefined;
|
|
44
|
+
public blockRootRollupStarted: boolean = false;
|
|
49
45
|
public finalProof: Proof | undefined;
|
|
50
46
|
public block: L2Block | undefined;
|
|
51
47
|
private txs: TxProvingState[] = [];
|
|
52
48
|
|
|
53
|
-
private provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED;
|
|
54
|
-
|
|
55
49
|
constructor(
|
|
56
50
|
public readonly index: number,
|
|
57
51
|
public readonly totalNumTxs: number,
|
|
@@ -63,8 +57,7 @@ export class BlockProvingState {
|
|
|
63
57
|
public readonly archiveTreeSnapshot: AppendOnlyTreeSnapshot,
|
|
64
58
|
public readonly archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
|
|
65
59
|
public readonly previousBlockHash: Fr,
|
|
66
|
-
private
|
|
67
|
-
private rejectionCallback?: (reason: string) => void,
|
|
60
|
+
private readonly parentEpoch: EpochProvingState,
|
|
68
61
|
) {
|
|
69
62
|
this.rootParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }).map(_ => undefined);
|
|
70
63
|
}
|
|
@@ -188,6 +181,7 @@ export class BlockProvingState {
|
|
|
188
181
|
// Returns true if we have sufficient inputs to execute the block root rollup
|
|
189
182
|
public isReadyForBlockRootRollup() {
|
|
190
183
|
return !(
|
|
184
|
+
this.block === undefined ||
|
|
191
185
|
this.mergeRollupInputs[0] === undefined ||
|
|
192
186
|
this.finalRootParityInput === undefined ||
|
|
193
187
|
this.mergeRollupInputs[0].inputs.findIndex(p => !p) !== -1
|
|
@@ -206,35 +200,15 @@ export class BlockProvingState {
|
|
|
206
200
|
|
|
207
201
|
// Returns true if we are still able to accept transactions, false otherwise
|
|
208
202
|
public isAcceptingTransactions() {
|
|
209
|
-
return
|
|
210
|
-
this.provingStateLifecycle === PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED && this.totalNumTxs > this.txs.length
|
|
211
|
-
);
|
|
203
|
+
return this.totalNumTxs > this.txs.length;
|
|
212
204
|
}
|
|
213
205
|
|
|
214
|
-
// Returns
|
|
206
|
+
// Returns whether the proving state is still valid
|
|
215
207
|
public verifyState() {
|
|
216
|
-
return this.
|
|
208
|
+
return this.parentEpoch.verifyState();
|
|
217
209
|
}
|
|
218
210
|
|
|
219
|
-
// Attempts to reject the proving state promise with the given reason
|
|
220
211
|
public reject(reason: string) {
|
|
221
|
-
|
|
222
|
-
return;
|
|
223
|
-
}
|
|
224
|
-
this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_REJECTED;
|
|
225
|
-
if (this.rejectionCallback) {
|
|
226
|
-
this.rejectionCallback(reason);
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
// Attempts to resolve the proving state promise with the given result
|
|
231
|
-
public resolve(result: ProvingResult) {
|
|
232
|
-
if (!this.verifyState()) {
|
|
233
|
-
return;
|
|
234
|
-
}
|
|
235
|
-
this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_RESOLVED;
|
|
236
|
-
if (this.completionCallback) {
|
|
237
|
-
this.completionCallback(result);
|
|
238
|
-
}
|
|
212
|
+
this.parentEpoch.reject(reason);
|
|
239
213
|
}
|
|
240
214
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type MerkleTreeId
|
|
1
|
+
import { type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
3
|
type ARCHIVE_HEIGHT,
|
|
4
4
|
type AppendOnlyTreeSnapshot,
|
|
@@ -36,6 +36,8 @@ export type BlockMergeRollupInputData = {
|
|
|
36
36
|
verificationKeys: [VerificationKeyAsFields | undefined, VerificationKeyAsFields | undefined];
|
|
37
37
|
};
|
|
38
38
|
|
|
39
|
+
export type ProvingResult = { status: 'success' } | { status: 'failure'; reason: string };
|
|
40
|
+
|
|
39
41
|
/**
|
|
40
42
|
* The current state of the proving schedule for an epoch.
|
|
41
43
|
* Contains the raw inputs and intermediate state to generate every constituent proof in the tree.
|
|
@@ -59,18 +61,20 @@ export class EpochProvingState {
|
|
|
59
61
|
|
|
60
62
|
/** Returns the current block proving state */
|
|
61
63
|
public get currentBlock(): BlockProvingState | undefined {
|
|
62
|
-
return this.blocks
|
|
64
|
+
return this.blocks.at(-1);
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
// Returns the number of levels of merge rollups
|
|
66
68
|
public get numMergeLevels() {
|
|
67
|
-
|
|
69
|
+
const totalLeaves = Math.max(2, this.totalNumBlocks);
|
|
70
|
+
return BigInt(Math.ceil(Math.log2(totalLeaves)) - 1);
|
|
68
71
|
}
|
|
69
72
|
|
|
70
73
|
// Calculates the index and level of the parent rollup circuit
|
|
71
74
|
// Based on tree implementation in unbalanced_tree.ts -> batchInsert()
|
|
72
75
|
// REFACTOR: This is repeated from the block orchestrator
|
|
73
76
|
public findMergeLevel(currentLevel: bigint, currentIndex: bigint) {
|
|
77
|
+
const totalLeaves = Math.max(2, this.totalNumBlocks);
|
|
74
78
|
const moveUpMergeLevel = (levelSize: number, index: bigint, nodeToShift: boolean) => {
|
|
75
79
|
levelSize /= 2;
|
|
76
80
|
if (levelSize & 1) {
|
|
@@ -79,8 +83,7 @@ export class EpochProvingState {
|
|
|
79
83
|
index >>= 1n;
|
|
80
84
|
return { thisLevelSize: levelSize, thisIndex: index, shiftUp: nodeToShift };
|
|
81
85
|
};
|
|
82
|
-
let [thisLevelSize, shiftUp] =
|
|
83
|
-
this.totalNumBlocks & 1 ? [this.totalNumBlocks - 1, true] : [this.totalNumBlocks, false];
|
|
86
|
+
let [thisLevelSize, shiftUp] = totalLeaves & 1 ? [totalLeaves - 1, true] : [totalLeaves, false];
|
|
84
87
|
const maxLevel = this.numMergeLevels + 1n;
|
|
85
88
|
let placeholder = currentIndex;
|
|
86
89
|
for (let i = 0; i < maxLevel - currentLevel; i++) {
|
|
@@ -107,8 +110,6 @@ export class EpochProvingState {
|
|
|
107
110
|
archiveTreeSnapshot: AppendOnlyTreeSnapshot,
|
|
108
111
|
archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
|
|
109
112
|
previousBlockHash: Fr,
|
|
110
|
-
completionCallback?: (result: ProvingResult) => void,
|
|
111
|
-
rejectionCallback?: (reason: string) => void,
|
|
112
113
|
) {
|
|
113
114
|
const block = new BlockProvingState(
|
|
114
115
|
this.blocks.length,
|
|
@@ -121,15 +122,7 @@ export class EpochProvingState {
|
|
|
121
122
|
archiveTreeSnapshot,
|
|
122
123
|
archiveTreeRootSiblingPath,
|
|
123
124
|
previousBlockHash,
|
|
124
|
-
|
|
125
|
-
reason => {
|
|
126
|
-
// Reject the block
|
|
127
|
-
if (rejectionCallback) {
|
|
128
|
-
rejectionCallback(reason);
|
|
129
|
-
}
|
|
130
|
-
// An error on any block rejects this whole epoch
|
|
131
|
-
this.reject(reason);
|
|
132
|
-
},
|
|
125
|
+
this,
|
|
133
126
|
);
|
|
134
127
|
this.blocks.push(block);
|
|
135
128
|
if (this.blocks.length === this.totalNumBlocks) {
|
|
@@ -214,10 +207,6 @@ export class EpochProvingState {
|
|
|
214
207
|
}
|
|
215
208
|
this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_REJECTED;
|
|
216
209
|
this.rejectionCallback(reason);
|
|
217
|
-
|
|
218
|
-
for (const block of this.blocks) {
|
|
219
|
-
block.reject('Proving cancelled');
|
|
220
|
-
}
|
|
221
210
|
}
|
|
222
211
|
|
|
223
212
|
// Attempts to resolve the proving state promise with the given result
|