@aztec/validator-client 4.0.0-rc.7 → 4.0.0-rc.9
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.
|
@@ -9,6 +9,7 @@ import { Checkpoint } from '@aztec/stdlib/checkpoint';
|
|
|
9
9
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
10
10
|
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
11
11
|
import { type BuildBlockInCheckpointResult, type FullNodeBlockBuilderConfig, type ICheckpointBlockBuilder, type ICheckpointsBuilder, type MerkleTreeWriteOperations, type PublicProcessorLimits, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
12
|
+
import { type DebugLogStore } from '@aztec/stdlib/logs';
|
|
12
13
|
import { type CheckpointGlobalVariables, GlobalVariables, StateReference, Tx } from '@aztec/stdlib/tx';
|
|
13
14
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
14
15
|
export type { BuildBlockInCheckpointResult } from '@aztec/stdlib/interfaces/server';
|
|
@@ -23,8 +24,9 @@ export declare class CheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
23
24
|
private contractDataSource;
|
|
24
25
|
private dateProvider;
|
|
25
26
|
private telemetryClient;
|
|
27
|
+
private debugLogStore;
|
|
26
28
|
private log;
|
|
27
|
-
constructor(checkpointBuilder: LightweightCheckpointBuilder, fork: MerkleTreeWriteOperations, config: FullNodeBlockBuilderConfig, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient: TelemetryClient, bindings?: LoggerBindings);
|
|
29
|
+
constructor(checkpointBuilder: LightweightCheckpointBuilder, fork: MerkleTreeWriteOperations, config: FullNodeBlockBuilderConfig, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient: TelemetryClient, bindings?: LoggerBindings, debugLogStore?: DebugLogStore);
|
|
28
30
|
getConstantData(): CheckpointGlobalVariables;
|
|
29
31
|
/**
|
|
30
32
|
* Builds a single block within this checkpoint.
|
|
@@ -48,8 +50,9 @@ export declare class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
48
50
|
private contractDataSource;
|
|
49
51
|
private dateProvider;
|
|
50
52
|
private telemetryClient;
|
|
53
|
+
private debugLogStore;
|
|
51
54
|
private log;
|
|
52
|
-
constructor(config: FullNodeBlockBuilderConfig & Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>, worldState: WorldStateSynchronizer, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient);
|
|
55
|
+
constructor(config: FullNodeBlockBuilderConfig & Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>, worldState: WorldStateSynchronizer, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient, debugLogStore?: DebugLogStore);
|
|
53
56
|
getConfig(): FullNodeBlockBuilderConfig;
|
|
54
57
|
updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
|
|
55
58
|
/**
|
|
@@ -63,4 +66,4 @@ export declare class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
63
66
|
/** Returns a fork of the world state at the given block number. */
|
|
64
67
|
getFork(blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations>;
|
|
65
68
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9idWlsZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2hlY2twb2ludF9idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVoRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRXZGLE9BQU8sRUFBRSxZQUFZLEVBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMxRSxPQUFPLEVBR0wsZUFBZSxFQUVoQixNQUFNLHlCQUF5QixDQUFDO0FBQ2pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXJFLE9BQU8sRUFDTCxLQUFLLDRCQUE0QixFQUNqQyxLQUFLLDBCQUEwQixFQUUvQixLQUFLLHVCQUF1QixFQUM1QixLQUFLLG1CQUFtQixFQUN4QixLQUFLLHlCQUF5QixFQUU5QixLQUFLLHFCQUFxQixFQUMxQixLQUFLLHNCQUFzQixFQUM1QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBcUIsTUFBTSxvQkFBb0IsQ0FBQztBQUUzRSxPQUFPLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUduRixZQUFZLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVwRjs7O0dBR0c7QUFDSCxxQkFBYSxpQkFBa0IsWUFBVyx1QkFBdUI7SUFJN0QsT0FBTyxDQUFDLGlCQUFpQjtJQUN6QixPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsZUFBZTtJQUV2QixPQUFPLENBQUMsYUFBYTtJQVZ2QixPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ1UsaUJBQWlCLEVBQUUsNEJBQTRCLEVBQy9DLElBQUksRUFBRSx5QkFBeUIsRUFDL0IsTUFBTSxFQUFFLDBCQUEwQixFQUNsQyxrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsWUFBWSxFQUFFLFlBQVksRUFDMUIsZUFBZSxFQUFFLGVBQWUsRUFDeEMsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUNqQixhQUFhLEdBQUUsYUFBdUMsRUFNL0Q7SUFFRCxlQUFlLElBQUkseUJBQXlCLENBRTNDO0lBRUQ7O09BRUc7SUFDRyxVQUFVLENBQ2QsVUFBVSxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUMsR0FBRyxhQUFhLENBQUMsRUFBRSxDQUFDLEVBQzVDLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLElBQUksR0FBRSxxQkFBcUIsR0FBRztRQUFFLGdCQUFnQixDQUFDLEVBQUUsY0FBYyxDQUFBO0tBQU8sR0FDdkUsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBd0R2QztJQUVELCtDQUErQztJQUN6QyxrQkFBa0IsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBVTlDO0lBRUQsaURBQWlEO0lBQ2pELGFBQWEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRW5DO0lBRUQsVUFBZ0Isb0JBQW9CLENBQUMsZUFBZSxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUseUJBQXlCOzs7T0F5Q3JHO0NBQ0Y7QUFFRCxnREFBZ0Q7QUFDaEQscUJBQWEsMEJBQTJCLFlBQVcsbUJBQW1CO0lBSWxFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsYUFBYTtJQVJ2QixPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ1UsTUFBTSxFQUFFLDBCQUEwQixHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxlQUFlLEdBQUcsY0FBYyxDQUFDLEVBQzlGLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQ3RDLFlBQVksRUFBRSxZQUFZLEVBQzFCLGVBQWUsR0FBRSxlQUFzQyxFQUN2RCxhQUFhLEdBQUUsYUFBdUMsRUFHL0Q7SUFFTSxTQUFTLElBQUksMEJBQTBCLENBRTdDO0lBRU0sWUFBWSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsMEJBQTBCLENBQUMsUUFFOUQ7SUFFRDs7T0FFRztJQUNHLGVBQWUsQ0FDbkIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSx5QkFBeUIsRUFDcEMscUJBQXFCLEVBQUUsTUFBTSxFQUM3QixjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQ3BCLDJCQUEyQixFQUFFLEVBQUUsRUFBRSxFQUNqQyxJQUFJLEVBQUUseUJBQXlCLEVBQy9CLFFBQVEsQ0FBQyxFQUFFLGNBQWMsR0FDeEIsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBaUM1QjtJQUVEOztPQUVHO0lBQ0csY0FBYyxDQUNsQixnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsU0FBUyxFQUFFLHlCQUF5QixFQUNwQyxxQkFBcUIsRUFBRSxNQUFNLEVBQzdCLGNBQWMsRUFBRSxFQUFFLEVBQUUsRUFDcEIsMkJBQTJCLEVBQUUsRUFBRSxFQUFFLEVBQ2pDLElBQUksRUFBRSx5QkFBeUIsRUFDL0IsY0FBYyxHQUFFLE9BQU8sRUFBTyxFQUM5QixRQUFRLENBQUMsRUFBRSxjQUFjLEdBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQStDNUI7SUFFRCxtRUFBbUU7SUFDbkUsT0FBTyxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBRXBFO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint_builder.d.ts","sourceRoot":"","sources":["../src/checkpoint_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EAAE,YAAY,EAAW,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAE/B,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAE9B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"checkpoint_builder.d.ts","sourceRoot":"","sources":["../src/checkpoint_builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { LightweightCheckpointBuilder } from '@aztec/prover-client/light';
|
|
|
7
7
|
import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, createPublicTxSimulatorForBlockBuilding } from '@aztec/simulator/server';
|
|
8
8
|
import { Gas } from '@aztec/stdlib/gas';
|
|
9
9
|
import { FullNodeBlockBuilderConfigKeys, NoValidTxsError } from '@aztec/stdlib/interfaces/server';
|
|
10
|
+
import { NullDebugLogStore } from '@aztec/stdlib/logs';
|
|
10
11
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
11
12
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
12
13
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
@@ -20,14 +21,16 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
20
21
|
contractDataSource;
|
|
21
22
|
dateProvider;
|
|
22
23
|
telemetryClient;
|
|
24
|
+
debugLogStore;
|
|
23
25
|
log;
|
|
24
|
-
constructor(checkpointBuilder, fork, config, contractDataSource, dateProvider, telemetryClient, bindings){
|
|
26
|
+
constructor(checkpointBuilder, fork, config, contractDataSource, dateProvider, telemetryClient, bindings, debugLogStore = new NullDebugLogStore()){
|
|
25
27
|
this.checkpointBuilder = checkpointBuilder;
|
|
26
28
|
this.fork = fork;
|
|
27
29
|
this.config = config;
|
|
28
30
|
this.contractDataSource = contractDataSource;
|
|
29
31
|
this.dateProvider = dateProvider;
|
|
30
32
|
this.telemetryClient = telemetryClient;
|
|
33
|
+
this.debugLogStore = debugLogStore;
|
|
31
34
|
this.log = createLogger('checkpoint-builder', {
|
|
32
35
|
...bindings,
|
|
33
36
|
instanceId: `checkpoint-${checkpointBuilder.checkpointNumber}`
|
|
@@ -101,9 +104,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
101
104
|
const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
|
|
102
105
|
const contractsDB = new PublicContractsDB(this.contractDataSource, this.log.getBindings());
|
|
103
106
|
const guardedFork = new GuardedMerkleTreeOperations(fork);
|
|
107
|
+
const collectDebugLogs = this.debugLogStore.isEnabled;
|
|
104
108
|
const bindings = this.log.getBindings();
|
|
105
|
-
const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(guardedFork, contractsDB, globalVariables, this.telemetryClient, bindings);
|
|
106
|
-
const processor = new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, createLogger('simulator:public-processor', bindings), this.config);
|
|
109
|
+
const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(guardedFork, contractsDB, globalVariables, this.telemetryClient, bindings, collectDebugLogs);
|
|
110
|
+
const processor = new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, createLogger('simulator:public-processor', bindings), this.config, this.debugLogStore);
|
|
107
111
|
const validator = createTxValidatorForBlockBuilding(fork, this.contractDataSource, globalVariables, txPublicSetupAllowList, this.log.getBindings());
|
|
108
112
|
return {
|
|
109
113
|
processor,
|
|
@@ -117,13 +121,15 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
117
121
|
contractDataSource;
|
|
118
122
|
dateProvider;
|
|
119
123
|
telemetryClient;
|
|
124
|
+
debugLogStore;
|
|
120
125
|
log;
|
|
121
|
-
constructor(config, worldState, contractDataSource, dateProvider, telemetryClient = getTelemetryClient()){
|
|
126
|
+
constructor(config, worldState, contractDataSource, dateProvider, telemetryClient = getTelemetryClient(), debugLogStore = new NullDebugLogStore()){
|
|
122
127
|
this.config = config;
|
|
123
128
|
this.worldState = worldState;
|
|
124
129
|
this.contractDataSource = contractDataSource;
|
|
125
130
|
this.dateProvider = dateProvider;
|
|
126
131
|
this.telemetryClient = telemetryClient;
|
|
132
|
+
this.debugLogStore = debugLogStore;
|
|
127
133
|
this.log = createLogger('checkpoint-builder');
|
|
128
134
|
}
|
|
129
135
|
getConfig() {
|
|
@@ -146,7 +152,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
146
152
|
feeAssetPriceModifier
|
|
147
153
|
});
|
|
148
154
|
const lightweightBuilder = await LightweightCheckpointBuilder.startNewCheckpoint(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, fork, bindings, feeAssetPriceModifier);
|
|
149
|
-
return new CheckpointBuilder(lightweightBuilder, fork, this.config, this.contractDataSource, this.dateProvider, this.telemetryClient, bindings);
|
|
155
|
+
return new CheckpointBuilder(lightweightBuilder, fork, this.config, this.contractDataSource, this.dateProvider, this.telemetryClient, bindings, this.debugLogStore);
|
|
150
156
|
}
|
|
151
157
|
/**
|
|
152
158
|
* Opens a checkpoint, either starting fresh or resuming from existing blocks.
|
|
@@ -166,7 +172,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
166
172
|
feeAssetPriceModifier
|
|
167
173
|
});
|
|
168
174
|
const lightweightBuilder = await LightweightCheckpointBuilder.resumeCheckpoint(checkpointNumber, constants, feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, existingBlocks, bindings);
|
|
169
|
-
return new CheckpointBuilder(lightweightBuilder, fork, this.config, this.contractDataSource, this.dateProvider, this.telemetryClient, bindings);
|
|
175
|
+
return new CheckpointBuilder(lightweightBuilder, fork, this.config, this.contractDataSource, this.dateProvider, this.telemetryClient, bindings, this.debugLogStore);
|
|
170
176
|
}
|
|
171
177
|
/** Returns a fork of the world state at the given block number. */ getFork(blockNumber) {
|
|
172
178
|
return this.worldState.fork(blockNumber);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/validator-client",
|
|
3
|
-
"version": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.9",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -64,30 +64,30 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/blob-client": "4.0.0-rc.
|
|
68
|
-
"@aztec/blob-lib": "4.0.0-rc.
|
|
69
|
-
"@aztec/constants": "4.0.0-rc.
|
|
70
|
-
"@aztec/epoch-cache": "4.0.0-rc.
|
|
71
|
-
"@aztec/ethereum": "4.0.0-rc.
|
|
72
|
-
"@aztec/foundation": "4.0.0-rc.
|
|
73
|
-
"@aztec/node-keystore": "4.0.0-rc.
|
|
74
|
-
"@aztec/noir-protocol-circuits-types": "4.0.0-rc.
|
|
75
|
-
"@aztec/p2p": "4.0.0-rc.
|
|
76
|
-
"@aztec/protocol-contracts": "4.0.0-rc.
|
|
77
|
-
"@aztec/prover-client": "4.0.0-rc.
|
|
78
|
-
"@aztec/simulator": "4.0.0-rc.
|
|
79
|
-
"@aztec/slasher": "4.0.0-rc.
|
|
80
|
-
"@aztec/stdlib": "4.0.0-rc.
|
|
81
|
-
"@aztec/telemetry-client": "4.0.0-rc.
|
|
82
|
-
"@aztec/validator-ha-signer": "4.0.0-rc.
|
|
67
|
+
"@aztec/blob-client": "4.0.0-rc.9",
|
|
68
|
+
"@aztec/blob-lib": "4.0.0-rc.9",
|
|
69
|
+
"@aztec/constants": "4.0.0-rc.9",
|
|
70
|
+
"@aztec/epoch-cache": "4.0.0-rc.9",
|
|
71
|
+
"@aztec/ethereum": "4.0.0-rc.9",
|
|
72
|
+
"@aztec/foundation": "4.0.0-rc.9",
|
|
73
|
+
"@aztec/node-keystore": "4.0.0-rc.9",
|
|
74
|
+
"@aztec/noir-protocol-circuits-types": "4.0.0-rc.9",
|
|
75
|
+
"@aztec/p2p": "4.0.0-rc.9",
|
|
76
|
+
"@aztec/protocol-contracts": "4.0.0-rc.9",
|
|
77
|
+
"@aztec/prover-client": "4.0.0-rc.9",
|
|
78
|
+
"@aztec/simulator": "4.0.0-rc.9",
|
|
79
|
+
"@aztec/slasher": "4.0.0-rc.9",
|
|
80
|
+
"@aztec/stdlib": "4.0.0-rc.9",
|
|
81
|
+
"@aztec/telemetry-client": "4.0.0-rc.9",
|
|
82
|
+
"@aztec/validator-ha-signer": "4.0.0-rc.9",
|
|
83
83
|
"koa": "^2.16.1",
|
|
84
84
|
"koa-router": "^13.1.1",
|
|
85
85
|
"tslib": "^2.4.0",
|
|
86
86
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
87
87
|
},
|
|
88
88
|
"devDependencies": {
|
|
89
|
-
"@aztec/archiver": "4.0.0-rc.
|
|
90
|
-
"@aztec/world-state": "4.0.0-rc.
|
|
89
|
+
"@aztec/archiver": "4.0.0-rc.9",
|
|
90
|
+
"@aztec/world-state": "4.0.0-rc.9",
|
|
91
91
|
"@electric-sql/pglite": "^0.3.14",
|
|
92
92
|
"@jest/globals": "^30.0.0",
|
|
93
93
|
"@types/jest": "^30.0.0",
|
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
type PublicProcessorLimits,
|
|
29
29
|
type WorldStateSynchronizer,
|
|
30
30
|
} from '@aztec/stdlib/interfaces/server';
|
|
31
|
+
import { type DebugLogStore, NullDebugLogStore } from '@aztec/stdlib/logs';
|
|
31
32
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
32
33
|
import { type CheckpointGlobalVariables, GlobalVariables, StateReference, Tx } from '@aztec/stdlib/tx';
|
|
33
34
|
import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
|
|
@@ -50,6 +51,7 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
50
51
|
private dateProvider: DateProvider,
|
|
51
52
|
private telemetryClient: TelemetryClient,
|
|
52
53
|
bindings?: LoggerBindings,
|
|
54
|
+
private debugLogStore: DebugLogStore = new NullDebugLogStore(),
|
|
53
55
|
) {
|
|
54
56
|
this.log = createLogger('checkpoint-builder', {
|
|
55
57
|
...bindings,
|
|
@@ -150,6 +152,8 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
150
152
|
const contractsDB = new PublicContractsDB(this.contractDataSource, this.log.getBindings());
|
|
151
153
|
const guardedFork = new GuardedMerkleTreeOperations(fork);
|
|
152
154
|
|
|
155
|
+
const collectDebugLogs = this.debugLogStore.isEnabled;
|
|
156
|
+
|
|
153
157
|
const bindings = this.log.getBindings();
|
|
154
158
|
const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(
|
|
155
159
|
guardedFork,
|
|
@@ -157,6 +161,7 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
157
161
|
globalVariables,
|
|
158
162
|
this.telemetryClient,
|
|
159
163
|
bindings,
|
|
164
|
+
collectDebugLogs,
|
|
160
165
|
);
|
|
161
166
|
|
|
162
167
|
const processor = new PublicProcessor(
|
|
@@ -168,6 +173,7 @@ export class CheckpointBuilder implements ICheckpointBlockBuilder {
|
|
|
168
173
|
this.telemetryClient,
|
|
169
174
|
createLogger('simulator:public-processor', bindings),
|
|
170
175
|
this.config,
|
|
176
|
+
this.debugLogStore,
|
|
171
177
|
);
|
|
172
178
|
|
|
173
179
|
const validator = createTxValidatorForBlockBuilding(
|
|
@@ -195,6 +201,7 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
195
201
|
private contractDataSource: ContractDataSource,
|
|
196
202
|
private dateProvider: DateProvider,
|
|
197
203
|
private telemetryClient: TelemetryClient = getTelemetryClient(),
|
|
204
|
+
private debugLogStore: DebugLogStore = new NullDebugLogStore(),
|
|
198
205
|
) {
|
|
199
206
|
this.log = createLogger('checkpoint-builder');
|
|
200
207
|
}
|
|
@@ -249,6 +256,7 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
249
256
|
this.dateProvider,
|
|
250
257
|
this.telemetryClient,
|
|
251
258
|
bindings,
|
|
259
|
+
this.debugLogStore,
|
|
252
260
|
);
|
|
253
261
|
}
|
|
254
262
|
|
|
@@ -309,6 +317,7 @@ export class FullNodeCheckpointsBuilder implements ICheckpointsBuilder {
|
|
|
309
317
|
this.dateProvider,
|
|
310
318
|
this.telemetryClient,
|
|
311
319
|
bindings,
|
|
320
|
+
this.debugLogStore,
|
|
312
321
|
);
|
|
313
322
|
}
|
|
314
323
|
|