@aztec/prover-client 0.0.1-commit.fce3e4f → 0.0.1-commit.fffb133c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/config.d.ts +2 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +1 -1
- package/dest/light/index.d.ts +2 -0
- package/dest/light/index.d.ts.map +1 -0
- package/dest/light/index.js +1 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts +30 -14
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
- package/dest/light/lightweight_checkpoint_builder.js +109 -22
- package/dest/mocks/fixtures.js +4 -4
- package/dest/mocks/test_context.d.ts +5 -3
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +25 -11
- package/dest/orchestrator/block-building-helpers.d.ts +4 -4
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +5 -4
- package/dest/orchestrator/block-proving-state.d.ts +5 -4
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +1 -1
- package/dest/orchestrator/checkpoint-proving-state.d.ts +20 -6
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/checkpoint-proving-state.js +40 -5
- package/dest/orchestrator/epoch-proving-state.d.ts +8 -7
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +36 -2
- package/dest/orchestrator/orchestrator.d.ts +21 -8
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +479 -77
- package/dest/orchestrator/orchestrator_metrics.d.ts +1 -3
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator_metrics.js +2 -15
- package/dest/orchestrator/tx-proving-state.d.ts +6 -5
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +8 -8
- package/dest/prover-client/factory.d.ts +3 -3
- package/dest/prover-client/factory.d.ts.map +1 -1
- package/dest/prover-client/prover-client.d.ts +3 -3
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +2 -2
- package/dest/prover-client/server-epoch-prover.d.ts +5 -5
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.d.ts +4 -3
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +3 -10
- package/dest/proving_broker/config.d.ts +6 -2
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +8 -2
- package/dest/proving_broker/fixtures.js +1 -1
- package/dest/proving_broker/proving_agent.d.ts +3 -8
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +1 -16
- package/dest/proving_broker/proving_broker.d.ts +1 -1
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +4 -10
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +389 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_instrumentation.js +11 -35
- package/dest/proving_broker/proving_job_controller.d.ts +1 -1
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +2 -3
- package/dest/test/mock_proof_store.d.ts +3 -3
- package/dest/test/mock_proof_store.d.ts.map +1 -1
- package/dest/test/mock_prover.d.ts +2 -2
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +4 -4
- package/package.json +20 -19
- package/src/config.ts +1 -1
- package/src/light/index.ts +1 -0
- package/src/light/lightweight_checkpoint_builder.ts +161 -29
- package/src/mocks/fixtures.ts +4 -4
- package/src/mocks/test_context.ts +25 -10
- package/src/orchestrator/block-building-helpers.ts +5 -4
- package/src/orchestrator/block-proving-state.ts +3 -2
- package/src/orchestrator/checkpoint-proving-state.ts +56 -8
- package/src/orchestrator/epoch-proving-state.ts +63 -12
- package/src/orchestrator/orchestrator.ts +76 -60
- package/src/orchestrator/orchestrator_metrics.ts +2 -25
- package/src/orchestrator/tx-proving-state.ts +10 -14
- package/src/prover-client/factory.ts +6 -2
- package/src/prover-client/prover-client.ts +11 -12
- package/src/prover-client/server-epoch-prover.ts +4 -4
- package/src/proving_broker/broker_prover_facade.ts +4 -14
- package/src/proving_broker/config.ts +10 -1
- package/src/proving_broker/fixtures.ts +1 -1
- package/src/proving_broker/proving_agent.ts +1 -17
- package/src/proving_broker/proving_broker.ts +4 -8
- package/src/proving_broker/proving_broker_database/persisted.ts +15 -1
- package/src/proving_broker/proving_broker_instrumentation.ts +10 -35
- package/src/proving_broker/proving_job_controller.ts +2 -3
- package/src/test/mock_prover.ts +2 -14
- package/dest/block-factory/index.d.ts +0 -2
- package/dest/block-factory/index.d.ts.map +0 -1
- package/dest/block-factory/index.js +0 -1
- package/dest/block-factory/light.d.ts +0 -38
- package/dest/block-factory/light.d.ts.map +0 -1
- package/dest/block-factory/light.js +0 -108
- package/dest/proving_broker/proving_agent_instrumentation.d.ts +0 -8
- package/dest/proving_broker/proving_agent_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent_instrumentation.js +0 -16
- package/src/block-factory/index.ts +0 -1
- package/src/block-factory/light.ts +0 -137
- package/src/proving_broker/proving_agent_instrumentation.ts +0 -21
|
@@ -19,7 +19,7 @@ export declare class TestBroker implements ProvingJobProducer {
|
|
|
19
19
|
}
|
|
20
20
|
export declare class MockProver implements ServerCircuitProver {
|
|
21
21
|
constructor();
|
|
22
|
-
getAvmProof(_inputs: AvmCircuitInputs,
|
|
22
|
+
getAvmProof(_inputs: AvmCircuitInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<import("@aztec/stdlib/proofs").RecursiveProof<16200>>;
|
|
23
23
|
getBaseParityProof(_inputs: ParityBasePrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs, 457>>;
|
|
24
24
|
getRootParityProof(_inputs: ParityRootPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs, 457>>;
|
|
25
25
|
getPublicChonkVerifierProof(_inputs: PublicChonkVerifierPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<PublicChonkVerifierPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
@@ -38,4 +38,4 @@ export declare class MockProver implements ServerCircuitProver {
|
|
|
38
38
|
getCheckpointPaddingRollupProof(_input: CheckpointPaddingRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
39
39
|
getRootRollupProof(_input: RootRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs>>;
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19wcm92ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L21vY2tfcHJvdmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFHTCx5Q0FBeUMsRUFFMUMsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFDTCxLQUFLLFVBQVUsRUFDZixLQUFLLFlBQVksRUFDakIsS0FBSyxrQkFBa0IsRUFDdkIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyw2QkFBNkIsRUFDbEMsS0FBSyxtQkFBbUIsRUFFekIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTdGLE9BQU8sS0FBSyxFQUNWLDZCQUE2QixFQUM3Qix1QkFBdUIsRUFDdkIsd0NBQXdDLEVBQ3hDLGlDQUFpQyxFQUNqQyw0QkFBNEIsRUFDNUIseUNBQXlDLEVBQ3pDLG9DQUFvQyxFQUNwQyxrQ0FBa0MsRUFDbEMsb0NBQW9DLEVBQ3BDLDRCQUE0QixFQUM1QixpQ0FBaUMsRUFDakMsNENBQTRDLEVBQzVDLGdDQUFnQyxFQUNoQyxnQ0FBZ0MsRUFDaEMsK0JBQStCLEVBQy9CLCtCQUErQixFQUMvQix1QkFBdUIsRUFDdkIsc0JBQXNCLEVBQ3RCLDBCQUEwQixFQUMxQixvQkFBb0IsRUFDckIsTUFBTSxzQkFBc0IsQ0FBQztBQVc5QixPQUFPLEVBQW9CLEtBQUssVUFBVSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFLM0YscUJBQWEsVUFBVyxZQUFXLGtCQUFrQjtJQU9qRCxPQUFPLENBQUMsVUFBVTtJQU5wQixPQUFPLENBQUMsTUFBTSxDQUFnQjtJQUM5QixPQUFPLENBQUMsTUFBTSxDQUFpQjtJQUUvQixZQUNFLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLE1B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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock_prover.d.ts","sourceRoot":"","sources":["../../src/test/mock_prover.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"mock_prover.d.ts","sourceRoot":"","sources":["../../src/test/mock_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,yCAAyC,EAE1C,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACL,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EAEzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE7F,OAAO,KAAK,EACV,6BAA6B,EAC7B,uBAAuB,EACvB,wCAAwC,EACxC,iCAAiC,EACjC,4BAA4B,EAC5B,yCAAyC,EACzC,oCAAoC,EACpC,kCAAkC,EAClC,oCAAoC,EACpC,4BAA4B,EAC5B,iCAAiC,EACjC,4CAA4C,EAC5C,gCAAgC,EAChC,gCAAgC,EAChC,+BAA+B,EAC/B,+BAA+B,EAC/B,uBAAuB,EACvB,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAW9B,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAK3F,qBAAa,UAAW,YAAW,kBAAkB;IAOjD,OAAO,CAAC,UAAU;IANpB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAiB;IAE/B,YACE,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,mBAAmB,EACnB,UAAU,GAAE,UAAmC,EACvD,iBAAiB,SAAM,EAOxB;IAEY,KAAK,kBAGjB;IAEY,IAAI,kBAGhB;IAEM,aAAa,IAAI,UAAU,CAEjC;IAED,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE5D;IACD,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE/D;IACD,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1C;IAED,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAE7D;CACF;AAED,qBAAa,UAAW,YAAW,mBAAmB;IACpD,cAAgB;IAEhB,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,iEAElF;IAED,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,kGAQhG;IAED,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,kGAQhG;IAED,2BAA2B,CACzB,OAAO,EAAE,gCAAgC,EACzC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CACR,6BAA6B,CAAC,+BAA+B,EAAE,OAAO,yCAAyC,CAAC,CACjH,CAQA;IAED,2BAA2B,CACzB,gBAAgB,EAAE,gCAAgC,EAClD,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,oBAAoB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQhH;IAED,0BAA0B,CACxB,OAAO,EAAE,+BAA+B,EACxC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,oBAAoB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQhH;IAED,qBAAqB,CACnB,MAAM,EAAE,0BAA0B,EAClC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,oBAAoB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQhH;IAED,4BAA4B,CAC1B,MAAM,EAAE,iCAAiC,EACzC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,uBAAuB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQnH;IAED,oCAAoC,CAClC,MAAM,EAAE,yCAAyC,EACjD,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,uBAAuB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQnH;IAED,mCAAmC,CACjC,MAAM,EAAE,wCAAwC,EAChD,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,uBAAuB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQnH;IAED,uBAAuB,CACrB,MAAM,EAAE,4BAA4B,EACpC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,uBAAuB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQnH;IAED,+BAA+B,CAC7B,MAAM,EAAE,oCAAoC,EAC5C,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,uBAAuB,EAAE,OAAO,yCAAyC,CAAC,CAAC,CAQnH;IAED,wBAAwB,CAAC,MAAM,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,wEAQ3G;IAED,4BAA4B,CAC1B,MAAM,EAAE,iCAAiC,EACzC,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CACR,6BAA6B,CAAC,4BAA4B,EAAE,OAAO,yCAAyC,CAAC,CAC9G,CAQA;IAED,uCAAuC,CACrC,MAAM,EAAE,4CAA4C,EACpD,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CACR,6BAA6B,CAAC,4BAA4B,EAAE,OAAO,yCAAyC,CAAC,CAC9G,CAQA;IAED,6BAA6B,CAC3B,MAAM,EAAE,kCAAkC,EAC1C,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CACR,6BAA6B,CAAC,4BAA4B,EAAE,OAAO,yCAAyC,CAAC,CAC9G,CAQA;IAED,+BAA+B,CAC7B,MAAM,EAAE,oCAAoC,EAC5C,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CACR,6BAA6B,CAAC,4BAA4B,EAAE,OAAO,yCAAyC,CAAC,CAC9G,CAQA;IAED,kBAAkB,CAChB,MAAM,EAAE,uBAAuB,EAC/B,OAAO,CAAC,EAAE,WAAW,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC,CAQhE;CACF"}
|
package/dest/test/mock_prover.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
|
|
1
|
+
import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH } from '@aztec/constants';
|
|
2
2
|
import { times } from '@aztec/foundation/collection';
|
|
3
|
-
import {
|
|
3
|
+
import { makePublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
|
|
4
4
|
import { makeEmptyRecursiveProof, makeRecursiveProof } from '@aztec/stdlib/proofs';
|
|
5
5
|
import { makeBlockRollupPublicInputs, makeCheckpointRollupPublicInputs, makeParityPublicInputs, makePublicChonkVerifierPublicInputs, makeRootRollupPublicInputs, makeTxRollupPublicInputs } from '@aztec/stdlib/testing';
|
|
6
6
|
import { VerificationKeyData } from '@aztec/stdlib/vks';
|
|
@@ -43,8 +43,8 @@ export class TestBroker {
|
|
|
43
43
|
}
|
|
44
44
|
export class MockProver {
|
|
45
45
|
constructor(){}
|
|
46
|
-
getAvmProof(_inputs,
|
|
47
|
-
return Promise.resolve(
|
|
46
|
+
getAvmProof(_inputs, _signal, _epochNumber) {
|
|
47
|
+
return Promise.resolve(makeEmptyRecursiveProof(AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED));
|
|
48
48
|
}
|
|
49
49
|
getBaseParityProof(_inputs, _signal, _epochNumber) {
|
|
50
50
|
return Promise.resolve(makePublicInputsAndRecursiveProof(makeParityPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFakeHonk()));
|
package/package.json
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-client",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.fffb133c",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
7
|
-
"./block-factory": "./dest/block-factory/index.js",
|
|
8
7
|
"./broker": "./dest/proving_broker/index.js",
|
|
8
|
+
"./broker/config": "./dest/proving_broker/config.js",
|
|
9
9
|
"./orchestrator": "./dest/orchestrator/index.js",
|
|
10
10
|
"./helpers": "./dest/orchestrator/block-building-helpers.js",
|
|
11
|
+
"./light": "./dest/light/index.js",
|
|
11
12
|
"./config": "./dest/config.js"
|
|
12
13
|
},
|
|
13
14
|
"typedocOptions": {
|
|
@@ -22,8 +23,8 @@
|
|
|
22
23
|
"./package.local.json"
|
|
23
24
|
],
|
|
24
25
|
"scripts": {
|
|
25
|
-
"build": "yarn clean &&
|
|
26
|
-
"build:dev": "
|
|
26
|
+
"build": "yarn clean && ../scripts/tsc.sh",
|
|
27
|
+
"build:dev": "../scripts/tsc.sh --watch",
|
|
27
28
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
28
29
|
"bb": "node --no-warnings ./dest/bb/index.js",
|
|
29
30
|
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=3500000 --forceExit",
|
|
@@ -67,19 +68,19 @@
|
|
|
67
68
|
]
|
|
68
69
|
},
|
|
69
70
|
"dependencies": {
|
|
70
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
71
|
-
"@aztec/blob-lib": "0.0.1-commit.
|
|
72
|
-
"@aztec/constants": "0.0.1-commit.
|
|
73
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
74
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
75
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
76
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
77
|
-
"@aztec/noir-types": "0.0.1-commit.
|
|
78
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
79
|
-
"@aztec/simulator": "0.0.1-commit.
|
|
80
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
81
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
82
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
71
|
+
"@aztec/bb-prover": "0.0.1-commit.fffb133c",
|
|
72
|
+
"@aztec/blob-lib": "0.0.1-commit.fffb133c",
|
|
73
|
+
"@aztec/constants": "0.0.1-commit.fffb133c",
|
|
74
|
+
"@aztec/ethereum": "0.0.1-commit.fffb133c",
|
|
75
|
+
"@aztec/foundation": "0.0.1-commit.fffb133c",
|
|
76
|
+
"@aztec/kv-store": "0.0.1-commit.fffb133c",
|
|
77
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.fffb133c",
|
|
78
|
+
"@aztec/noir-types": "0.0.1-commit.fffb133c",
|
|
79
|
+
"@aztec/protocol-contracts": "0.0.1-commit.fffb133c",
|
|
80
|
+
"@aztec/simulator": "0.0.1-commit.fffb133c",
|
|
81
|
+
"@aztec/stdlib": "0.0.1-commit.fffb133c",
|
|
82
|
+
"@aztec/telemetry-client": "0.0.1-commit.fffb133c",
|
|
83
|
+
"@aztec/world-state": "0.0.1-commit.fffb133c",
|
|
83
84
|
"@google-cloud/storage": "^7.15.0",
|
|
84
85
|
"@iarna/toml": "^2.2.5",
|
|
85
86
|
"commander": "^12.1.0",
|
|
@@ -89,12 +90,12 @@
|
|
|
89
90
|
"zod": "^3.23.8"
|
|
90
91
|
},
|
|
91
92
|
"devDependencies": {
|
|
92
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
93
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.fffb133c",
|
|
93
94
|
"@jest/globals": "^30.0.0",
|
|
94
95
|
"@types/jest": "^30.0.0",
|
|
95
96
|
"@types/node": "^22.15.17",
|
|
96
97
|
"@types/source-map-support": "^0.5.10",
|
|
97
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
98
|
+
"@typescript/native-preview": "7.0.0-dev.20260113.1",
|
|
98
99
|
"get-port": "^7.1.0",
|
|
99
100
|
"jest": "^30.0.0",
|
|
100
101
|
"jest-mock-extended": "^4.0.0",
|
package/src/config.ts
CHANGED
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
getConfigFromMappings,
|
|
6
6
|
numberConfigHelper,
|
|
7
7
|
} from '@aztec/foundation/config';
|
|
8
|
-
import { type ProverConfig, proverConfigMappings } from '@aztec/stdlib/interfaces/
|
|
8
|
+
import { type ProverConfig, proverConfigMappings } from '@aztec/stdlib/interfaces/prover-config';
|
|
9
9
|
|
|
10
10
|
import {
|
|
11
11
|
type ProverAgentConfig,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './lightweight_checkpoint_builder.js';
|
|
@@ -1,15 +1,25 @@
|
|
|
1
1
|
import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
2
2
|
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
3
|
+
import { type CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
|
|
3
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
|
-
import { Fr } from '@aztec/foundation/
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import {
|
|
7
|
+
import { L2Block } from '@aztec/stdlib/block';
|
|
7
8
|
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
8
9
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
9
|
-
import {
|
|
10
|
-
|
|
10
|
+
import {
|
|
11
|
+
accumulateCheckpointOutHashes,
|
|
12
|
+
computeCheckpointOutHash,
|
|
13
|
+
computeInHashFromL1ToL2Messages,
|
|
14
|
+
} from '@aztec/stdlib/messaging';
|
|
15
|
+
import { CheckpointHeader, computeBlockHeadersHash } from '@aztec/stdlib/rollup';
|
|
11
16
|
import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
|
|
12
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
type CheckpointGlobalVariables,
|
|
19
|
+
type GlobalVariables,
|
|
20
|
+
type ProcessedTx,
|
|
21
|
+
StateReference,
|
|
22
|
+
} from '@aztec/stdlib/tx';
|
|
13
23
|
|
|
14
24
|
import {
|
|
15
25
|
buildHeaderAndBodyFromTxs,
|
|
@@ -20,30 +30,33 @@ import {
|
|
|
20
30
|
/**
|
|
21
31
|
* Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
|
|
22
32
|
*
|
|
23
|
-
* It updates the l1-to-l2 message tree when starting a new checkpoint,
|
|
24
|
-
*
|
|
33
|
+
* It updates the l1-to-l2 message tree when starting a new checkpoint, and then updates the archive tree when each block is added.
|
|
34
|
+
* Finally completes the checkpoint by computing its header.
|
|
25
35
|
*/
|
|
26
36
|
export class LightweightCheckpointBuilder {
|
|
27
37
|
private readonly logger = createLogger('lightweight-checkpoint-builder');
|
|
38
|
+
|
|
28
39
|
private lastArchives: AppendOnlyTreeSnapshot[] = [];
|
|
29
40
|
private spongeBlob: SpongeBlob;
|
|
30
|
-
private blocks:
|
|
41
|
+
private blocks: L2Block[] = [];
|
|
31
42
|
private blobFields: Fr[] = [];
|
|
32
43
|
|
|
33
44
|
constructor(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
private
|
|
45
|
+
public readonly checkpointNumber: CheckpointNumber,
|
|
46
|
+
public readonly constants: CheckpointGlobalVariables,
|
|
47
|
+
public readonly l1ToL2Messages: Fr[],
|
|
48
|
+
private readonly previousCheckpointOutHashes: Fr[],
|
|
49
|
+
public readonly db: MerkleTreeWriteOperations,
|
|
38
50
|
) {
|
|
39
51
|
this.spongeBlob = SpongeBlob.init();
|
|
40
|
-
this.logger.debug('Starting new checkpoint', { constants
|
|
52
|
+
this.logger.debug('Starting new checkpoint', { constants, l1ToL2Messages });
|
|
41
53
|
}
|
|
42
54
|
|
|
43
55
|
static async startNewCheckpoint(
|
|
44
|
-
checkpointNumber:
|
|
45
|
-
constants:
|
|
56
|
+
checkpointNumber: CheckpointNumber,
|
|
57
|
+
constants: CheckpointGlobalVariables,
|
|
46
58
|
l1ToL2Messages: Fr[],
|
|
59
|
+
previousCheckpointOutHashes: Fr[],
|
|
47
60
|
db: MerkleTreeWriteOperations,
|
|
48
61
|
): Promise<LightweightCheckpointBuilder> {
|
|
49
62
|
// Insert l1-to-l2 messages into the tree.
|
|
@@ -52,19 +65,115 @@ export class LightweightCheckpointBuilder {
|
|
|
52
65
|
padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP),
|
|
53
66
|
);
|
|
54
67
|
|
|
55
|
-
return new LightweightCheckpointBuilder(
|
|
68
|
+
return new LightweightCheckpointBuilder(
|
|
69
|
+
checkpointNumber,
|
|
70
|
+
constants,
|
|
71
|
+
l1ToL2Messages,
|
|
72
|
+
previousCheckpointOutHashes,
|
|
73
|
+
db,
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Resumes building a checkpoint from existing blocks. This is used for validator re-execution
|
|
79
|
+
* where blocks have already been built and their effects are already in the database.
|
|
80
|
+
* Unlike startNewCheckpoint, this does NOT append l1ToL2Messages to the tree since they
|
|
81
|
+
* were already added when the blocks were originally built.
|
|
82
|
+
*/
|
|
83
|
+
static async resumeCheckpoint(
|
|
84
|
+
checkpointNumber: CheckpointNumber,
|
|
85
|
+
constants: CheckpointGlobalVariables,
|
|
86
|
+
l1ToL2Messages: Fr[],
|
|
87
|
+
previousCheckpointOutHashes: Fr[],
|
|
88
|
+
db: MerkleTreeWriteOperations,
|
|
89
|
+
existingBlocks: L2Block[],
|
|
90
|
+
): Promise<LightweightCheckpointBuilder> {
|
|
91
|
+
const builder = new LightweightCheckpointBuilder(
|
|
92
|
+
checkpointNumber,
|
|
93
|
+
constants,
|
|
94
|
+
l1ToL2Messages,
|
|
95
|
+
previousCheckpointOutHashes,
|
|
96
|
+
db,
|
|
97
|
+
);
|
|
98
|
+
|
|
99
|
+
builder.logger.debug('Resuming checkpoint from existing blocks', {
|
|
100
|
+
checkpointNumber,
|
|
101
|
+
numExistingBlocks: existingBlocks.length,
|
|
102
|
+
blockNumbers: existingBlocks.map(b => b.header.getBlockNumber()),
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
// Validate block order and consistency
|
|
106
|
+
for (let i = 1; i < existingBlocks.length; i++) {
|
|
107
|
+
const prev = existingBlocks[i - 1];
|
|
108
|
+
const curr = existingBlocks[i];
|
|
109
|
+
if (curr.number !== prev.number + 1) {
|
|
110
|
+
throw new Error(`Non-sequential block numbers in resumeCheckpoint: ${prev.number} -> ${curr.number}`);
|
|
111
|
+
}
|
|
112
|
+
if (!prev.archive.root.equals(curr.header.lastArchive.root)) {
|
|
113
|
+
throw new Error(`Archive root mismatch between blocks ${prev.number} and ${curr.number}`);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
for (let i = 0; i < existingBlocks.length; i++) {
|
|
118
|
+
const block = existingBlocks[i];
|
|
119
|
+
const isFirstBlock = i === 0;
|
|
120
|
+
|
|
121
|
+
if (isFirstBlock) {
|
|
122
|
+
builder.lastArchives.push(block.header.lastArchive);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
builder.lastArchives.push(block.archive);
|
|
126
|
+
|
|
127
|
+
const blockBlobFields = block.toBlobFields();
|
|
128
|
+
await builder.spongeBlob.absorb(blockBlobFields);
|
|
129
|
+
builder.blobFields.push(...blockBlobFields);
|
|
130
|
+
|
|
131
|
+
builder.blocks.push(block);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return builder;
|
|
56
135
|
}
|
|
57
136
|
|
|
58
|
-
|
|
137
|
+
/**
|
|
138
|
+
* Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
|
|
139
|
+
* this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
|
|
140
|
+
*/
|
|
141
|
+
public async addBlock(
|
|
142
|
+
globalVariables: GlobalVariables,
|
|
143
|
+
txs: ProcessedTx[],
|
|
144
|
+
opts: { insertTxsEffects?: boolean; expectedEndState?: StateReference } = {},
|
|
145
|
+
): Promise<L2Block> {
|
|
59
146
|
const isFirstBlock = this.blocks.length === 0;
|
|
147
|
+
|
|
148
|
+
// Empty blocks are only allowed as the first block in a checkpoint
|
|
149
|
+
if (!isFirstBlock && txs.length === 0) {
|
|
150
|
+
throw new Error('Cannot add empty block that is not the first block in the checkpoint.');
|
|
151
|
+
}
|
|
152
|
+
|
|
60
153
|
if (isFirstBlock) {
|
|
61
154
|
this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
|
|
62
155
|
}
|
|
63
156
|
|
|
64
157
|
const lastArchive = this.lastArchives.at(-1)!;
|
|
65
158
|
|
|
66
|
-
|
|
67
|
-
|
|
159
|
+
if (opts.insertTxsEffects) {
|
|
160
|
+
this.logger.debug(
|
|
161
|
+
`Inserting side effects for ${txs.length} txs for block ${globalVariables.blockNumber} into db`,
|
|
162
|
+
{ txs: txs.map(tx => tx.hash.toString()) },
|
|
163
|
+
);
|
|
164
|
+
for (const tx of txs) {
|
|
165
|
+
await insertSideEffects(tx, this.db);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const endState = await this.db.getStateReference();
|
|
170
|
+
if (opts.expectedEndState && !endState.equals(opts.expectedEndState)) {
|
|
171
|
+
this.logger.error('End state after processing txs does not match expected end state', {
|
|
172
|
+
globalVariables: globalVariables.toInspect(),
|
|
173
|
+
expectedEndState: opts.expectedEndState.toInspect(),
|
|
174
|
+
actualEndState: endState.toInspect(),
|
|
175
|
+
});
|
|
176
|
+
throw new Error(`End state does not match expected end state when building block ${globalVariables.blockNumber}`);
|
|
68
177
|
}
|
|
69
178
|
|
|
70
179
|
const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(
|
|
@@ -76,11 +185,14 @@ export class LightweightCheckpointBuilder {
|
|
|
76
185
|
isFirstBlock,
|
|
77
186
|
);
|
|
78
187
|
|
|
188
|
+
header.state.validate();
|
|
189
|
+
|
|
79
190
|
await this.db.updateArchive(header);
|
|
80
191
|
const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
|
|
81
192
|
this.lastArchives.push(newArchive);
|
|
82
193
|
|
|
83
|
-
const
|
|
194
|
+
const indexWithinCheckpoint = IndexWithinCheckpoint(this.blocks.length);
|
|
195
|
+
const block = new L2Block(newArchive, header, body, this.checkpointNumber, indexWithinCheckpoint);
|
|
84
196
|
this.blocks.push(block);
|
|
85
197
|
|
|
86
198
|
await this.spongeBlob.absorb(blockBlobFields);
|
|
@@ -99,7 +211,7 @@ export class LightweightCheckpointBuilder {
|
|
|
99
211
|
|
|
100
212
|
async completeCheckpoint(): Promise<Checkpoint> {
|
|
101
213
|
if (!this.blocks.length) {
|
|
102
|
-
throw new Error('
|
|
214
|
+
throw new Error('Cannot complete a checkpoint with no blocks');
|
|
103
215
|
}
|
|
104
216
|
|
|
105
217
|
const numBlobFields = this.blobFields.length + 1; // +1 for the checkpoint end marker.
|
|
@@ -116,10 +228,13 @@ export class LightweightCheckpointBuilder {
|
|
|
116
228
|
|
|
117
229
|
const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
|
|
118
230
|
|
|
119
|
-
const
|
|
120
|
-
|
|
121
|
-
|
|
231
|
+
const { slotNumber, coinbase, feeRecipient, gasFees } = this.constants;
|
|
232
|
+
const checkpointOutHash = computeCheckpointOutHash(
|
|
233
|
+
blocks.map(block => block.body.txEffects.map(tx => tx.l2ToL1Msgs)),
|
|
234
|
+
);
|
|
235
|
+
const epochOutHash = accumulateCheckpointOutHashes([...this.previousCheckpointOutHashes, checkpointOutHash]);
|
|
122
236
|
|
|
237
|
+
// TODO(palla/mbps): Should we source this from the constants instead?
|
|
123
238
|
// timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
|
|
124
239
|
const timestamp = blocks[blocks.length - 1].timestamp;
|
|
125
240
|
|
|
@@ -127,16 +242,33 @@ export class LightweightCheckpointBuilder {
|
|
|
127
242
|
|
|
128
243
|
const header = CheckpointHeader.from({
|
|
129
244
|
lastArchiveRoot: this.lastArchives[0].root,
|
|
245
|
+
blobsHash,
|
|
246
|
+
inHash,
|
|
247
|
+
epochOutHash,
|
|
130
248
|
blockHeadersHash,
|
|
131
|
-
|
|
132
|
-
slotNumber: constants.slotNumber,
|
|
249
|
+
slotNumber,
|
|
133
250
|
timestamp,
|
|
134
|
-
coinbase
|
|
135
|
-
feeRecipient
|
|
136
|
-
gasFees
|
|
251
|
+
coinbase,
|
|
252
|
+
feeRecipient,
|
|
253
|
+
gasFees,
|
|
137
254
|
totalManaUsed,
|
|
138
255
|
});
|
|
139
256
|
|
|
140
257
|
return new Checkpoint(newArchive, header, blocks, this.checkpointNumber);
|
|
141
258
|
}
|
|
259
|
+
|
|
260
|
+
clone() {
|
|
261
|
+
const clone = new LightweightCheckpointBuilder(
|
|
262
|
+
this.checkpointNumber,
|
|
263
|
+
this.constants,
|
|
264
|
+
[...this.l1ToL2Messages],
|
|
265
|
+
[...this.previousCheckpointOutHashes],
|
|
266
|
+
this.db,
|
|
267
|
+
);
|
|
268
|
+
clone.lastArchives = [...this.lastArchives];
|
|
269
|
+
clone.spongeBlob = this.spongeBlob.clone();
|
|
270
|
+
clone.blocks = [...this.blocks];
|
|
271
|
+
clone.blobFields = [...this.blobFields];
|
|
272
|
+
return clone;
|
|
273
|
+
}
|
|
142
274
|
}
|
package/src/mocks/fixtures.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import { randomBytes } from '@aztec/foundation/crypto';
|
|
1
|
+
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
3
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import type { Logger } from '@aztec/foundation/log';
|
|
6
6
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
7
7
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
@@ -93,7 +93,7 @@ export const makeGlobals = (
|
|
|
93
93
|
return GlobalVariables.from({
|
|
94
94
|
chainId: checkpointConstants.chainId,
|
|
95
95
|
version: checkpointConstants.version,
|
|
96
|
-
blockNumber /** block number */,
|
|
96
|
+
blockNumber: BlockNumber(blockNumber) /** block number */,
|
|
97
97
|
slotNumber: SlotNumber(slotNumber) /** slot number */,
|
|
98
98
|
timestamp: BigInt(blockNumber * 123) /** block number * 123 as pseudo-timestamp for testing */,
|
|
99
99
|
coinbase: checkpointConstants.coinbase,
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { BBProverConfig } from '@aztec/bb-prover';
|
|
2
2
|
import { TestCircuitProver } from '@aztec/bb-prover';
|
|
3
3
|
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
4
|
+
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
4
5
|
import { padArrayEnd, times, timesAsync } from '@aztec/foundation/collection';
|
|
5
|
-
import { Fr } from '@aztec/foundation/
|
|
6
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
7
|
import type { Logger } from '@aztec/foundation/log';
|
|
7
8
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
8
9
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
@@ -43,7 +44,9 @@ import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobal
|
|
|
43
44
|
export class TestContext {
|
|
44
45
|
private headers: Map<number, BlockHeader> = new Map();
|
|
45
46
|
private checkpoints: Checkpoint[] = [];
|
|
47
|
+
private checkpointOutHashes: Fr[] = [];
|
|
46
48
|
private nextCheckpointIndex = 0;
|
|
49
|
+
private nextCheckpointNumber = CheckpointNumber(1);
|
|
47
50
|
private nextBlockNumber = 1;
|
|
48
51
|
private epochNumber = 1;
|
|
49
52
|
private feePayerBalance: Fr;
|
|
@@ -149,6 +152,7 @@ export class TestContext {
|
|
|
149
152
|
|
|
150
153
|
public startNewEpoch() {
|
|
151
154
|
this.checkpoints = [];
|
|
155
|
+
this.checkpointOutHashes = [];
|
|
152
156
|
this.nextCheckpointIndex = 0;
|
|
153
157
|
this.epochNumber++;
|
|
154
158
|
}
|
|
@@ -186,7 +190,8 @@ export class TestContext {
|
|
|
186
190
|
}
|
|
187
191
|
|
|
188
192
|
const checkpointIndex = this.nextCheckpointIndex++;
|
|
189
|
-
const checkpointNumber =
|
|
193
|
+
const checkpointNumber = this.nextCheckpointNumber;
|
|
194
|
+
this.nextCheckpointNumber++;
|
|
190
195
|
const slotNumber = checkpointNumber * 15; // times an arbitrary number to make it different to the checkpoint number
|
|
191
196
|
|
|
192
197
|
const constants = makeCheckpointConstants(slotNumber, constantOpts);
|
|
@@ -202,7 +207,9 @@ export class TestContext {
|
|
|
202
207
|
const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, fork);
|
|
203
208
|
|
|
204
209
|
const startBlockNumber = this.nextBlockNumber;
|
|
205
|
-
const previousBlockHeader = this.getBlockHeader(startBlockNumber - 1);
|
|
210
|
+
const previousBlockHeader = this.getBlockHeader(BlockNumber(startBlockNumber - 1));
|
|
211
|
+
// All blocks in the same slot/checkpoint share the same timestamp.
|
|
212
|
+
const timestamp = BigInt(slotNumber * 26);
|
|
206
213
|
|
|
207
214
|
// Build global variables.
|
|
208
215
|
const blockGlobalVariables = times(numBlocks, i =>
|
|
@@ -210,6 +217,7 @@ export class TestContext {
|
|
|
210
217
|
coinbase: constants.coinbase,
|
|
211
218
|
feeRecipient: constants.feeRecipient,
|
|
212
219
|
gasFees: constants.gasFees,
|
|
220
|
+
timestamp,
|
|
213
221
|
}),
|
|
214
222
|
);
|
|
215
223
|
this.nextBlockNumber += numBlocks;
|
|
@@ -239,33 +247,38 @@ export class TestContext {
|
|
|
239
247
|
});
|
|
240
248
|
|
|
241
249
|
const cleanFork = await this.worldState.fork();
|
|
250
|
+
const previousCheckpointOutHashes = this.checkpointOutHashes;
|
|
242
251
|
const builder = await LightweightCheckpointBuilder.startNewCheckpoint(
|
|
243
252
|
checkpointNumber,
|
|
244
253
|
constants,
|
|
245
254
|
l1ToL2Messages,
|
|
255
|
+
previousCheckpointOutHashes,
|
|
246
256
|
cleanFork,
|
|
247
257
|
);
|
|
248
258
|
|
|
249
259
|
// Add tx effects to db and build block headers.
|
|
250
260
|
const blocks = [];
|
|
251
261
|
for (let i = 0; i < numBlocks; i++) {
|
|
252
|
-
const isFirstBlock = i === 0;
|
|
253
262
|
const txs = blockTxs[i];
|
|
254
263
|
const state = blockEndStates[i];
|
|
255
264
|
|
|
256
|
-
const block = await builder.addBlock(blockGlobalVariables[i],
|
|
265
|
+
const block = await builder.addBlock(blockGlobalVariables[i], txs, {
|
|
266
|
+
expectedEndState: state,
|
|
267
|
+
insertTxsEffects: true,
|
|
268
|
+
});
|
|
257
269
|
|
|
258
270
|
const header = block.header;
|
|
259
271
|
this.headers.set(block.number, header);
|
|
260
272
|
|
|
261
|
-
const blockMsgs =
|
|
262
|
-
await this.worldState.handleL2BlockAndMessages(block, blockMsgs
|
|
273
|
+
const blockMsgs = block.indexWithinCheckpoint === 0 ? l1ToL2Messages : [];
|
|
274
|
+
await this.worldState.handleL2BlockAndMessages(block, blockMsgs);
|
|
263
275
|
|
|
264
276
|
blocks.push({ header, txs });
|
|
265
277
|
}
|
|
266
278
|
|
|
267
279
|
const checkpoint = await builder.completeCheckpoint();
|
|
268
280
|
this.checkpoints.push(checkpoint);
|
|
281
|
+
this.checkpointOutHashes.push(checkpoint.getCheckpointOutHash());
|
|
269
282
|
|
|
270
283
|
return {
|
|
271
284
|
constants,
|
|
@@ -296,11 +309,13 @@ export class TestContext {
|
|
|
296
309
|
return tx;
|
|
297
310
|
}
|
|
298
311
|
|
|
299
|
-
private getBlockHeader(blockNumber:
|
|
300
|
-
if (blockNumber > 0 && blockNumber >= this.nextBlockNumber) {
|
|
312
|
+
private getBlockHeader(blockNumber: BlockNumber): BlockHeader {
|
|
313
|
+
if (Number(blockNumber) > 0 && Number(blockNumber) >= this.nextBlockNumber) {
|
|
301
314
|
throw new Error(`Block header not built for block number ${blockNumber}.`);
|
|
302
315
|
}
|
|
303
|
-
return blockNumber === 0
|
|
316
|
+
return Number(blockNumber) === 0
|
|
317
|
+
? this.worldState.getCommitted().getInitialHeader()
|
|
318
|
+
: this.headers.get(Number(blockNumber))!;
|
|
304
319
|
}
|
|
305
320
|
|
|
306
321
|
private async updateTrees(txs: ProcessedTx[], fork: MerkleTreeWriteOperations) {
|
|
@@ -20,8 +20,9 @@ import {
|
|
|
20
20
|
PUBLIC_DATA_TREE_HEIGHT,
|
|
21
21
|
} from '@aztec/constants';
|
|
22
22
|
import { makeTuple } from '@aztec/foundation/array';
|
|
23
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
23
24
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
24
|
-
import { Fr } from '@aztec/foundation/
|
|
25
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
25
26
|
import { type Bufferable, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
|
|
26
27
|
import { MembershipWitness } from '@aztec/foundation/trees';
|
|
27
28
|
import { getVkData } from '@aztec/noir-protocol-circuits-types/server/vks';
|
|
@@ -96,7 +97,7 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
|
|
|
96
97
|
|
|
97
98
|
const { nullifierInsertionResult, publicDataInsertionResult } = await insertSideEffects(tx, db);
|
|
98
99
|
|
|
99
|
-
const blockHash = await tx.data.constants.anchorBlockHeader.hash();
|
|
100
|
+
const blockHash = (await tx.data.constants.anchorBlockHeader.hash()).toField();
|
|
100
101
|
const anchorBlockArchiveSiblingPath = (
|
|
101
102
|
await getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db)
|
|
102
103
|
).siblingPath;
|
|
@@ -280,8 +281,8 @@ export const buildHeaderFromCircuitOutputs = runInSpan(
|
|
|
280
281
|
const globalVariables = GlobalVariables.from({
|
|
281
282
|
chainId: constants.chainId,
|
|
282
283
|
version: constants.version,
|
|
283
|
-
blockNumber: blockRootRollupOutput.previousArchive.nextAvailableLeafIndex,
|
|
284
|
-
timestamp: blockRootRollupOutput.
|
|
284
|
+
blockNumber: BlockNumber(blockRootRollupOutput.previousArchive.nextAvailableLeafIndex),
|
|
285
|
+
timestamp: blockRootRollupOutput.timestamp,
|
|
285
286
|
slotNumber: constants.slotNumber,
|
|
286
287
|
coinbase: constants.coinbase,
|
|
287
288
|
feeRecipient: constants.feeRecipient,
|
|
@@ -6,7 +6,8 @@ import {
|
|
|
6
6
|
type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
|
|
7
7
|
NUM_BASE_PARITY_PER_ROOT_PARITY,
|
|
8
8
|
} from '@aztec/constants';
|
|
9
|
-
import {
|
|
9
|
+
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
10
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
10
11
|
import { type Tuple, assertLength } from '@aztec/foundation/serialize';
|
|
11
12
|
import { type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees';
|
|
12
13
|
import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
|
|
@@ -62,7 +63,7 @@ export class BlockProvingState {
|
|
|
62
63
|
|
|
63
64
|
constructor(
|
|
64
65
|
public readonly index: number,
|
|
65
|
-
public readonly blockNumber:
|
|
66
|
+
public readonly blockNumber: BlockNumber,
|
|
66
67
|
public readonly totalNumTxs: number,
|
|
67
68
|
private readonly constants: CheckpointConstantData,
|
|
68
69
|
private readonly timestamp: UInt64,
|