@aztec/aztec-node 0.15.1 → 0.16.1

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.
@@ -1,5 +1,7 @@
1
+ import { LogFn } from '@aztec/foundation/log';
1
2
  import { LevelDown } from 'leveldown';
2
3
  import { LevelUp } from 'levelup';
4
+ import { RootDatabase } from 'lmdb';
3
5
  import { MemDown } from 'memdown';
4
6
  import { AztecNodeConfig } from './config.js';
5
7
  export declare const createMemDown: () => MemDown<any, any>;
@@ -10,5 +12,5 @@ export declare const createLevelDown: (path: string) => LevelDown;
10
12
  * @throws If `config.dataDirectory` is set and the directory cannot be created.
11
13
  * @returns The database for the aztec node.
12
14
  */
13
- export declare function openDb(config: AztecNodeConfig): Promise<LevelUp>;
15
+ export declare function openDb(config: AztecNodeConfig, log: LogFn): Promise<[nodeDb: RootDatabase, worldStateDb: LevelUp]>;
14
16
  //# sourceMappingURL=db.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/aztec-node/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAsB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,OAAO,EAAsB,MAAM,SAAS,CAAC;AAItD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,aAAa,yBAAgD,CAAC;AAC3E,eAAO,MAAM,eAAe,SAAU,MAAM,cAA0C,CAAC;AAevF;;;;;GAKG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAyBtE"}
