@aztec/prover-client 0.0.1-commit.24de95ac → 0.0.1-commit.3469e52
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/index.d.ts +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 +44 -0
- package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -0
- package/dest/light/lightweight_checkpoint_builder.js +194 -0
- package/dest/mocks/fixtures.d.ts +1 -4
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +7 -17
- package/dest/mocks/test_context.d.ts +29 -46
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +116 -116
- package/dest/orchestrator/block-building-helpers.d.ts +17 -19
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +87 -112
- package/dest/orchestrator/block-proving-state.d.ts +17 -11
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +81 -20
- package/dest/orchestrator/checkpoint-proving-state.d.ts +22 -9
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/checkpoint-proving-state.js +49 -17
- package/dest/orchestrator/epoch-proving-state.d.ts +12 -10
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +38 -4
- package/dest/orchestrator/index.d.ts +1 -1
- package/dest/orchestrator/orchestrator.d.ts +20 -10
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +472 -93
- 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 +7 -16
- package/dest/prover-client/factory.d.ts +3 -3
- package/dest/prover-client/factory.d.ts.map +1 -1
- package/dest/prover-client/index.d.ts +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 +1 -1
- package/dest/prover-client/server-epoch-prover.d.ts +8 -7
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +2 -2
- package/dest/proving_broker/broker_prover_facade.d.ts +22 -21
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +6 -12
- package/dest/proving_broker/config.d.ts +12 -8
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +8 -2
- package/dest/proving_broker/factory.d.ts +1 -1
- package/dest/proving_broker/fixtures.d.ts +3 -2
- package/dest/proving_broker/fixtures.d.ts.map +1 -1
- package/dest/proving_broker/fixtures.js +3 -2
- package/dest/proving_broker/index.d.ts +1 -1
- package/dest/proving_broker/proof_store/factory.d.ts +2 -2
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/index.d.ts +1 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +1 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/proof_store.d.ts +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 +2 -2
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +6 -11
- package/dest/proving_broker/proving_broker_database/memory.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +5 -3
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +392 -3
- package/dest/proving_broker/proving_broker_database.d.ts +3 -2
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -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 +3 -2
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +2 -3
- package/dest/proving_broker/rpc.d.ts +4 -4
- package/dest/test/mock_proof_store.d.ts +1 -1
- package/dest/test/mock_proof_store.d.ts.map +1 -1
- package/dest/test/mock_prover.d.ts +3 -4
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +4 -4
- package/package.json +20 -18
- package/src/config.ts +1 -1
- package/src/light/index.ts +1 -0
- package/src/light/lightweight_checkpoint_builder.ts +274 -0
- package/src/mocks/fixtures.ts +7 -30
- package/src/mocks/test_context.ts +158 -177
- package/src/orchestrator/block-building-helpers.ts +126 -206
- package/src/orchestrator/block-proving-state.ts +103 -25
- package/src/orchestrator/checkpoint-proving-state.ts +71 -21
- package/src/orchestrator/epoch-proving-state.ts +64 -14
- package/src/orchestrator/orchestrator.ts +76 -81
- package/src/orchestrator/orchestrator_metrics.ts +2 -25
- package/src/orchestrator/tx-proving-state.ts +10 -27
- package/src/prover-client/factory.ts +6 -2
- package/src/prover-client/prover-client.ts +4 -11
- package/src/prover-client/server-epoch-prover.ts +6 -7
- package/src/proving_broker/broker_prover_facade.ts +25 -34
- package/src/proving_broker/config.ts +8 -1
- package/src/proving_broker/fixtures.ts +8 -3
- package/src/proving_broker/proving_agent.ts +1 -17
- package/src/proving_broker/proving_broker.ts +6 -9
- package/src/proving_broker/proving_broker_database/memory.ts +2 -1
- package/src/proving_broker/proving_broker_database/persisted.ts +20 -5
- package/src/proving_broker/proving_broker_database.ts +2 -1
- package/src/proving_broker/proving_broker_instrumentation.ts +10 -35
- package/src/proving_broker/proving_job_controller.ts +4 -4
- 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 -94
- 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 -140
- package/src/proving_broker/proving_agent_instrumentation.ts +0 -21
package/dest/config.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ACVMConfig, BBConfig } from '@aztec/bb-prover';
|
|
2
2
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
3
|
-
import { type ProverConfig } from '@aztec/stdlib/interfaces/
|
|
3
|
+
import { type ProverConfig } from '@aztec/stdlib/interfaces/prover-config';
|
|
4
4
|
import { type ProverAgentConfig, type ProverBrokerConfig } from './proving_broker/config.js';
|
|
5
5
|
/** The prover configuration as defined by the user. */
|
|
6
6
|
export type ProverClientUserConfig = ProverConfig & ProverAgentConfig & ProverBrokerConfig & BBConfig & ACVMConfig;
|
|
@@ -14,4 +14,4 @@ export declare const proverClientConfigMappings: ConfigMappingsType<ProverClient
|
|
|
14
14
|
* @returns The prover configuration.
|
|
15
15
|
*/
|
|
16
16
|
export declare function getProverEnvVars(): ProverClientUserConfig;
|
|
17
|
-
//# sourceMappingURL=
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFFakcsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBQ3RCLEtBQUssa0JBQWtCLEVBR3hCLE1BQU0sNEJBQTRCLENBQUM7QUFFcEMsdURBQXVEO0FBQ3ZELE1BQU0sTUFBTSxzQkFBc0IsR0FBRyxZQUFZLEdBQUcsaUJBQWlCLEdBQUcsa0JBQWtCLEdBQUcsUUFBUSxHQUFHLFVBQVUsQ0FBQztBQUVuSCxpRUFBaUU7QUFDakUsTUFBTSxNQUFNLGtCQUFrQixHQUFHLHNCQUFzQixHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUU3RyxlQUFPLE1BQU0sZ0JBQWdCLEVBQUUsa0JBQWtCLENBQUMsUUFBUSxHQUFHLFVBQVUsQ0FnQ3RFLENBQUM7QUFFRixlQUFPLE1BQU0sMEJBQTBCLEVBQUUsa0JBQWtCLENBQUMsc0JBQXNCLENBS2pGLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHNCQUFzQixDQUV6RCJ9
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,wCAAwC,CAAC;AAEjG,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,4BAA4B,CAAC;AAEpC,uDAAuD;AACvD,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,iBAAiB,GAAG,kBAAkB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnH,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC,CAAC;AAE7G,eAAO,MAAM,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,GAAG,UAAU,CAgCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,sBAAsB,CAKjF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,sBAAsB,CAEzD"}
|
package/dest/config.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
|
|
2
|
-
import { proverConfigMappings } from '@aztec/stdlib/interfaces/
|
|
2
|
+
import { proverConfigMappings } from '@aztec/stdlib/interfaces/prover-config';
|
|
3
3
|
import { proverAgentConfigMappings, proverBrokerConfigMappings } from './proving_broker/config.js';
|
|
4
4
|
export const bbConfigMappings = {
|
|
5
5
|
acvmWorkingDirectory: {
|
package/dest/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export type { EpochProverManager } from '@aztec/stdlib/interfaces/server';
|
|
2
2
|
export * from './prover-client/index.js';
|
|
3
3
|
export * from './config.js';
|
|
4
|
-
//# sourceMappingURL=
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUxRSxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsYUFBYSxDQUFDIn0=
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export * from './lightweight_checkpoint_builder.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWdodC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFDQUFxQyxDQUFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/light/index.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './lightweight_checkpoint_builder.js';
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { type CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { L2BlockNew } from '@aztec/stdlib/block';
|
|
4
|
+
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
5
|
+
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
6
|
+
import { type CheckpointGlobalVariables, type GlobalVariables, type ProcessedTx, StateReference } from '@aztec/stdlib/tx';
|
|
7
|
+
/**
|
|
8
|
+
* Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
|
|
9
|
+
*
|
|
10
|
+
* It updates the l1-to-l2 message tree when starting a new checkpoint, and then updates the archive tree when each block is added.
|
|
11
|
+
* Finally completes the checkpoint by computing its header.
|
|
12
|
+
*/
|
|
13
|
+
export declare class LightweightCheckpointBuilder {
|
|
14
|
+
readonly checkpointNumber: CheckpointNumber;
|
|
15
|
+
readonly constants: CheckpointGlobalVariables;
|
|
16
|
+
readonly l1ToL2Messages: Fr[];
|
|
17
|
+
private readonly previousCheckpointOutHashes;
|
|
18
|
+
readonly db: MerkleTreeWriteOperations;
|
|
19
|
+
private readonly logger;
|
|
20
|
+
private lastArchives;
|
|
21
|
+
private spongeBlob;
|
|
22
|
+
private blocks;
|
|
23
|
+
private blobFields;
|
|
24
|
+
constructor(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[], db: MerkleTreeWriteOperations);
|
|
25
|
+
static startNewCheckpoint(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[], db: MerkleTreeWriteOperations): Promise<LightweightCheckpointBuilder>;
|
|
26
|
+
/**
|
|
27
|
+
* Resumes building a checkpoint from existing blocks. This is used for validator re-execution
|
|
28
|
+
* where blocks have already been built and their effects are already in the database.
|
|
29
|
+
* Unlike startNewCheckpoint, this does NOT append l1ToL2Messages to the tree since they
|
|
30
|
+
* were already added when the blocks were originally built.
|
|
31
|
+
*/
|
|
32
|
+
static resumeCheckpoint(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[], db: MerkleTreeWriteOperations, existingBlocks: L2BlockNew[]): Promise<LightweightCheckpointBuilder>;
|
|
33
|
+
/**
|
|
34
|
+
* Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
|
|
35
|
+
* this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
|
|
36
|
+
*/
|
|
37
|
+
addBlock(globalVariables: GlobalVariables, txs: ProcessedTx[], opts?: {
|
|
38
|
+
insertTxsEffects?: boolean;
|
|
39
|
+
expectedEndState?: StateReference;
|
|
40
|
+
}): Promise<L2BlockNew>;
|
|
41
|
+
completeCheckpoint(): Promise<Checkpoint>;
|
|
42
|
+
clone(): LightweightCheckpointBuilder;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlnaHR3ZWlnaHRfY2hlY2twb2ludF9idWlsZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGlnaHQvbGlnaHR3ZWlnaHRfY2hlY2twb2ludF9idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBRS9GLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFRakYsT0FBTyxFQUNMLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssZUFBZSxFQUNwQixLQUFLLFdBQVcsRUFDaEIsY0FBYyxFQUNmLE1BQU0sa0JBQWtCLENBQUM7QUFRMUI7Ozs7O0dBS0c7QUFDSCxxQkFBYSw0QkFBNEI7YUFTckIsZ0JBQWdCLEVBQUUsZ0JBQWdCO2FBQ2xDLFNBQVMsRUFBRSx5QkFBeUI7YUFDcEMsY0FBYyxFQUFFLEVBQUUsRUFBRTtJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFDLDJCQUEyQjthQUM1QixFQUFFLEVBQUUseUJBQXlCO0lBWi9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFrRDtJQUV6RSxPQUFPLENBQUMsWUFBWSxDQUFnQztJQUNwRCxPQUFPLENBQUMsVUFBVSxDQUFhO0lBQy9CLE9BQU8sQ0FBQyxNQUFNLENBQW9CO0lBQ2xDLE9BQU8sQ0FBQyxVQUFVLENBQVk7SUFFOUIsWUFDa0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSx5QkFBeUIsRUFDcEMsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUNuQiwyQkFBMkIsRUFBRSxFQUFFLEVBQUUsRUFDbEMsRUFBRSxFQUFFLHlCQUF5QixFQUk5QztJQUVELE9BQWEsa0JBQWtCLENBQzdCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxTQUFTLEVBQUUseUJBQXlCLEVBQ3BDLGNBQWMsRUFBRSxFQUFFLEVBQUUsRUFDcEIsMkJBQTJCLEVBQUUsRUFBRSxFQUFFLEVBQ2pDLEVBQUUsRUFBRSx5QkFBeUIsR0FDNUIsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBY3ZDO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFhLGdCQUFnQixDQUMzQixnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsU0FBUyxFQUFFLHlCQUF5QixFQUNwQyxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQ3BCLDJCQUEyQixFQUFFLEVBQUUsRUFBRSxFQUNqQyxFQUFFLEVBQUUseUJBQXlCLEVBQzdCLGNBQWMsRUFBRSxVQUFVLEVBQUUsR0FDM0IsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBNkN2QztJQUVEOzs7T0FHRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLGVBQWUsRUFDaEMsR0FBRyxFQUFFLFdBQVcsRUFBRSxFQUNsQixJQUFJLEdBQUU7UUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztRQUFDLGdCQUFnQixDQUFDLEVBQUUsY0FBYyxDQUFBO0tBQU8sR0FDM0UsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQWlFckI7SUFFSyxrQkFBa0IsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBOEM5QztJQUVELEtBQUssaUNBYUo7Q0FDRiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lightweight_checkpoint_builder.d.ts","sourceRoot":"","sources":["../../src/light/lightweight_checkpoint_builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,iCAAiC,CAAC;AAE/F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAQjF,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAQ1B;;;;;GAKG;AACH,qBAAa,4BAA4B;aASrB,gBAAgB,EAAE,gBAAgB;aAClC,SAAS,EAAE,yBAAyB;aACpC,cAAc,EAAE,EAAE,EAAE;IACpC,OAAO,CAAC,QAAQ,CAAC,2BAA2B;aAC5B,EAAE,EAAE,yBAAyB;IAZ/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;IAEzE,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,UAAU,CAAY;IAE9B,YACkB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,yBAAyB,EACpC,cAAc,EAAE,EAAE,EAAE,EACnB,2BAA2B,EAAE,EAAE,EAAE,EAClC,EAAE,EAAE,yBAAyB,EAI9C;IAED,OAAa,kBAAkB,CAC7B,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,yBAAyB,EACpC,cAAc,EAAE,EAAE,EAAE,EACpB,2BAA2B,EAAE,EAAE,EAAE,EACjC,EAAE,EAAE,yBAAyB,GAC5B,OAAO,CAAC,4BAA4B,CAAC,CAcvC;IAED;;;;;OAKG;IACH,OAAa,gBAAgB,CAC3B,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,yBAAyB,EACpC,cAAc,EAAE,EAAE,EAAE,EACpB,2BAA2B,EAAE,EAAE,EAAE,EACjC,EAAE,EAAE,yBAAyB,EAC7B,cAAc,EAAE,UAAU,EAAE,GAC3B,OAAO,CAAC,4BAA4B,CAAC,CA6CvC;IAED;;;OAGG;IACU,QAAQ,CACnB,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,IAAI,GAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAAC,gBAAgB,CAAC,EAAE,cAAc,CAAA;KAAO,GAC3E,OAAO,CAAC,UAAU,CAAC,CAiErB;IAEK,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CA8C9C;IAED,KAAK,iCAaJ;CACF"}
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
2
|
+
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
3
|
+
import { IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
|
|
4
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
7
|
+
import { L2BlockNew } from '@aztec/stdlib/block';
|
|
8
|
+
import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
9
|
+
import { accumulateCheckpointOutHashes, computeCheckpointOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
|
|
10
|
+
import { CheckpointHeader, computeBlockHeadersHash } from '@aztec/stdlib/rollup';
|
|
11
|
+
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
12
|
+
import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffects } from '../orchestrator/block-building-helpers.js';
|
|
13
|
+
/**
|
|
14
|
+
* Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
|
|
15
|
+
*
|
|
16
|
+
* It updates the l1-to-l2 message tree when starting a new checkpoint, and then updates the archive tree when each block is added.
|
|
17
|
+
* Finally completes the checkpoint by computing its header.
|
|
18
|
+
*/ export class LightweightCheckpointBuilder {
|
|
19
|
+
checkpointNumber;
|
|
20
|
+
constants;
|
|
21
|
+
l1ToL2Messages;
|
|
22
|
+
previousCheckpointOutHashes;
|
|
23
|
+
db;
|
|
24
|
+
logger;
|
|
25
|
+
lastArchives;
|
|
26
|
+
spongeBlob;
|
|
27
|
+
blocks;
|
|
28
|
+
blobFields;
|
|
29
|
+
constructor(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, db){
|
|
30
|
+
this.checkpointNumber = checkpointNumber;
|
|
31
|
+
this.constants = constants;
|
|
32
|
+
this.l1ToL2Messages = l1ToL2Messages;
|
|
33
|
+
this.previousCheckpointOutHashes = previousCheckpointOutHashes;
|
|
34
|
+
this.db = db;
|
|
35
|
+
this.logger = createLogger('lightweight-checkpoint-builder');
|
|
36
|
+
this.lastArchives = [];
|
|
37
|
+
this.blocks = [];
|
|
38
|
+
this.blobFields = [];
|
|
39
|
+
this.spongeBlob = SpongeBlob.init();
|
|
40
|
+
this.logger.debug('Starting new checkpoint', {
|
|
41
|
+
constants,
|
|
42
|
+
l1ToL2Messages
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
static async startNewCheckpoint(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, db) {
|
|
46
|
+
// Insert l1-to-l2 messages into the tree.
|
|
47
|
+
await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
|
|
48
|
+
return new LightweightCheckpointBuilder(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, db);
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Resumes building a checkpoint from existing blocks. This is used for validator re-execution
|
|
52
|
+
* where blocks have already been built and their effects are already in the database.
|
|
53
|
+
* Unlike startNewCheckpoint, this does NOT append l1ToL2Messages to the tree since they
|
|
54
|
+
* were already added when the blocks were originally built.
|
|
55
|
+
*/ static async resumeCheckpoint(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, db, existingBlocks) {
|
|
56
|
+
const builder = new LightweightCheckpointBuilder(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, db);
|
|
57
|
+
builder.logger.debug('Resuming checkpoint from existing blocks', {
|
|
58
|
+
checkpointNumber,
|
|
59
|
+
numExistingBlocks: existingBlocks.length,
|
|
60
|
+
blockNumbers: existingBlocks.map((b)=>b.header.getBlockNumber())
|
|
61
|
+
});
|
|
62
|
+
// Validate block order and consistency
|
|
63
|
+
for(let i = 1; i < existingBlocks.length; i++){
|
|
64
|
+
const prev = existingBlocks[i - 1];
|
|
65
|
+
const curr = existingBlocks[i];
|
|
66
|
+
if (curr.number !== prev.number + 1) {
|
|
67
|
+
throw new Error(`Non-sequential block numbers in resumeCheckpoint: ${prev.number} -> ${curr.number}`);
|
|
68
|
+
}
|
|
69
|
+
if (!prev.archive.root.equals(curr.header.lastArchive.root)) {
|
|
70
|
+
throw new Error(`Archive root mismatch between blocks ${prev.number} and ${curr.number}`);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
for(let i = 0; i < existingBlocks.length; i++){
|
|
74
|
+
const block = existingBlocks[i];
|
|
75
|
+
const isFirstBlock = i === 0;
|
|
76
|
+
if (isFirstBlock) {
|
|
77
|
+
builder.lastArchives.push(block.header.lastArchive);
|
|
78
|
+
}
|
|
79
|
+
builder.lastArchives.push(block.archive);
|
|
80
|
+
const blockBlobFields = block.toBlobFields();
|
|
81
|
+
await builder.spongeBlob.absorb(blockBlobFields);
|
|
82
|
+
builder.blobFields.push(...blockBlobFields);
|
|
83
|
+
builder.blocks.push(block);
|
|
84
|
+
}
|
|
85
|
+
return builder;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
|
|
89
|
+
* this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
|
|
90
|
+
*/ async addBlock(globalVariables, txs, opts = {}) {
|
|
91
|
+
const isFirstBlock = this.blocks.length === 0;
|
|
92
|
+
// Empty blocks are only allowed as the first block in a checkpoint
|
|
93
|
+
if (!isFirstBlock && txs.length === 0) {
|
|
94
|
+
throw new Error('Cannot add empty block that is not the first block in the checkpoint.');
|
|
95
|
+
}
|
|
96
|
+
if (isFirstBlock) {
|
|
97
|
+
this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
|
|
98
|
+
}
|
|
99
|
+
const lastArchive = this.lastArchives.at(-1);
|
|
100
|
+
if (opts.insertTxsEffects) {
|
|
101
|
+
this.logger.debug(`Inserting side effects for ${txs.length} txs for block ${globalVariables.blockNumber} into db`, {
|
|
102
|
+
txs: txs.map((tx)=>tx.hash.toString())
|
|
103
|
+
});
|
|
104
|
+
for (const tx of txs){
|
|
105
|
+
await insertSideEffects(tx, this.db);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
const endState = await this.db.getStateReference();
|
|
109
|
+
if (opts.expectedEndState && !endState.equals(opts.expectedEndState)) {
|
|
110
|
+
this.logger.error('End state after processing txs does not match expected end state', {
|
|
111
|
+
globalVariables: globalVariables.toInspect(),
|
|
112
|
+
expectedEndState: opts.expectedEndState.toInspect(),
|
|
113
|
+
actualEndState: endState.toInspect()
|
|
114
|
+
});
|
|
115
|
+
throw new Error(`End state does not match expected end state when building block ${globalVariables.blockNumber}`);
|
|
116
|
+
}
|
|
117
|
+
const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(txs, lastArchive, endState, globalVariables, this.spongeBlob, isFirstBlock);
|
|
118
|
+
header.state.validate();
|
|
119
|
+
await this.db.updateArchive(header);
|
|
120
|
+
const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
|
|
121
|
+
this.lastArchives.push(newArchive);
|
|
122
|
+
const indexWithinCheckpoint = IndexWithinCheckpoint(this.blocks.length);
|
|
123
|
+
const block = new L2BlockNew(newArchive, header, body, this.checkpointNumber, indexWithinCheckpoint);
|
|
124
|
+
this.blocks.push(block);
|
|
125
|
+
await this.spongeBlob.absorb(blockBlobFields);
|
|
126
|
+
this.blobFields.push(...blockBlobFields);
|
|
127
|
+
this.logger.debug(`Built block ${header.getBlockNumber()}`, {
|
|
128
|
+
globalVariables: globalVariables.toInspect(),
|
|
129
|
+
archiveRoot: newArchive.root.toString(),
|
|
130
|
+
stateReference: header.state.toInspect(),
|
|
131
|
+
blockHash: (await block.hash()).toString(),
|
|
132
|
+
txs: block.body.txEffects.map((tx)=>tx.txHash.toString())
|
|
133
|
+
});
|
|
134
|
+
return block;
|
|
135
|
+
}
|
|
136
|
+
async completeCheckpoint() {
|
|
137
|
+
if (!this.blocks.length) {
|
|
138
|
+
throw new Error('Cannot complete a checkpoint with no blocks');
|
|
139
|
+
}
|
|
140
|
+
const numBlobFields = this.blobFields.length + 1; // +1 for the checkpoint end marker.
|
|
141
|
+
const checkpointEndMarker = encodeCheckpointEndMarker({
|
|
142
|
+
numBlobFields
|
|
143
|
+
});
|
|
144
|
+
this.blobFields.push(checkpointEndMarker);
|
|
145
|
+
const blocks = this.blocks;
|
|
146
|
+
const blockHeadersHash = await computeBlockHeadersHash(blocks.map((block)=>block.header));
|
|
147
|
+
const newArchive = this.lastArchives[this.lastArchives.length - 1];
|
|
148
|
+
const blobs = getBlobsPerL1Block(this.blobFields);
|
|
149
|
+
const blobsHash = computeBlobsHashFromBlobs(blobs);
|
|
150
|
+
const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
|
|
151
|
+
const { slotNumber, coinbase, feeRecipient, gasFees } = this.constants;
|
|
152
|
+
const checkpointOutHash = computeCheckpointOutHash(blocks.map((block)=>block.body.txEffects.map((tx)=>tx.l2ToL1Msgs)));
|
|
153
|
+
const epochOutHash = accumulateCheckpointOutHashes([
|
|
154
|
+
...this.previousCheckpointOutHashes,
|
|
155
|
+
checkpointOutHash
|
|
156
|
+
]);
|
|
157
|
+
// TODO(palla/mbps): Should we source this from the constants instead?
|
|
158
|
+
// timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
|
|
159
|
+
const timestamp = blocks[blocks.length - 1].timestamp;
|
|
160
|
+
const totalManaUsed = blocks.reduce((acc, block)=>acc.add(block.header.totalManaUsed), Fr.ZERO);
|
|
161
|
+
const header = CheckpointHeader.from({
|
|
162
|
+
lastArchiveRoot: this.lastArchives[0].root,
|
|
163
|
+
blobsHash,
|
|
164
|
+
inHash,
|
|
165
|
+
epochOutHash,
|
|
166
|
+
blockHeadersHash,
|
|
167
|
+
slotNumber,
|
|
168
|
+
timestamp,
|
|
169
|
+
coinbase,
|
|
170
|
+
feeRecipient,
|
|
171
|
+
gasFees,
|
|
172
|
+
totalManaUsed
|
|
173
|
+
});
|
|
174
|
+
return new Checkpoint(newArchive, header, blocks, this.checkpointNumber);
|
|
175
|
+
}
|
|
176
|
+
clone() {
|
|
177
|
+
const clone = new LightweightCheckpointBuilder(this.checkpointNumber, this.constants, [
|
|
178
|
+
...this.l1ToL2Messages
|
|
179
|
+
], [
|
|
180
|
+
...this.previousCheckpointOutHashes
|
|
181
|
+
], this.db);
|
|
182
|
+
clone.lastArchives = [
|
|
183
|
+
...this.lastArchives
|
|
184
|
+
];
|
|
185
|
+
clone.spongeBlob = this.spongeBlob.clone();
|
|
186
|
+
clone.blocks = [
|
|
187
|
+
...this.blocks
|
|
188
|
+
];
|
|
189
|
+
clone.blobFields = [
|
|
190
|
+
...this.blobFields
|
|
191
|
+
];
|
|
192
|
+
return clone;
|
|
193
|
+
}
|
|
194
|
+
}
|
package/dest/mocks/fixtures.d.ts
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import type { Logger } from '@aztec/foundation/log';
|
|
2
2
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
3
3
|
import { type CircuitSimulator } from '@aztec/simulator/server';
|
|
4
|
-
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
5
4
|
import { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
6
|
-
import type { ProcessedTx } from '@aztec/stdlib/tx';
|
|
7
5
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
8
6
|
export declare const getEnvironmentConfig: (logger: Logger) => Promise<{
|
|
9
7
|
acvmWorkingDirectory: string;
|
|
@@ -17,7 +15,6 @@ export declare function getSimulator(config: {
|
|
|
17
15
|
acvmWorkingDirectory: string | undefined;
|
|
18
16
|
acvmBinaryPath: string | undefined;
|
|
19
17
|
}, logger?: Logger): Promise<CircuitSimulator>;
|
|
20
|
-
export declare const updateExpectedTreesFromTxs: (db: MerkleTreeWriteOperations, txs: ProcessedTx[]) => Promise<void>;
|
|
21
18
|
export declare const makeGlobals: (blockNumber: number, slotNumber?: number, overrides?: Partial<FieldsOf<GlobalVariables> & FieldsOf<CheckpointConstantData>>) => GlobalVariables;
|
|
22
19
|
export declare const makeCheckpointConstants: (slotNumber: number, overrides?: Partial<FieldsOf<CheckpointConstantData>>) => CheckpointConstantData;
|
|
23
|
-
//# sourceMappingURL=
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tb2Nrcy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUl4RCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBK0MsTUFBTSx5QkFBeUIsQ0FBQztBQUc3RyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFpQm5ELGVBQU8sTUFBTSxvQkFBb0I7Ozs7Ozs7Y0FrQ2hDLENBQUM7QUFFRix3QkFBc0IsWUFBWSxDQUNoQyxNQUFNLEVBQUU7SUFBRSxvQkFBb0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUE7Q0FBRSxFQUN4RixNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBZTNCO0FBRUQsZUFBTyxNQUFNLFdBQVcsa0pBaUJ2QixDQUFDO0FBRUYsZUFBTyxNQUFNLHVCQUF1Qix1R0FnQm5DLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,KAAK,gBAAgB,EAA+C,MAAM,yBAAyB,CAAC;AAG7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAiBnD,eAAO,MAAM,oBAAoB;;;;;;;cAkChC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAED,eAAO,MAAM,WAAW,kJAiBvB,CAAC;AAEF,eAAO,MAAM,uBAAuB,uGAgBnC,CAAC"}
|
package/dest/mocks/fixtures.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
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';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
6
5
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
7
6
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
8
7
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
@@ -10,7 +9,6 @@ import { NativeACVMSimulator, WASMSimulatorWithBlobs } from '@aztec/simulator/se
|
|
|
10
9
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
10
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
12
11
|
import { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
13
|
-
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
14
12
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
15
13
|
import { promises as fs } from 'fs';
|
|
16
14
|
import path from 'path';
|
|
@@ -67,22 +65,14 @@ export async function getSimulator(config, logger) {
|
|
|
67
65
|
logger?.info('Using WASM ACVM simulation');
|
|
68
66
|
return new WASMSimulatorWithBlobs();
|
|
69
67
|
}
|
|
70
|
-
// Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
|
|
71
|
-
export const updateExpectedTreesFromTxs = async (db, txs)=>{
|
|
72
|
-
await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, txs.flatMap((tx)=>padArrayEnd(tx.txEffect.noteHashes, Fr.zero(), MAX_NOTE_HASHES_PER_TX)));
|
|
73
|
-
await db.batchInsert(MerkleTreeId.NULLIFIER_TREE, txs.flatMap((tx)=>padArrayEnd(tx.txEffect.nullifiers, Fr.zero(), MAX_NULLIFIERS_PER_TX).map((x)=>x.toBuffer())), NULLIFIER_TREE_HEIGHT);
|
|
74
|
-
for (const tx of txs){
|
|
75
|
-
await db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, tx.txEffect.publicDataWrites.map((write)=>write.toBuffer()));
|
|
76
|
-
}
|
|
77
|
-
};
|
|
78
68
|
export const makeGlobals = (blockNumber, slotNumber = blockNumber, overrides = {})=>{
|
|
79
69
|
const checkpointConstants = makeCheckpointConstants(slotNumber, overrides);
|
|
80
70
|
return GlobalVariables.from({
|
|
81
71
|
chainId: checkpointConstants.chainId,
|
|
82
72
|
version: checkpointConstants.version,
|
|
83
|
-
blockNumber,
|
|
84
|
-
slotNumber:
|
|
85
|
-
timestamp: BigInt(blockNumber),
|
|
73
|
+
blockNumber: BlockNumber(blockNumber),
|
|
74
|
+
slotNumber: SlotNumber(slotNumber),
|
|
75
|
+
timestamp: BigInt(blockNumber * 123),
|
|
86
76
|
coinbase: checkpointConstants.coinbase,
|
|
87
77
|
feeRecipient: checkpointConstants.feeRecipient,
|
|
88
78
|
gasFees: checkpointConstants.gasFees,
|
|
@@ -96,7 +86,7 @@ export const makeCheckpointConstants = (slotNumber, overrides = {})=>{
|
|
|
96
86
|
vkTreeRoot: getVKTreeRoot(),
|
|
97
87
|
protocolContractsHash,
|
|
98
88
|
proverId: Fr.ZERO,
|
|
99
|
-
slotNumber:
|
|
89
|
+
slotNumber: SlotNumber(slotNumber),
|
|
100
90
|
coinbase: EthAddress.ZERO,
|
|
101
91
|
feeRecipient: AztecAddress.ZERO,
|
|
102
92
|
gasFees: GasFees.empty(),
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import type { BBProverConfig } from '@aztec/bb-prover';
|
|
2
|
-
import { Fr } from '@aztec/foundation/
|
|
2
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
4
4
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
5
|
-
import { SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
|
|
6
5
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
|
-
import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
|
|
6
|
+
import type { MerkleTreeWriteOperations, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
|
|
8
7
|
import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
9
|
-
import {
|
|
10
|
-
import { type BlockHeader, type GlobalVariables, type ProcessedTx
|
|
8
|
+
import { mockProcessedTx } from '@aztec/stdlib/testing';
|
|
9
|
+
import { type BlockHeader, type GlobalVariables, type ProcessedTx } from '@aztec/stdlib/tx';
|
|
11
10
|
import type { MerkleTreeAdminDatabase } from '@aztec/world-state';
|
|
12
11
|
import type { BlockProvingState } from '../orchestrator/block-proving-state.js';
|
|
13
12
|
import { ProvingOrchestrator } from '../orchestrator/index.js';
|
|
@@ -15,69 +14,53 @@ import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facad
|
|
|
15
14
|
import { TestBroker } from '../test/mock_prover.js';
|
|
16
15
|
export declare class TestContext {
|
|
17
16
|
worldState: MerkleTreeAdminDatabase;
|
|
18
|
-
firstCheckpointNumber: Fr;
|
|
19
|
-
globalVariables: GlobalVariables;
|
|
20
17
|
prover: ServerCircuitProver;
|
|
21
18
|
broker: TestBroker;
|
|
22
19
|
brokerProverFacade: BrokerCircuitProverFacade;
|
|
23
20
|
orchestrator: TestProvingOrchestrator;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
logger: Logger;
|
|
21
|
+
private feePayer;
|
|
22
|
+
private directoriesToCleanup;
|
|
23
|
+
private logger;
|
|
28
24
|
private headers;
|
|
25
|
+
private checkpoints;
|
|
26
|
+
private checkpointOutHashes;
|
|
27
|
+
private nextCheckpointIndex;
|
|
28
|
+
private nextCheckpointNumber;
|
|
29
|
+
private nextBlockNumber;
|
|
30
|
+
private epochNumber;
|
|
29
31
|
private feePayerBalance;
|
|
30
|
-
constructor(worldState: MerkleTreeAdminDatabase,
|
|
32
|
+
constructor(worldState: MerkleTreeAdminDatabase, prover: ServerCircuitProver, broker: TestBroker, brokerProverFacade: BrokerCircuitProverFacade, orchestrator: TestProvingOrchestrator, feePayer: AztecAddress, initialFeePayerBalance: Fr, directoriesToCleanup: string[], logger: Logger);
|
|
31
33
|
get epochProver(): TestProvingOrchestrator;
|
|
32
|
-
|
|
33
|
-
static new(logger: Logger, { proverCount, createProver, slotNumber, blockNumber, }?: {
|
|
34
|
+
static new(logger: Logger, { proverCount, createProver }?: {
|
|
34
35
|
proverCount?: number;
|
|
35
36
|
createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>;
|
|
36
|
-
slotNumber?: number;
|
|
37
|
-
blockNumber?: number;
|
|
38
37
|
}): Promise<TestContext>;
|
|
39
|
-
getFork(): Promise<
|
|
40
|
-
getBlockHeader(blockNumber: 0): BlockHeader;
|
|
41
|
-
getBlockHeader(blockNumber: number): BlockHeader | undefined;
|
|
42
|
-
getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
|
|
38
|
+
getFork(): Promise<MerkleTreeWriteOperations>;
|
|
43
39
|
cleanup(): Promise<void>;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
numL1ToL2Messages?: number;
|
|
49
|
-
blockNumber?: number;
|
|
50
|
-
makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
|
|
51
|
-
}): Promise<{
|
|
52
|
-
block: import("@aztec/stdlib/block").L2Block;
|
|
53
|
-
txs: ProcessedTx[];
|
|
54
|
-
l1ToL2Messages: Fr[];
|
|
55
|
-
}>;
|
|
56
|
-
makePendingBlocksInCheckpoint(numBlocks: number, { checkpointIndex, numTxsPerBlock, numL1ToL2Messages, firstBlockNumber, makeGlobalVariablesOpts, makeProcessedTxOpts, }?: {
|
|
57
|
-
checkpointIndex?: number;
|
|
40
|
+
startNewEpoch(): void;
|
|
41
|
+
getBlobFields(): Fr[][];
|
|
42
|
+
getFinalBlobChallenges(): Promise<import("@aztec/blob-lib").FinalBlobBatchingChallenges>;
|
|
43
|
+
makeCheckpoint(numBlocks: number, { numTxsPerBlock, numL1ToL2Messages, makeProcessedTxOpts, ...constantOpts }?: {
|
|
58
44
|
numTxsPerBlock?: number | number[];
|
|
59
45
|
numL1ToL2Messages?: number;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
46
|
+
makeProcessedTxOpts?: (blockGlobalVariables: GlobalVariables, txIndex: number) => Partial<Parameters<typeof mockProcessedTx>[0]>;
|
|
47
|
+
} & Partial<FieldsOf<CheckpointConstantData>>): Promise<{
|
|
48
|
+
constants: CheckpointConstantData;
|
|
49
|
+
header: import("@aztec/stdlib/rollup").CheckpointHeader;
|
|
64
50
|
blocks: {
|
|
65
51
|
header: BlockHeader;
|
|
66
52
|
txs: ProcessedTx[];
|
|
67
53
|
}[];
|
|
68
54
|
l1ToL2Messages: Fr[];
|
|
69
|
-
|
|
55
|
+
previousBlockHeader: BlockHeader;
|
|
70
56
|
}>;
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
contractDataSource?: SimpleContractDataSource;
|
|
75
|
-
}): Promise<[ProcessedTx[], import("@aztec/stdlib/tx").FailedTx[], Tx[], import("@aztec/stdlib/tx").NestedProcessReturnValues[]]>;
|
|
76
|
-
private setTreeRoots;
|
|
57
|
+
private makeProcessedTx;
|
|
58
|
+
private getBlockHeader;
|
|
59
|
+
private updateTrees;
|
|
77
60
|
}
|
|
78
61
|
declare class TestProvingOrchestrator extends ProvingOrchestrator {
|
|
79
62
|
isVerifyBuiltBlockAgainstSyncedStateEnabled: boolean;
|
|
80
63
|
protected verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void>;
|
|
81
64
|
}
|
|
82
65
|
export {};
|
|
83
|
-
//# sourceMappingURL=
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9ja3MvdGVzdF9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBS3ZELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUt4RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RyxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZUFBZSxFQUNwQixLQUFLLFdBQVcsRUFHakIsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBV2xFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDaEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDdEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR3BELHFCQUFhLFdBQVc7SUFXYixVQUFVLEVBQUUsdUJBQXVCO0lBQ25DLE1BQU0sRUFBRSxtQkFBbUI7SUFDM0IsTUFBTSxFQUFFLFVBQVU7SUFDbEIsa0JBQWtCLEVBQUUseUJBQXlCO0lBQzdDLFlBQVksRUFBRSx1QkFBdUI7SUFDNUMsT0FBTyxDQUFDLFFBQVE7SUFFaEIsT0FBTyxDQUFDLG9CQUFvQjtJQUM1QixPQUFPLENBQUMsTUFBTTtJQWxCaEIsT0FBTyxDQUFDLE9BQU8sQ0FBdUM7SUFDdEQsT0FBTyxDQUFDLFdBQVcsQ0FBb0I7SUFDdkMsT0FBTyxDQUFDLG1CQUFtQixDQUFZO0lBQ3ZDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBSztJQUNoQyxPQUFPLENBQUMsb0JBQW9CLENBQXVCO0lBQ25ELE9BQU8sQ0FBQyxlQUFlLENBQUs7SUFDNUIsT0FBTyxDQUFDLFdBQVcsQ0FBSztJQUN4QixPQUFPLENBQUMsZUFBZSxDQUFLO0lBRTVCLFlBQ1MsVUFBVSxFQUFFLHVCQUF1QixFQUNuQyxNQUFNLEVBQUUsbUJBQW1CLEVBQzNCLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLGtCQUFrQixFQUFFLHlCQUF5QixFQUM3QyxZQUFZLEVBQUUsdUJBQXVCLEVBQ3BDLFFBQVEsRUFBRSxZQUFZLEVBQzlCLHNCQUFzQixFQUFFLEVBQUUsRUFDbEIsb0JBQW9CLEVBQUUsTUFBTSxFQUFFLEVBQzlCLE1BQU0sRUFBRSxNQUFNLEVBR3ZCO0lBRUQsSUFBVyxXQUFXLDRCQUVyQjtJQUVELE9BQWEsR0FBRyxDQUNkLE1BQU0sRUFBRSxNQUFNLEVBQ2QsRUFDRSxXQUFlLEVBQ2YsWUFBOEcsRUFDL0csR0FBRTtRQUNELFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNyQixZQUFZLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxjQUFjLEtBQUssT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7S0FDdEUsd0JBdURQO0lBRU0sT0FBTyx1Q0FFYjtJQUVLLE9BQU8sa0JBVVo7SUFFTSxhQUFhLFNBS25CO0lBR00sYUFBYSxXQUVuQjtJQUVZLHNCQUFzQixtRUFHbEM7SUFFWSxjQUFjLENBQ3pCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLEVBQ0UsY0FBa0IsRUFDbEIsaUJBQXFCLEVBQ3JCLG1CQUFnQyxFQUNoQyxHQUFHLFlBQVksRUFDaEIsR0FBRTtRQUNELGNBQWMsQ0FBQyxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBQUUsQ0FBQztRQUNuQyxpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUMzQixtQkFBbUIsQ0FBQyxFQUFFLENBQ3BCLG9CQUFvQixFQUFFLGVBQWUsRUFDckMsT0FBTyxFQUFFLE1BQU0sS0FDWixPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNyRCxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsc0JBQXNCLENBQUMsQ0FBTTs7Ozs7Ozs7O09BMEduRDtZQUVhLGVBQWU7SUFvQjdCLE9BQU8sQ0FBQyxjQUFjO1lBU1IsV0FBVztDQThCMUI7QUFFRCxjQUFNLHVCQUF3QixTQUFRLG1CQUFtQjtJQUNoRCwyQ0FBMkMsVUFBUztJQUkzRCxVQUFtQixrQ0FBa0MsQ0FBQyxZQUFZLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtwRztDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,EAAE,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
|