@aztec/prover-client 3.0.3 → 4.0.0-devnet.1-patch.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/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 +32 -14
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
- package/dest/light/lightweight_checkpoint_builder.js +115 -23
- package/dest/mocks/fixtures.d.ts +1 -1
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +2 -1
- package/dest/mocks/test_context.d.ts +4 -2
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +18 -4
- package/dest/orchestrator/block-building-helpers.d.ts +2 -2
- package/dest/orchestrator/block-building-helpers.js +2 -2
- package/dest/orchestrator/checkpoint-proving-state.d.ts +15 -2
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/checkpoint-proving-state.js +34 -1
- package/dest/orchestrator/epoch-proving-state.d.ts +6 -5
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +37 -1
- package/dest/orchestrator/orchestrator.d.ts +19 -4
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +534 -133
- 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 +5 -4
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +6 -6
- 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 +5 -5
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +15 -10
- package/dest/proving_broker/broker_prover_facade.d.ts +7 -5
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +5 -12
- package/dest/proving_broker/config.d.ts +13 -1
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +19 -2
- package/dest/proving_broker/proof_store/factory.d.ts +2 -5
- package/dest/proving_broker/proof_store/factory.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/factory.js +7 -30
- package/dest/proving_broker/proof_store/file_store_proof_store.d.ts +18 -0
- package/dest/proving_broker/proof_store/file_store_proof_store.d.ts.map +1 -0
- package/dest/proving_broker/proof_store/file_store_proof_store.js +60 -0
- package/dest/proving_broker/proof_store/index.d.ts +2 -2
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/index.js +1 -1
- package/dest/proving_broker/proving_agent.d.ts +5 -9
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +4 -19
- package/dest/proving_broker/proving_broker.d.ts +7 -4
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +33 -11
- 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 +15 -35
- package/dest/proving_broker/proving_job_controller.d.ts +4 -3
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +7 -5
- package/dest/proving_broker/rpc.d.ts +4 -2
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +8 -0
- 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 +5 -5
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +4 -4
- package/package.json +17 -17
- package/src/light/index.ts +1 -0
- package/src/light/lightweight_checkpoint_builder.ts +176 -31
- package/src/mocks/fixtures.ts +2 -1
- package/src/mocks/test_context.ts +15 -2
- package/src/orchestrator/block-building-helpers.ts +2 -2
- package/src/orchestrator/checkpoint-proving-state.ts +47 -1
- package/src/orchestrator/epoch-proving-state.ts +58 -8
- package/src/orchestrator/orchestrator.ts +129 -113
- package/src/orchestrator/orchestrator_metrics.ts +2 -25
- package/src/orchestrator/tx-proving-state.ts +8 -11
- package/src/prover-client/factory.ts +6 -2
- package/src/prover-client/prover-client.ts +31 -23
- package/src/proving_broker/broker_prover_facade.ts +9 -16
- package/src/proving_broker/config.ts +22 -0
- package/src/proving_broker/proof_store/factory.ts +10 -32
- package/src/proving_broker/proof_store/file_store_proof_store.ts +78 -0
- package/src/proving_broker/proof_store/index.ts +1 -1
- package/src/proving_broker/proving_agent.ts +6 -19
- package/src/proving_broker/proving_broker.ts +34 -9
- package/src/proving_broker/proving_broker_database/persisted.ts +15 -1
- package/src/proving_broker/proving_broker_instrumentation.ts +14 -35
- package/src/proving_broker/proving_job_controller.ts +10 -5
- package/src/proving_broker/rpc.ts +14 -0
- 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/proof_store/gcs_proof_store.d.ts +0 -14
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.js +0 -52
- 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/proof_store/gcs_proof_store.ts +0 -76
- package/src/proving_broker/proving_agent_instrumentation.ts +0 -21
|
@@ -19,9 +19,9 @@ export declare class TestBroker implements ProvingJobProducer {
|
|
|
19
19
|
}
|
|
20
20
|
export declare class MockProver implements ServerCircuitProver {
|
|
21
21
|
constructor();
|
|
22
|
-
getAvmProof(_inputs: AvmCircuitInputs,
|
|
23
|
-
getBaseParityProof(_inputs: ParityBasePrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs,
|
|
24
|
-
getRootParityProof(_inputs: ParityRootPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs,
|
|
22
|
+
getAvmProof(_inputs: AvmCircuitInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<import("@aztec/stdlib/proofs").RecursiveProof<16200>>;
|
|
23
|
+
getBaseParityProof(_inputs: ParityBasePrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs, 449>>;
|
|
24
|
+
getRootParityProof(_inputs: ParityRootPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<import("@aztec/stdlib/parity").ParityPublicInputs, 449>>;
|
|
25
25
|
getPublicChonkVerifierProof(_inputs: PublicChonkVerifierPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<PublicChonkVerifierPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
26
26
|
getPrivateTxBaseRollupProof(_baseRollupInput: PrivateTxBaseRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<TxRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
27
27
|
getPublicTxBaseRollupProof(_inputs: PublicTxBaseRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<TxRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
@@ -31,11 +31,11 @@ export declare class MockProver implements ServerCircuitProver {
|
|
|
31
31
|
getBlockRootEmptyTxFirstRollupProof(_input: BlockRootEmptyTxFirstRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
32
32
|
getBlockRootRollupProof(_input: BlockRootRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
33
33
|
getBlockRootSingleTxRollupProof(_input: BlockRootSingleTxRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
34
|
-
getBlockMergeRollupProof(_input: BlockMergeRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRollupPublicInputs,
|
|
34
|
+
getBlockMergeRollupProof(_input: BlockMergeRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<BlockRollupPublicInputs, 519>>;
|
|
35
35
|
getCheckpointRootRollupProof(_input: CheckpointRootRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
36
36
|
getCheckpointRootSingleBlockRollupProof(_input: CheckpointRootSingleBlockRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
37
37
|
getCheckpointMergeRollupProof(_input: CheckpointMergeRollupPrivateInputs, _signal?: AbortSignal, _epochNumber?: number): Promise<PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>>;
|
|
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":"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"}
|
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,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-client",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0-devnet.1-patch.0",
|
|
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",
|
|
9
8
|
"./broker/config": "./dest/proving_broker/config.js",
|
|
10
9
|
"./orchestrator": "./dest/orchestrator/index.js",
|
|
11
10
|
"./helpers": "./dest/orchestrator/block-building-helpers.js",
|
|
11
|
+
"./light": "./dest/light/index.js",
|
|
12
12
|
"./config": "./dest/config.js"
|
|
13
13
|
},
|
|
14
14
|
"typedocOptions": {
|
|
@@ -68,19 +68,19 @@
|
|
|
68
68
|
]
|
|
69
69
|
},
|
|
70
70
|
"dependencies": {
|
|
71
|
-
"@aztec/bb-prover": "
|
|
72
|
-
"@aztec/blob-lib": "
|
|
73
|
-
"@aztec/constants": "
|
|
74
|
-
"@aztec/ethereum": "
|
|
75
|
-
"@aztec/foundation": "
|
|
76
|
-
"@aztec/kv-store": "
|
|
77
|
-
"@aztec/noir-protocol-circuits-types": "
|
|
78
|
-
"@aztec/noir-types": "
|
|
79
|
-
"@aztec/protocol-contracts": "
|
|
80
|
-
"@aztec/simulator": "
|
|
81
|
-
"@aztec/stdlib": "
|
|
82
|
-
"@aztec/telemetry-client": "
|
|
83
|
-
"@aztec/world-state": "
|
|
71
|
+
"@aztec/bb-prover": "4.0.0-devnet.1-patch.0",
|
|
72
|
+
"@aztec/blob-lib": "4.0.0-devnet.1-patch.0",
|
|
73
|
+
"@aztec/constants": "4.0.0-devnet.1-patch.0",
|
|
74
|
+
"@aztec/ethereum": "4.0.0-devnet.1-patch.0",
|
|
75
|
+
"@aztec/foundation": "4.0.0-devnet.1-patch.0",
|
|
76
|
+
"@aztec/kv-store": "4.0.0-devnet.1-patch.0",
|
|
77
|
+
"@aztec/noir-protocol-circuits-types": "4.0.0-devnet.1-patch.0",
|
|
78
|
+
"@aztec/noir-types": "4.0.0-devnet.1-patch.0",
|
|
79
|
+
"@aztec/protocol-contracts": "4.0.0-devnet.1-patch.0",
|
|
80
|
+
"@aztec/simulator": "4.0.0-devnet.1-patch.0",
|
|
81
|
+
"@aztec/stdlib": "4.0.0-devnet.1-patch.0",
|
|
82
|
+
"@aztec/telemetry-client": "4.0.0-devnet.1-patch.0",
|
|
83
|
+
"@aztec/world-state": "4.0.0-devnet.1-patch.0",
|
|
84
84
|
"@google-cloud/storage": "^7.15.0",
|
|
85
85
|
"@iarna/toml": "^2.2.5",
|
|
86
86
|
"commander": "^12.1.0",
|
|
@@ -90,12 +90,12 @@
|
|
|
90
90
|
"zod": "^3.23.8"
|
|
91
91
|
},
|
|
92
92
|
"devDependencies": {
|
|
93
|
-
"@aztec/noir-contracts.js": "
|
|
93
|
+
"@aztec/noir-contracts.js": "4.0.0-devnet.1-patch.0",
|
|
94
94
|
"@jest/globals": "^30.0.0",
|
|
95
95
|
"@types/jest": "^30.0.0",
|
|
96
96
|
"@types/node": "^22.15.17",
|
|
97
97
|
"@types/source-map-support": "^0.5.10",
|
|
98
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
98
|
+
"@typescript/native-preview": "7.0.0-dev.20260113.1",
|
|
99
99
|
"get-port": "^7.1.0",
|
|
100
100
|
"jest": "^30.0.0",
|
|
101
101
|
"jest-mock-extended": "^4.0.0",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './lightweight_checkpoint_builder.js';
|
|
@@ -1,16 +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
|
|
3
|
+
import { type CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
|
|
4
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
5
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
7
|
-
import {
|
|
6
|
+
import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
|
|
7
|
+
import { L2Block } from '@aztec/stdlib/block';
|
|
8
8
|
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
9
9
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
10
|
-
import {
|
|
11
|
-
|
|
10
|
+
import {
|
|
11
|
+
accumulateCheckpointOutHashes,
|
|
12
|
+
computeCheckpointOutHash,
|
|
13
|
+
computeInHashFromL1ToL2Messages,
|
|
14
|
+
} from '@aztec/stdlib/messaging';
|
|
15
|
+
import { CheckpointHeader, computeBlockHeadersHash } from '@aztec/stdlib/rollup';
|
|
12
16
|
import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
|
|
13
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
type CheckpointGlobalVariables,
|
|
19
|
+
type GlobalVariables,
|
|
20
|
+
type ProcessedTx,
|
|
21
|
+
StateReference,
|
|
22
|
+
} from '@aztec/stdlib/tx';
|
|
14
23
|
|
|
15
24
|
import {
|
|
16
25
|
buildHeaderAndBodyFromTxs,
|
|
@@ -21,31 +30,40 @@ import {
|
|
|
21
30
|
/**
|
|
22
31
|
* Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
|
|
23
32
|
*
|
|
24
|
-
* It updates the l1-to-l2 message tree when starting a new checkpoint,
|
|
25
|
-
*
|
|
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.
|
|
26
35
|
*/
|
|
27
36
|
export class LightweightCheckpointBuilder {
|
|
28
|
-
private readonly logger
|
|
37
|
+
private readonly logger: Logger;
|
|
38
|
+
|
|
29
39
|
private lastArchives: AppendOnlyTreeSnapshot[] = [];
|
|
30
40
|
private spongeBlob: SpongeBlob;
|
|
31
|
-
private blocks:
|
|
41
|
+
private blocks: L2Block[] = [];
|
|
32
42
|
private blobFields: Fr[] = [];
|
|
33
43
|
|
|
34
44
|
constructor(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
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,
|
|
50
|
+
bindings?: LoggerBindings,
|
|
39
51
|
) {
|
|
52
|
+
this.logger = createLogger('checkpoint-builder', {
|
|
53
|
+
...bindings,
|
|
54
|
+
instanceId: `checkpoint-${checkpointNumber}`,
|
|
55
|
+
});
|
|
40
56
|
this.spongeBlob = SpongeBlob.init();
|
|
41
|
-
this.logger.debug('Starting new checkpoint', { constants
|
|
57
|
+
this.logger.debug('Starting new checkpoint', { constants, l1ToL2Messages });
|
|
42
58
|
}
|
|
43
59
|
|
|
44
60
|
static async startNewCheckpoint(
|
|
45
61
|
checkpointNumber: CheckpointNumber,
|
|
46
|
-
constants:
|
|
62
|
+
constants: CheckpointGlobalVariables,
|
|
47
63
|
l1ToL2Messages: Fr[],
|
|
64
|
+
previousCheckpointOutHashes: Fr[],
|
|
48
65
|
db: MerkleTreeWriteOperations,
|
|
66
|
+
bindings?: LoggerBindings,
|
|
49
67
|
): Promise<LightweightCheckpointBuilder> {
|
|
50
68
|
// Insert l1-to-l2 messages into the tree.
|
|
51
69
|
await db.appendLeaves(
|
|
@@ -53,19 +71,123 @@ export class LightweightCheckpointBuilder {
|
|
|
53
71
|
padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP),
|
|
54
72
|
);
|
|
55
73
|
|
|
56
|
-
return new LightweightCheckpointBuilder(
|
|
74
|
+
return new LightweightCheckpointBuilder(
|
|
75
|
+
checkpointNumber,
|
|
76
|
+
constants,
|
|
77
|
+
l1ToL2Messages,
|
|
78
|
+
previousCheckpointOutHashes,
|
|
79
|
+
db,
|
|
80
|
+
bindings,
|
|
81
|
+
);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Resumes building a checkpoint from existing blocks. This is used for validator re-execution
|
|
86
|
+
* where blocks have already been built and their effects are already in the database.
|
|
87
|
+
* Unlike startNewCheckpoint, this does NOT append l1ToL2Messages to the tree since they
|
|
88
|
+
* were already added when the blocks were originally built.
|
|
89
|
+
*/
|
|
90
|
+
static async resumeCheckpoint(
|
|
91
|
+
checkpointNumber: CheckpointNumber,
|
|
92
|
+
constants: CheckpointGlobalVariables,
|
|
93
|
+
l1ToL2Messages: Fr[],
|
|
94
|
+
previousCheckpointOutHashes: Fr[],
|
|
95
|
+
db: MerkleTreeWriteOperations,
|
|
96
|
+
existingBlocks: L2Block[],
|
|
97
|
+
bindings?: LoggerBindings,
|
|
98
|
+
): Promise<LightweightCheckpointBuilder> {
|
|
99
|
+
const builder = new LightweightCheckpointBuilder(
|
|
100
|
+
checkpointNumber,
|
|
101
|
+
constants,
|
|
102
|
+
l1ToL2Messages,
|
|
103
|
+
previousCheckpointOutHashes,
|
|
104
|
+
db,
|
|
105
|
+
bindings,
|
|
106
|
+
);
|
|
107
|
+
|
|
108
|
+
builder.logger.debug('Resuming checkpoint from existing blocks', {
|
|
109
|
+
checkpointNumber,
|
|
110
|
+
numExistingBlocks: existingBlocks.length,
|
|
111
|
+
blockNumbers: existingBlocks.map(b => b.header.getBlockNumber()),
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
// Validate block order and consistency
|
|
115
|
+
for (let i = 1; i < existingBlocks.length; i++) {
|
|
116
|
+
const prev = existingBlocks[i - 1];
|
|
117
|
+
const curr = existingBlocks[i];
|
|
118
|
+
if (curr.number !== prev.number + 1) {
|
|
119
|
+
throw new Error(`Non-sequential block numbers in resumeCheckpoint: ${prev.number} -> ${curr.number}`);
|
|
120
|
+
}
|
|
121
|
+
if (!prev.archive.root.equals(curr.header.lastArchive.root)) {
|
|
122
|
+
throw new Error(`Archive root mismatch between blocks ${prev.number} and ${curr.number}`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
for (let i = 0; i < existingBlocks.length; i++) {
|
|
127
|
+
const block = existingBlocks[i];
|
|
128
|
+
const isFirstBlock = i === 0;
|
|
129
|
+
|
|
130
|
+
if (isFirstBlock) {
|
|
131
|
+
builder.lastArchives.push(block.header.lastArchive);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
builder.lastArchives.push(block.archive);
|
|
135
|
+
|
|
136
|
+
const blockBlobFields = block.toBlobFields();
|
|
137
|
+
await builder.spongeBlob.absorb(blockBlobFields);
|
|
138
|
+
builder.blobFields.push(...blockBlobFields);
|
|
139
|
+
|
|
140
|
+
builder.blocks.push(block);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
return builder;
|
|
57
144
|
}
|
|
58
145
|
|
|
59
|
-
|
|
146
|
+
/** Returns how many blocks have been added to this checkpoint so far */
|
|
147
|
+
public getBlockCount() {
|
|
148
|
+
return this.blocks.length;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
|
|
153
|
+
* this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
|
|
154
|
+
*/
|
|
155
|
+
public async addBlock(
|
|
156
|
+
globalVariables: GlobalVariables,
|
|
157
|
+
txs: ProcessedTx[],
|
|
158
|
+
opts: { insertTxsEffects?: boolean; expectedEndState?: StateReference } = {},
|
|
159
|
+
): Promise<L2Block> {
|
|
60
160
|
const isFirstBlock = this.blocks.length === 0;
|
|
161
|
+
|
|
162
|
+
// Empty blocks are only allowed as the first block in a checkpoint
|
|
163
|
+
if (!isFirstBlock && txs.length === 0) {
|
|
164
|
+
throw new Error('Cannot add empty block that is not the first block in the checkpoint.');
|
|
165
|
+
}
|
|
166
|
+
|
|
61
167
|
if (isFirstBlock) {
|
|
62
168
|
this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
|
|
63
169
|
}
|
|
64
170
|
|
|
65
171
|
const lastArchive = this.lastArchives.at(-1)!;
|
|
66
172
|
|
|
67
|
-
|
|
68
|
-
|
|
173
|
+
if (opts.insertTxsEffects) {
|
|
174
|
+
this.logger.debug(
|
|
175
|
+
`Inserting side effects for ${txs.length} txs for block ${globalVariables.blockNumber} into db`,
|
|
176
|
+
{ txs: txs.map(tx => tx.hash.toString()) },
|
|
177
|
+
);
|
|
178
|
+
for (const tx of txs) {
|
|
179
|
+
await insertSideEffects(tx, this.db);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
const endState = await this.db.getStateReference();
|
|
184
|
+
if (opts.expectedEndState && !endState.equals(opts.expectedEndState)) {
|
|
185
|
+
this.logger.error('End state after processing txs does not match expected end state', {
|
|
186
|
+
globalVariables: globalVariables.toInspect(),
|
|
187
|
+
expectedEndState: opts.expectedEndState.toInspect(),
|
|
188
|
+
actualEndState: endState.toInspect(),
|
|
189
|
+
});
|
|
190
|
+
throw new Error(`End state does not match expected end state when building block ${globalVariables.blockNumber}`);
|
|
69
191
|
}
|
|
70
192
|
|
|
71
193
|
const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(
|
|
@@ -77,12 +199,14 @@ export class LightweightCheckpointBuilder {
|
|
|
77
199
|
isFirstBlock,
|
|
78
200
|
);
|
|
79
201
|
|
|
202
|
+
header.state.validate();
|
|
203
|
+
|
|
80
204
|
await this.db.updateArchive(header);
|
|
81
205
|
const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
|
|
82
206
|
this.lastArchives.push(newArchive);
|
|
83
207
|
|
|
84
|
-
const indexWithinCheckpoint = this.blocks.length;
|
|
85
|
-
const block = new
|
|
208
|
+
const indexWithinCheckpoint = IndexWithinCheckpoint(this.blocks.length);
|
|
209
|
+
const block = new L2Block(newArchive, header, body, this.checkpointNumber, indexWithinCheckpoint);
|
|
86
210
|
this.blocks.push(block);
|
|
87
211
|
|
|
88
212
|
await this.spongeBlob.absorb(blockBlobFields);
|
|
@@ -101,7 +225,7 @@ export class LightweightCheckpointBuilder {
|
|
|
101
225
|
|
|
102
226
|
async completeCheckpoint(): Promise<Checkpoint> {
|
|
103
227
|
if (!this.blocks.length) {
|
|
104
|
-
throw new Error('
|
|
228
|
+
throw new Error('Cannot complete a checkpoint with no blocks');
|
|
105
229
|
}
|
|
106
230
|
|
|
107
231
|
const numBlobFields = this.blobFields.length + 1; // +1 for the checkpoint end marker.
|
|
@@ -118,10 +242,13 @@ export class LightweightCheckpointBuilder {
|
|
|
118
242
|
|
|
119
243
|
const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
|
|
120
244
|
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
245
|
+
const { slotNumber, coinbase, feeRecipient, gasFees } = this.constants;
|
|
246
|
+
const checkpointOutHash = computeCheckpointOutHash(
|
|
247
|
+
blocks.map(block => block.body.txEffects.map(tx => tx.l2ToL1Msgs)),
|
|
248
|
+
);
|
|
249
|
+
const epochOutHash = accumulateCheckpointOutHashes([...this.previousCheckpointOutHashes, checkpointOutHash]);
|
|
124
250
|
|
|
251
|
+
// TODO(palla/mbps): Should we source this from the constants instead?
|
|
125
252
|
// timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
|
|
126
253
|
const timestamp = blocks[blocks.length - 1].timestamp;
|
|
127
254
|
|
|
@@ -129,16 +256,34 @@ export class LightweightCheckpointBuilder {
|
|
|
129
256
|
|
|
130
257
|
const header = CheckpointHeader.from({
|
|
131
258
|
lastArchiveRoot: this.lastArchives[0].root,
|
|
259
|
+
blobsHash,
|
|
260
|
+
inHash,
|
|
261
|
+
epochOutHash,
|
|
132
262
|
blockHeadersHash,
|
|
133
|
-
|
|
134
|
-
slotNumber: constants.slotNumber,
|
|
263
|
+
slotNumber,
|
|
135
264
|
timestamp,
|
|
136
|
-
coinbase
|
|
137
|
-
feeRecipient
|
|
138
|
-
gasFees
|
|
265
|
+
coinbase,
|
|
266
|
+
feeRecipient,
|
|
267
|
+
gasFees,
|
|
139
268
|
totalManaUsed,
|
|
140
269
|
});
|
|
141
270
|
|
|
142
271
|
return new Checkpoint(newArchive, header, blocks, this.checkpointNumber);
|
|
143
272
|
}
|
|
273
|
+
|
|
274
|
+
clone() {
|
|
275
|
+
const clone = new LightweightCheckpointBuilder(
|
|
276
|
+
this.checkpointNumber,
|
|
277
|
+
this.constants,
|
|
278
|
+
[...this.l1ToL2Messages],
|
|
279
|
+
[...this.previousCheckpointOutHashes],
|
|
280
|
+
this.db,
|
|
281
|
+
this.logger.getBindings(),
|
|
282
|
+
);
|
|
283
|
+
clone.lastArchives = [...this.lastArchives];
|
|
284
|
+
clone.spongeBlob = this.spongeBlob.clone();
|
|
285
|
+
clone.blocks = [...this.blocks];
|
|
286
|
+
clone.blobFields = [...this.blobFields];
|
|
287
|
+
return clone;
|
|
288
|
+
}
|
|
144
289
|
}
|
package/src/mocks/fixtures.ts
CHANGED
|
@@ -75,7 +75,8 @@ export async function getSimulator(
|
|
|
75
75
|
logger?.info(
|
|
76
76
|
`Using native ACVM at ${config.acvmBinaryPath} and working directory ${config.acvmWorkingDirectory}`,
|
|
77
77
|
);
|
|
78
|
-
|
|
78
|
+
const acvmLogger = logger?.createChild('acvm-native');
|
|
79
|
+
return new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath, undefined, acvmLogger);
|
|
79
80
|
} catch {
|
|
80
81
|
logger?.warn(`Failed to access ACVM at ${config.acvmBinaryPath}, falling back to WASM`);
|
|
81
82
|
}
|
|
@@ -44,7 +44,9 @@ import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobal
|
|
|
44
44
|
export class TestContext {
|
|
45
45
|
private headers: Map<number, BlockHeader> = new Map();
|
|
46
46
|
private checkpoints: Checkpoint[] = [];
|
|
47
|
+
private checkpointOutHashes: Fr[] = [];
|
|
47
48
|
private nextCheckpointIndex = 0;
|
|
49
|
+
private nextCheckpointNumber = CheckpointNumber(1);
|
|
48
50
|
private nextBlockNumber = 1;
|
|
49
51
|
private epochNumber = 1;
|
|
50
52
|
private feePayerBalance: Fr;
|
|
@@ -150,6 +152,7 @@ export class TestContext {
|
|
|
150
152
|
|
|
151
153
|
public startNewEpoch() {
|
|
152
154
|
this.checkpoints = [];
|
|
155
|
+
this.checkpointOutHashes = [];
|
|
153
156
|
this.nextCheckpointIndex = 0;
|
|
154
157
|
this.epochNumber++;
|
|
155
158
|
}
|
|
@@ -187,7 +190,8 @@ export class TestContext {
|
|
|
187
190
|
}
|
|
188
191
|
|
|
189
192
|
const checkpointIndex = this.nextCheckpointIndex++;
|
|
190
|
-
const checkpointNumber =
|
|
193
|
+
const checkpointNumber = this.nextCheckpointNumber;
|
|
194
|
+
this.nextCheckpointNumber++;
|
|
191
195
|
const slotNumber = checkpointNumber * 15; // times an arbitrary number to make it different to the checkpoint number
|
|
192
196
|
|
|
193
197
|
const constants = makeCheckpointConstants(slotNumber, constantOpts);
|
|
@@ -204,6 +208,8 @@ export class TestContext {
|
|
|
204
208
|
|
|
205
209
|
const startBlockNumber = this.nextBlockNumber;
|
|
206
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);
|
|
207
213
|
|
|
208
214
|
// Build global variables.
|
|
209
215
|
const blockGlobalVariables = times(numBlocks, i =>
|
|
@@ -211,6 +217,7 @@ export class TestContext {
|
|
|
211
217
|
coinbase: constants.coinbase,
|
|
212
218
|
feeRecipient: constants.feeRecipient,
|
|
213
219
|
gasFees: constants.gasFees,
|
|
220
|
+
timestamp,
|
|
214
221
|
}),
|
|
215
222
|
);
|
|
216
223
|
this.nextBlockNumber += numBlocks;
|
|
@@ -240,10 +247,12 @@ export class TestContext {
|
|
|
240
247
|
});
|
|
241
248
|
|
|
242
249
|
const cleanFork = await this.worldState.fork();
|
|
250
|
+
const previousCheckpointOutHashes = this.checkpointOutHashes;
|
|
243
251
|
const builder = await LightweightCheckpointBuilder.startNewCheckpoint(
|
|
244
252
|
checkpointNumber,
|
|
245
253
|
constants,
|
|
246
254
|
l1ToL2Messages,
|
|
255
|
+
previousCheckpointOutHashes,
|
|
247
256
|
cleanFork,
|
|
248
257
|
);
|
|
249
258
|
|
|
@@ -253,7 +262,10 @@ export class TestContext {
|
|
|
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);
|
|
@@ -266,6 +278,7 @@ export class TestContext {
|
|
|
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,
|
|
@@ -99,7 +99,7 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
|
|
|
99
99
|
|
|
100
100
|
const blockHash = await tx.data.constants.anchorBlockHeader.hash();
|
|
101
101
|
const anchorBlockArchiveSiblingPath = (
|
|
102
|
-
await getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db)
|
|
102
|
+
await getMembershipWitnessFor(blockHash.toFr(), MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db)
|
|
103
103
|
).siblingPath;
|
|
104
104
|
|
|
105
105
|
const contractClassLogsFields = makeTuple(
|
|
@@ -282,7 +282,7 @@ export const buildHeaderFromCircuitOutputs = runInSpan(
|
|
|
282
282
|
chainId: constants.chainId,
|
|
283
283
|
version: constants.version,
|
|
284
284
|
blockNumber: BlockNumber(blockRootRollupOutput.previousArchive.nextAvailableLeafIndex),
|
|
285
|
-
timestamp: blockRootRollupOutput.
|
|
285
|
+
timestamp: blockRootRollupOutput.timestamp,
|
|
286
286
|
slotNumber: constants.slotNumber,
|
|
287
287
|
coinbase: constants.coinbase,
|
|
288
288
|
feeRecipient: constants.feeRecipient,
|