1
+ {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/aztec-node/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAwB,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAsB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,YAAY,EAAQ,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAsB,MAAM,SAAS,CAAC;AAItD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,aAAa,yBAAgD,CAAC;AAC3E,eAAO,MAAM,eAAe,SAAU,MAAM,cAA0C,CAAC;AAgBvF;;;;;GAKG;AACH,wBAAsB,MAAM,CAC1B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CA6BxD"}
@@ -1,11 +1,13 @@
1
1
  import { default as leveldown } from 'leveldown';
2
2
  import { default as levelup } from 'levelup';
3
+ import { open } from 'lmdb';
3
4
  import { default as memdown } from 'memdown';
4
5
  import { mkdir } from 'node:fs/promises';
5
6
  import { join } from 'node:path';
6
7
  export const createMemDown = () => memdown();
7
8
  export const createLevelDown = (path) => leveldown(path);
8
9
  const DB_SUBDIR = 'aztec-node';
10
+ const WORLD_STATE_SUBDIR = 'aztec-world-state';
9
11
  const NODE_METADATA_KEY = '@@aztec_node_metadata';
10
12
  /**
11
13
  * Opens the database for the aztec node. If a data directory is specified, then this attempts to create it.
@@ -13,42 +15,50 @@ const NODE_METADATA_KEY = '@@aztec_node_metadata';
13
15
  * @throws If `config.dataDirectory` is set and the directory cannot be created.
14
16
  * @returns The database for the aztec node.
15
17
  */
16
- export async function openDb(config) {
18
+ export async function openDb(config, log) {
17
19
  const nodeMetadata = {
18
20
  rollupContractAddress: config.l1Contracts.rollupAddress.toString(),
19
21
  };
20
- let db;
22
+ let nodeDb;
23
+ let worldStateDb;
21
24
  if (config.dataDirectory) {
22
- const dbDir = join(config.dataDirectory, DB_SUBDIR);
25
+ const nodeDir = join(config.dataDirectory, DB_SUBDIR);
26
+ const worldStateDir = join(config.dataDirectory, WORLD_STATE_SUBDIR);
23
27
  // this throws if we don't have permissions to create the directory
24
- await mkdir(dbDir, { recursive: true });
25
- db = levelup(createLevelDown(dbDir));
28
+ await mkdir(nodeDir, { recursive: true });
29
+ await mkdir(worldStateDir, { recursive: true });
30
+ log(`Opening aztec-node database at ${nodeDir}`);
31
+ nodeDb = open(nodeDir, {});
32
+ log(`Opening world-state database at ${worldStateDir}`);
33
+ worldStateDb = levelup(createLevelDown(worldStateDir));
26
34
  }
27
35
  else {
28
- db = levelup(createMemDown());
36
+ log('Opening temporary databases');
37
+ // not passing a path will use a temp file that gets deleted when the process exits
38
+ nodeDb = open({});
39
+ worldStateDb = levelup(createMemDown());
29
40
  }
30
- const prevNodeMetadata = await getNodeMetadata(db);
31
- // if the rollup addresses are different, wipe the local database and start over
32
- if (nodeMetadata.rollupContractAddress !== prevNodeMetadata.rollupContractAddress) {
33
- await db.clear();
34
- }
35
- await db.put(NODE_METADATA_KEY, JSON.stringify(nodeMetadata));
36
- return db;
41
+ await checkNodeMetadataAndClear(nodeDb, worldStateDb, nodeMetadata, log);
42
+ return [nodeDb, worldStateDb];
37
43
  }
38
44
  /**
39
- * Gets the metadata for the aztec node.
40
- * @param db - The database for the aztec node.
41
- * @returns Node metadata.
45
+ * Checks the node metadata and clears the database if the rollup contract address has changed.
46
+ * @param nodeDb - The database for the aztec node.
47
+ * @param nodeMetadata - The metadata for the aztec node.
42
48
  */
43
- async function getNodeMetadata(db) {
49
+ async function checkNodeMetadataAndClear(nodeDb, worldStateDb, nodeMetadata, log) {
50
+ const metadataDB = nodeDb.openDB('metadata', {});
44
51
  try {
45
- const value = await db.get(NODE_METADATA_KEY);
46
- return JSON.parse(value.toString('utf-8'));
52
+ const existing = metadataDB.get(NODE_METADATA_KEY);
53
+ // if the rollup addresses are different, wipe the local database and start over
54
+ if (!existing || existing.rollupContractAddress !== nodeMetadata.rollupContractAddress) {
55
+ log('Rollup contract address has changed, clearing databases');
56
+ await Promise.all([nodeDb.clearAsync(), worldStateDb.clear()]);
57
+ }
58
+ await metadataDB.put(NODE_METADATA_KEY, nodeMetadata);
47
59
  }
48
- catch {
49
- return {
50
- rollupContractAddress: '',
51
- };
60
+ finally {
61
+ await metadataDB.close();
52
62
  }
53
63
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXp0ZWMtbm9kZS9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWEsT0FBTyxJQUFJLFNBQVMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUM1RCxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUlqQyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUUsT0FBZSxFQUF1QixDQUFDO0FBQzNFLE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUUsU0FBaUIsQ0FBQyxJQUFJLENBQWMsQ0FBQztBQUV2RixNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUM7QUFDL0IsTUFBTSxpQkFBaUIsR0FBRyx1QkFBdUIsQ0FBQztBQVlsRDs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsTUFBTSxDQUFDLE1BQXVCO0lBQ2xELE1BQU0sWUFBWSxHQUFpQjtRQUNqQyxxQkFBcUIsRUFBRSxNQUFNLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUU7S0FDbkUsQ0FBQztJQUVGLElBQUksRUFBVyxDQUFDO0lBRWhCLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRTtRQUN4QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNwRCxtRUFBbUU7UUFDbkUsTUFBTSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDeEMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztLQUN0QztTQUFNO1FBQ0wsRUFBRSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO0tBQy9CO0lBRUQsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLGVBQWUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUVuRCxnRkFBZ0Y7SUFDaEYsSUFBSSxZQUFZLENBQUMscUJBQXFCLEtBQUssZ0JBQWdCLENBQUMscUJBQXFCLEVBQUU7UUFDakYsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7S0FDbEI7SUFFRCxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQzlELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxLQUFLLFVBQVUsZUFBZSxDQUFDLEVBQVc7SUFDeEMsSUFBSTtRQUNGLE1BQU0sS0FBSyxHQUFXLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3RELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7S0FDNUM7SUFBQyxNQUFNO1FBQ04sT0FBTztZQUNMLHFCQUFxQixFQUFFLEVBQUU7U0FDMUIsQ0FBQztLQUNIO0FBQ0gsQ0FBQyJ9
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXp0ZWMtbm9kZS9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQWEsT0FBTyxJQUFJLFNBQVMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUM1RCxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQWdCLElBQUksRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMxQyxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUlqQyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUUsT0FBZSxFQUF1QixDQUFDO0FBQzNFLE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUUsU0FBaUIsQ0FBQyxJQUFJLENBQWMsQ0FBQztBQUV2RixNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUM7QUFDL0IsTUFBTSxrQkFBa0IsR0FBRyxtQkFBbUIsQ0FBQztBQUMvQyxNQUFNLGlCQUFpQixHQUFHLHVCQUF1QixDQUFDO0FBWWxEOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQzFCLE1BQXVCLEVBQ3ZCLEdBQVU7SUFFVixNQUFNLFlBQVksR0FBaUI7UUFDakMscUJBQXFCLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFO0tBQ25FLENBQUM7SUFFRixJQUFJLE1BQW9CLENBQUM7SUFDekIsSUFBSSxZQUFxQixDQUFDO0lBRTFCLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRTtRQUN4QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN0RCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3JFLG1FQUFtRTtRQUNuRSxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxQyxNQUFNLEtBQUssQ0FBQyxhQUFhLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUVoRCxHQUFHLENBQUMsa0NBQWtDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDakQsTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFM0IsR0FBRyxDQUFDLG1DQUFtQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELFlBQVksR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7S0FDeEQ7U0FBTTtRQUNMLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ25DLG1GQUFtRjtRQUNuRixNQUFNLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLFlBQVksR0FBRyxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztLQUN6QztJQUVELE1BQU0seUJBQXlCLENBQUMsTUFBTSxFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDekUsT0FBTyxDQUFDLE1BQU0sRUFBRSxZQUFZLENBQUMsQ0FBQztBQUNoQyxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILEtBQUssVUFBVSx5QkFBeUIsQ0FDdEMsTUFBb0IsRUFDcEIsWUFBcUIsRUFDckIsWUFBMEIsRUFDMUIsR0FBVTtJQUVWLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQXVCLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN2RSxJQUFJO1FBQ0YsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ25ELGdGQUFnRjtRQUNoRixJQUFJLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxxQkFBcUIsS0FBSyxZQUFZLENBQUMscUJBQXFCLEVBQUU7WUFDdEYsR0FBRyxDQUFDLHlEQUF5RCxDQUFDLENBQUM7WUFDL0QsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxFQUFFLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDaEU7UUFDRCxNQUFNLFVBQVUsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsWUFBWSxDQUFDLENBQUM7S0FDdkQ7WUFBUztRQUNSLE1BQU0sVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0tBQzFCO0FBQ0gsQ0FBQyJ9
@@ -3,9 +3,9 @@ import { L1ContractAddresses } from '@aztec/ethereum';
3
3
  import { AztecAddress } from '@aztec/foundation/aztec-address';
4
4
  import { P2P } from '@aztec/p2p';
5
5
  import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
6
- import { AztecNode, ContractData, ContractDataSource, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2MessageAndIndex, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, L2Tx, LogFilter, LogType, MerkleTreeId, SiblingPath, Tx, TxHash } from '@aztec/types';
6
+ import { AztecNode, ContractData, ContractDataSource, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2MessageAndIndex, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, L2Tx, LogFilter, LogType, MerkleTreeId, SequencerConfig, SiblingPath, Tx, TxHash } from '@aztec/types';
7
7
  import { WorldStateSynchronizer } from '@aztec/world-state';
8
- import levelup from 'levelup';
8
+ import { LevelUp } from 'levelup';
9
9
  import { AztecNodeConfig } from './config.js';
10
10
  /**
11
11
  * The aztec node.
@@ -24,9 +24,9 @@ export declare class AztecNodeService implements AztecNode {
24
24
  protected readonly chainId: number;
25
25
  protected readonly version: number;
26
26
  protected readonly globalVariableBuilder: GlobalVariableBuilder;
27
- protected readonly merkleTreesDb: levelup.LevelUp;
27
+ protected readonly merkleTreesDb: LevelUp;
28
28
  private log;
29
- constructor(config: AztecNodeConfig, p2pClient: P2P, blockSource: L2BlockSource, encryptedLogsSource: L2LogsSource, unencryptedLogsSource: L2LogsSource, contractDataSource: ContractDataSource, l1ToL2MessageSource: L1ToL2MessageSource, worldStateSynchronizer: WorldStateSynchronizer, sequencer: SequencerClient | undefined, chainId: number, version: number, globalVariableBuilder: GlobalVariableBuilder, merkleTreesDb: levelup.LevelUp, log?: import("@aztec/foundation/log").DebugLogger);
29
+ constructor(config: AztecNodeConfig, p2pClient: P2P, blockSource: L2BlockSource, encryptedLogsSource: L2LogsSource, unencryptedLogsSource: L2LogsSource, contractDataSource: ContractDataSource, l1ToL2MessageSource: L1ToL2MessageSource, worldStateSynchronizer: WorldStateSynchronizer, sequencer: SequencerClient | undefined, chainId: number, version: number, globalVariableBuilder: GlobalVariableBuilder, merkleTreesDb: LevelUp, log?: import("@aztec/foundation/log").DebugLogger);
30
30
  /**
31
31
  * initializes the Aztec Node, wait for component to sync.
32
32
  * @param config - The configuration to be used by the aztec node.
@@ -182,5 +182,6 @@ export declare class AztecNodeService implements AztecNode {
182
182
  * @param tx - The transaction to simulate.
183
183
  **/
184
184
  simulatePublicCalls(tx: Tx): Promise<void>;
185
+ setConfig(config: Partial<SequencerConfig>): Promise<void>;
185
186
  }
186
187
  //# sourceMappingURL=server.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  var _AztecNodeService_instances, _AztecNodeService_getWorldState, _AztecNodeService_syncWorldState;
2
2
  import { __classPrivateFieldGet } from "tslib";
3
- import { Archiver } from '@aztec/archiver';
3
+ import { Archiver, LMDBArchiverStore } from '@aztec/archiver';
4
4
  import { Fr, GlobalVariables, HistoricBlockData, } from '@aztec/circuits.js';
5
- import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
5
+ import { computeGlobalsHash, computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
6
6
  import { createEthereumChain } from '@aztec/ethereum';
7
7
  import { createDebugLogger } from '@aztec/foundation/log';
8
8
  import { InMemoryTxPool, createP2PClient } from '@aztec/p2p';
@@ -49,25 +49,27 @@ export class AztecNodeService {
49
49
  if (config.chainId !== ethereumChain.chainInfo.id) {
50
50
  throw new Error(`RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.chainId}`);
51
51
  }
52
+ const log = createDebugLogger('aztec:node');
53
+ const [nodeDb, worldStateDb] = await openDb(config, log);
52
54
  // first create and sync the archiver
53
- const archiver = await Archiver.createAndSync(config);
55
+ const archiverStore = new LMDBArchiverStore(nodeDb, config.maxLogs);
56
+ const archiver = await Archiver.createAndSync(config, archiverStore, true);
54
57
  // we identify the P2P transaction protocol by using the rollup contract address.
55
58
  // this may well change in future
56
59
  config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
57
60
  // create the tx pool and the p2p client, which will need the l2 block source
58
61
  const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
59
62
  // now create the merkle trees and the world state synchronizer
60
- const db = await openDb(config);
61
- const merkleTrees = await MerkleTrees.new(db);
63
+ const merkleTrees = await MerkleTrees.new(worldStateDb);
62
64
  const worldStateConfig = getWorldStateConfig();
63
- const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(db, merkleTrees, archiver, worldStateConfig);
65
+ const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(worldStateDb, merkleTrees, archiver, worldStateConfig);
64
66
  // start both and wait for them to sync from the block source
65
67
  await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
66
68
  // now create the sequencer
67
69
  const sequencer = config.disableSequencer
68
70
  ? undefined
69
71
  : await SequencerClient.new(config, p2pClient, worldStateSynchronizer, archiver, archiver, archiver);
70
- return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version, getGlobalVariableBuilder(config), db);
72
+ return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version, getGlobalVariableBuilder(config), worldStateDb, log);
71
73
  }
72
74
  /**
73
75
  * Returns the sequencer client instance.
@@ -312,8 +314,9 @@ export class AztecNodeService {
312
314
  // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
313
315
  // So simulation of public functions doesn't affect the merkle trees.
314
316
  const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
317
+ const globalVariablesHash = computeGlobalsHash(prevGlobalVariables);
315
318
  await merkleTrees.init({
316
- globalVariables: prevGlobalVariables,
319
+ globalVariablesHash,
317
320
  });
318
321
  const publicProcessorFactory = new PublicProcessorFactory(merkleTrees.asLatest(), this.contractDataSource, this.l1ToL2MessageSource);
319
322
  const processor = await publicProcessorFactory.create(prevGlobalVariables, newGlobalVariables);
@@ -323,6 +326,10 @@ export class AztecNodeService {
323
326
  }
324
327
  this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
325
328
  }
329
+ setConfig(config) {
330
+ this.sequencer?.updateSequencerConfig(config);
331
+ return Promise.resolve();
332
+ }
326
333
  }
327
334
  _AztecNodeService_instances = new WeakSet(), _AztecNodeService_getWorldState =
328
335
  /**
@@ -347,4 +354,4 @@ async function _AztecNodeService_syncWorldState() {
347
354
  const blockSourceHeight = await this.blockSource.getBlockNumber();
348
355
  await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
349
356
  };
350
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
357
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAEL,EAAE,EACF,eAAe,EACf,iBAAiB,GAGlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAuB,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAO,eAAe,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAEL,sBAAsB,EACtB,eAAe,EACf,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAML,qBAAqB,EAQrB,OAAO,EACP,YAAY,GAKb,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,WAAW,EACX,4BAA4B,EAG5B,gBAAgB,IAAI,mBAAmB,GACxC,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B,YACqB,MAAuB,EACvB,SAAc,EACd,WAA0B,EAC1B,mBAAiC,EACjC,qBAAmC,EACnC,kBAAsC,EACtC,mBAAwC,EACxC,sBAA8C,EAC9C,SAAsC,EACtC,OAAe,EACf,OAAe,EACf,qBAA4C,EAC5C,aAAsB,EACjC,MAAM,iBAAiB,CAAC,YAAY,CAAC;;QAb1B,WAAM,GAAN,MAAM,CAAiB;QACvB,cAAS,GAAT,SAAS,CAAK;QACd,gBAAW,GAAX,WAAW,CAAe;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAc;QACjC,0BAAqB,GAArB,qBAAqB,CAAc;QACnC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,cAAS,GAAT,SAAS,CAA6B;QACtC,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAQ;QACf,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAS;QACjC,QAAG,GAAH,GAAG,CAAkC;QAE7C,MAAM,OAAO,GACX,sCAAsC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,sBAAsB;YAChF,WAAW,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI;YAC1D,aAAa,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI;YAC9D,UAAU,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI;YACxD,WAAW,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI;YAC1D,qBAAqB,MAAM,CAAC,WAAW,CAAC,gCAAgC,CAAC,QAAQ,EAAE,EAAE,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,MAAuB;QACvD,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACxE,2EAA2E;QAC3E,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE;YACjD,MAAM,IAAI,KAAK,CACb,mCAAmC,aAAa,CAAC,SAAS,CAAC,EAAE,oBAAoB,MAAM,CAAC,OAAO,EAAE,CAClG,CAAC;SACH;QAED,MAAM,GAAG,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAEzD,qCAAqC;QACrC,MAAM,aAAa,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAE3E,iFAAiF;QACjF,iCAAiC;QACjC,MAAM,CAAC,mBAAmB,GAAG,aAAa,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;QAExF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,IAAI,cAAc,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEhF,+DAA+D;QAC/D,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,gBAAgB,GAAqB,mBAAmB,EAAE,CAAC;QACjE,MAAM,sBAAsB,GAAG,MAAM,4BAA4B,CAAC,GAAG,CACnE,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,gBAAgB,CACjB,CAAC;QAEF,6DAA6D;QAC7D,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEvE,2BAA2B;QAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB;YACvC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,sBAAsB,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEvG,OAAO,IAAI,gBAAgB,CACzB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,sBAAsB,EACtB,SAAS,EACT,aAAa,CAAC,SAAS,CAAC,EAAE,EAC1B,MAAM,CAAC,OAAO,EACd,wBAAwB,CAAC,MAAM,CAAC,EAChC,YAAY,EACZ,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,sBAAsB;QAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,OAAO;QAClB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,KAAK,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,KAAa;QAChD,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,cAAc;QACzB,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,UAAU;QACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED;;;OAGG;IACI,UAAU;QACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,uBAAuB,CAAC,eAA6B;QACzD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAChF,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,eAAe,CAAC,eAA6B;QACxD,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IACxE,CAAC;IAED;;;;;;OAMG;IACI,OAAO,CAAC,IAAY,EAAE,KAAa,EAAE,OAAgB;QAC1D,MAAM,SAAS,GAAG,OAAO,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;QACxG,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,MAAiB;QAClC,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,EAAM;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,SAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,aAAa;QACxB,OAAO,MAAM,IAAI,CAAC,SAAU,CAAC,MAAM,EAAE,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,kBAAkB,CAAC,MAAc;QAC5C,OAAO,MAAM,IAAI,CAAC,SAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,aAAa,CAAC,MAAoB,EAAE,SAAa;QAC5D,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,OAAO,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QACnD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QACnD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CAAC,UAAc;QAClD,qCAAqC;QACrC,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAE,CAAC;QAC3F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;QACrF,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,2BAA2B,CAAC,SAAiB;QACxD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,kBAAkB,CAAC,QAAsB,EAAE,IAAQ;QAC9D,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7F,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,MAAM,WAAW,GAAG,KAAK,EAAE,EAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAExG,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,cAAc,CAAC,GAC/F,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC;YACxC,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC;YACxC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;YACvC,WAAW,CAAC,YAAY,CAAC,sBAAsB,CAAC;YAChD,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC;YACrC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC;SAC3C,CAAC,CAAC;QAEL,OAAO;YACL,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY;YAC1C,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,YAAY;YAC3C,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,aAAa;YAC5C,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,cAAc;YAC/C,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE,kBAAkB;YACzD,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,UAAU;SACvC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,oBAAoB;QAC/B,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,CAAiB,CAAC;QAChD,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,WAAW,CAAC,4BAA4B,EAAE,CAAC,CAAC,CAAC;QAElH,OAAO,IAAI,iBAAiB,CAC1B,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAClC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAClC,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,EACjC,KAAK,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAC1C,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,EAC/B,EAAE,CAAC,IAAI,EACP,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,EACpC,WAAW,CACZ,CAAC;IACJ,CAAC;IAED;;;QAGI;IACG,KAAK,CAAC,mBAAmB,CAAC,EAAM;QACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QACtG,MAAM,mBAAmB,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;QAE9G,sFAAsF;QACtF,0GAA0G;QAC1G,qEAAqE;QACrE,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QACpE,MAAM,WAAW,CAAC,IAAI,CAAC;YACrB,mBAAmB;SACpB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CACvD,WAAW,CAAC,QAAQ,EAAE,EACtB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;QAC/F,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpD,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC1B;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,MAAM,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACjE,CAAC;IAEM,SAAS,CAAC,MAAgC;QAC/C,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CAwBF;;AAtBC;;;GAGG;AACH,KAAK;IACH,IAAI;QACF,+CAA+C;QAC/C,MAAM,uBAAA,IAAI,qEAAgB,MAApB,IAAI,CAAkB,CAAC;KAC9B;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,KAAK;IACH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IAClE,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACrE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec-node",
3
- "version": "0.15.1",
3
+ "version": "0.16.1",
4
4
  "main": "dest/index.js",
5
5
  "type": "module",
6
6
  "exports": "./dest/index.js",
@@ -33,19 +33,20 @@
33
33
  "rootDir": "./src"
34
34
  },
35
35
  "dependencies": {
36
- "@aztec/archiver": "0.15.1",
37
- "@aztec/circuits.js": "0.15.1",
38
- "@aztec/ethereum": "0.15.1",
39
- "@aztec/foundation": "0.15.1",
40
- "@aztec/l1-artifacts": "0.15.1",
41
- "@aztec/merkle-tree": "0.15.1",
42
- "@aztec/p2p": "0.15.1",
43
- "@aztec/sequencer-client": "0.15.1",
44
- "@aztec/types": "0.15.1",
45
- "@aztec/world-state": "0.15.1",
36
+ "@aztec/archiver": "0.16.1",
37
+ "@aztec/circuits.js": "0.16.1",
38
+ "@aztec/ethereum": "0.16.1",
39
+ "@aztec/foundation": "0.16.1",
40
+ "@aztec/l1-artifacts": "0.16.1",
41
+ "@aztec/merkle-tree": "0.16.1",
42
+ "@aztec/p2p": "0.16.1",
43
+ "@aztec/sequencer-client": "0.16.1",
44
+ "@aztec/types": "0.16.1",
45
+ "@aztec/world-state": "0.16.1",
46
46
  "koa": "^2.14.2",
47
47
  "koa-router": "^12.0.0",
48
48
  "levelup": "^5.1.1",
49
+ "lmdb": "^2.9.1",
49
50
  "memdown": "^6.1.1",
50
51
  "tslib": "^2.4.0"
51
52
  },
@@ -1,5 +1,8 @@
1
+ import { LogFn } from '@aztec/foundation/log';
2
+
1
3
  import { LevelDown, default as leveldown } from 'leveldown';
2
4
  import { LevelUp, default as levelup } from 'levelup';
5
+ import { RootDatabase, open } from 'lmdb';
3
6
  import { MemDown, default as memdown } from 'memdown';
4
7
  import { mkdir } from 'node:fs/promises';
5
8
  import { join } from 'node:path';
@@ -10,6 +13,7 @@ export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
10
13
  export const createLevelDown = (path: string) => (leveldown as any)(path) as LevelDown;
11
14
 
12
15
  const DB_SUBDIR = 'aztec-node';
16
+ const WORLD_STATE_SUBDIR = 'aztec-world-state';
13
17
  const NODE_METADATA_KEY = '@@aztec_node_metadata';
14
18
 
15
19
  /**
@@ -28,45 +32,61 @@ type NodeMetadata = {
28
32
  * @throws If `config.dataDirectory` is set and the directory cannot be created.
29
33
  * @returns The database for the aztec node.
30
34
  */
31
- export async function openDb(config: AztecNodeConfig): Promise<LevelUp> {
35
+ export async function openDb(
36
+ config: AztecNodeConfig,
37
+ log: LogFn,
38
+ ): Promise<[nodeDb: RootDatabase, worldStateDb: LevelUp]> {
32
39
  const nodeMetadata: NodeMetadata = {
33
40
  rollupContractAddress: config.l1Contracts.rollupAddress.toString(),
34
41
  };
35
42
 
36
- let db: LevelUp;
43
+ let nodeDb: RootDatabase;
44
+ let worldStateDb: LevelUp;
37
45
 
38
46
  if (config.dataDirectory) {
39
- const dbDir = join(config.dataDirectory, DB_SUBDIR);
47
+ const nodeDir = join(config.dataDirectory, DB_SUBDIR);
48
+ const worldStateDir = join(config.dataDirectory, WORLD_STATE_SUBDIR);
40
49
  // this throws if we don't have permissions to create the directory
41
- await mkdir(dbDir, { recursive: true });
42
- db = levelup(createLevelDown(dbDir));
43
- } else {
44
- db = levelup(createMemDown());
45
- }
50
+ await mkdir(nodeDir, { recursive: true });
51
+ await mkdir(worldStateDir, { recursive: true });
46
52
 
47
- const prevNodeMetadata = await getNodeMetadata(db);
53
+ log(`Opening aztec-node database at ${nodeDir}`);
54
+ nodeDb = open(nodeDir, {});
48
55
 
49
- // if the rollup addresses are different, wipe the local database and start over
50
- if (nodeMetadata.rollupContractAddress !== prevNodeMetadata.rollupContractAddress) {
51
- await db.clear();
56
+ log(`Opening world-state database at ${worldStateDir}`);
57
+ worldStateDb = levelup(createLevelDown(worldStateDir));
58
+ } else {
59
+ log('Opening temporary databases');
60
+ // not passing a path will use a temp file that gets deleted when the process exits
61
+ nodeDb = open({});
62
+ worldStateDb = levelup(createMemDown());
52
63
  }
53
64
 
54
- await db.put(NODE_METADATA_KEY, JSON.stringify(nodeMetadata));
55
- return db;
65
+ await checkNodeMetadataAndClear(nodeDb, worldStateDb, nodeMetadata, log);
66
+ return [nodeDb, worldStateDb];
56
67
  }
57
68
 
58
69
  /**
59
- * Gets the metadata for the aztec node.
60
- * @param db - The database for the aztec node.
61
- * @returns Node metadata.
70
+ * Checks the node metadata and clears the database if the rollup contract address has changed.
71
+ * @param nodeDb - The database for the aztec node.
72
+ * @param nodeMetadata - The metadata for the aztec node.
62
73
  */
63
- async function getNodeMetadata(db: LevelUp): Promise<NodeMetadata> {
74
+ async function checkNodeMetadataAndClear(
75
+ nodeDb: RootDatabase,
76
+ worldStateDb: LevelUp,
77
+ nodeMetadata: NodeMetadata,
78
+ log: LogFn,
79
+ ): Promise<void> {
80
+ const metadataDB = nodeDb.openDB<NodeMetadata, string>('metadata', {});
64
81
  try {
65
- const value: Buffer = await db.get(NODE_METADATA_KEY);
66
- return JSON.parse(value.toString('utf-8'));
67
- } catch {
68
- return {
69
- rollupContractAddress: '',
70
- };
82
+ const existing = metadataDB.get(NODE_METADATA_KEY);
83
+ // if the rollup addresses are different, wipe the local database and start over
84
+ if (!existing || existing.rollupContractAddress !== nodeMetadata.rollupContractAddress) {
85
+ log('Rollup contract address has changed, clearing databases');
86
+ await Promise.all([nodeDb.clearAsync(), worldStateDb.clear()]);
87
+ }
88
+ await metadataDB.put(NODE_METADATA_KEY, nodeMetadata);
89
+ } finally {
90
+ await metadataDB.close();
71
91
  }
72
92
  }
@@ -1,4 +1,4 @@
1
- import { Archiver } from '@aztec/archiver';
1
+ import { Archiver, LMDBArchiverStore } from '@aztec/archiver';
2
2
  import {
3
3
  CONTRACT_TREE_HEIGHT,
4
4
  Fr,
@@ -7,7 +7,7 @@ import {
7
7
  L1_TO_L2_MSG_TREE_HEIGHT,
8
8
  NOTE_HASH_TREE_HEIGHT,
9
9
  } from '@aztec/circuits.js';
10
- import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
10
+ import { computeGlobalsHash, computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
11
11
  import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
12
12
  import { AztecAddress } from '@aztec/foundation/aztec-address';
13
13
  import { createDebugLogger } from '@aztec/foundation/log';
@@ -34,6 +34,7 @@ import {
34
34
  LogFilter,
35
35
  LogType,
36
36
  MerkleTreeId,
37
+ SequencerConfig,
37
38
  SiblingPath,
38
39
  Tx,
39
40
  TxHash,
@@ -46,7 +47,7 @@ import {
46
47
  getConfigEnvVars as getWorldStateConfig,
47
48
  } from '@aztec/world-state';
48
49
 
49
- import levelup from 'levelup';
50
+ import { LevelUp } from 'levelup';
50
51
 
51
52
  import { AztecNodeConfig } from './config.js';
52
53
  import { openDb } from './db.js';
@@ -68,7 +69,7 @@ export class AztecNodeService implements AztecNode {
68
69
  protected readonly chainId: number,
69
70
  protected readonly version: number,
70
71
  protected readonly globalVariableBuilder: GlobalVariableBuilder,
71
- protected readonly merkleTreesDb: levelup.LevelUp,
72
+ protected readonly merkleTreesDb: LevelUp,
72
73
  private log = createDebugLogger('aztec:node'),
73
74
  ) {
74
75
  const message =
@@ -94,8 +95,13 @@ export class AztecNodeService implements AztecNode {
94
95
  `RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.chainId}`,
95
96
  );
96
97
  }
98
+
99
+ const log = createDebugLogger('aztec:node');
100
+ const [nodeDb, worldStateDb] = await openDb(config, log);
101
+
97
102
  // first create and sync the archiver
98
- const archiver = await Archiver.createAndSync(config);
103
+ const archiverStore = new LMDBArchiverStore(nodeDb, config.maxLogs);
104
+ const archiver = await Archiver.createAndSync(config, archiverStore, true);
99
105
 
100
106
  // we identify the P2P transaction protocol by using the rollup contract address.
101
107
  // this may well change in future
@@ -105,10 +111,14 @@ export class AztecNodeService implements AztecNode {
105
111
  const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
106
112
 
107
113
  // now create the merkle trees and the world state synchronizer
108
- const db = await openDb(config);
109
- const merkleTrees = await MerkleTrees.new(db);
114
+ const merkleTrees = await MerkleTrees.new(worldStateDb);
110
115
  const worldStateConfig: WorldStateConfig = getWorldStateConfig();
111
- const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(db, merkleTrees, archiver, worldStateConfig);
116
+ const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(
117
+ worldStateDb,
118
+ merkleTrees,
119
+ archiver,
120
+ worldStateConfig,
121
+ );
112
122
 
113
123
  // start both and wait for them to sync from the block source
114
124
  await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
@@ -131,7 +141,8 @@ export class AztecNodeService implements AztecNode {
131
141
  ethereumChain.chainInfo.id,
132
142
  config.version,
133
143
  getGlobalVariableBuilder(config),
134
- db,
144
+ worldStateDb,
145
+ log,
135
146
  );
136
147
  }
137
148
 
@@ -417,8 +428,9 @@ export class AztecNodeService implements AztecNode {
417
428
  // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
418
429
  // So simulation of public functions doesn't affect the merkle trees.
419
430
  const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
431
+ const globalVariablesHash = computeGlobalsHash(prevGlobalVariables);
420
432
  await merkleTrees.init({
421
- globalVariables: prevGlobalVariables,
433
+ globalVariablesHash,
422
434
  });
423
435
 
424
436
  const publicProcessorFactory = new PublicProcessorFactory(
@@ -434,6 +446,11 @@ export class AztecNodeService implements AztecNode {
434
446
  this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
435
447
  }
436
448
 
449
+ public setConfig(config: Partial<SequencerConfig>): Promise<void> {
450
+ this.sequencer?.updateSequencerConfig(config);
451
+ return Promise.resolve();
452
+ }
453
+
437
454
  /**
438
455
  * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
439
456
  * @returns An instance of a committed MerkleTreeOperations
@@ -0,0 +1,16 @@
1
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
2
+ import { RootDatabaseOptionsWithPath } from 'lmdb';
3
+
4
+ // The problem is this snippet `nodeDb = open({});` in src/aztec-node/db.ts
5
+ // tsc compiles this code fine, but ts-jest can't.
6
+ // This is a mixture for two bugs:
7
+ // - the first in ts-jest, it gets confused by packages with mixed CJS and ESM type exports - https://github.com/kulshekhar/ts-jest/issues/4221
8
+ // - the second in lmdb, it outputs different CJS and ESM types - https://github.com/kriszyp/lmdb-js/issues/243#issuecomment-1823585586
9
+
10
+ declare module 'lmdb' {
11
+ /* eslint-disable jsdoc/require-jsdoc */
12
+ interface RootDatabaseOptionsWithPath {
13
+ path?: string;
14
+ }
15
+ /* eslint-enable jsdoc/require-jsdoc */
16
+ }