@aztec/aztec-node 0.16.3 → 0.16.5
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/aztec-node/db.js +3 -3
- package/dest/aztec-node/server.d.ts +2 -2
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +7 -7
- package/dest/bin/index.d.ts +1 -7
- package/dest/bin/index.d.ts.map +1 -1
- package/dest/bin/index.js +1 -17
- package/package.json +11 -11
- package/src/aztec-node/config.ts +0 -31
- package/src/aztec-node/db.ts +0 -92
- package/src/aztec-node/http_rpc_server.ts +0 -51
- package/src/aztec-node/server.ts +0 -624
- package/src/bin/index.ts +0 -67
- package/src/declaration.d.ts +0 -16
- package/src/index.ts +0 -3
package/dest/aztec-node/db.js
CHANGED
|
@@ -6,8 +6,8 @@ import { mkdir } from 'node:fs/promises';
|
|
|
6
6
|
import { join } from 'node:path';
|
|
7
7
|
export const createMemDown = () => memdown();
|
|
8
8
|
export const createLevelDown = (path) => leveldown(path);
|
|
9
|
-
const DB_SUBDIR = 'aztec-node';
|
|
10
|
-
const WORLD_STATE_SUBDIR = 'aztec-world-state';
|
|
9
|
+
const DB_SUBDIR = 'aztec-node-db';
|
|
10
|
+
const WORLD_STATE_SUBDIR = 'aztec-world-state-db';
|
|
11
11
|
const NODE_METADATA_KEY = '@@aztec_node_metadata';
|
|
12
12
|
/**
|
|
13
13
|
* Opens the database for the aztec node. If a data directory is specified, then this attempts to create it.
|
|
@@ -61,4 +61,4 @@ async function checkNodeMetadataAndClear(nodeDb, worldStateDb, nodeMetadata, log
|
|
|
61
61
|
await metadataDB.close();
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXp0ZWMtbm9kZS9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQWEsT0FBTyxJQUFJLFNBQVMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUM1RCxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQWdCLElBQUksRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMxQyxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0RCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUlqQyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUUsT0FBZSxFQUF1QixDQUFDO0FBQzNFLE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUUsU0FBaUIsQ0FBQyxJQUFJLENBQWMsQ0FBQztBQUV2RixNQUFNLFNBQVMsR0FBRyxlQUFlLENBQUM7QUFDbEMsTUFBTSxrQkFBa0IsR0FBRyxzQkFBc0IsQ0FBQztBQUNsRCxNQUFNLGlCQUFpQixHQUFHLHVCQUF1QixDQUFDO0FBWWxEOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxNQUFNLENBQzFCLE1BQXVCLEVBQ3ZCLEdBQVU7SUFFVixNQUFNLFlBQVksR0FBaUI7UUFDakMscUJBQXFCLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFO0tBQ25FLENBQUM7SUFFRixJQUFJLE1BQW9CLENBQUM7SUFDekIsSUFBSSxZQUFxQixDQUFDO0lBRTFCLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRTtRQUN4QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN0RCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3JFLG1FQUFtRTtRQUNuRSxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxQyxNQUFNLEtBQUssQ0FBQyxhQUFhLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUVoRCxHQUFHLENBQUMsa0NBQWtDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDakQsTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFM0IsR0FBRyxDQUFDLG1DQUFtQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELFlBQVksR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7S0FDeEQ7U0FBTTtRQUNMLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ25DLG1GQUFtRjtRQUNuRixNQUFNLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLFlBQVksR0FBRyxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztLQUN6QztJQUVELE1BQU0seUJBQXlCLENBQUMsTUFBTSxFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDekUsT0FBTyxDQUFDLE1BQU0sRUFBRSxZQUFZLENBQUMsQ0FBQztBQUNoQyxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILEtBQUssVUFBVSx5QkFBeUIsQ0FDdEMsTUFBb0IsRUFDcEIsWUFBcUIsRUFDckIsWUFBMEIsRUFDMUIsR0FBVTtJQUVWLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQXVCLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN2RSxJQUFJO1FBQ0YsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ25ELGdGQUFnRjtRQUNoRixJQUFJLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxxQkFBcUIsS0FBSyxZQUFZLENBQUMscUJBQXFCLEVBQUU7WUFDdEYsR0FBRyxDQUFDLHlEQUF5RCxDQUFDLENBQUM7WUFDL0QsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxFQUFFLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDaEU7UUFDRCxNQUFNLFVBQVUsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsWUFBWSxDQUFDLENBQUM7S0FDdkQ7WUFBUztRQUNSLE1BQU0sVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0tBQzFCO0FBQ0gsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ARCHIVE_HEIGHT, BlockHeader, CONTRACT_TREE_HEIGHT, Fr, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
2
2
|
import { L1ContractAddresses } from '@aztec/ethereum';
|
|
3
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
4
|
import { P2P } from '@aztec/p2p';
|
|
@@ -173,7 +173,7 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
173
173
|
* @param leafIndex - Index of the leaf in the tree.
|
|
174
174
|
* @returns The sibling path.
|
|
175
175
|
*/
|
|
176
|
-
|
|
176
|
+
getArchiveSiblingPath(blockNumber: number | 'latest', leafIndex: bigint): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>>;
|
|
177
177
|
/**
|
|
178
178
|
* Returns a sibling path for a leaf in the committed public data tree.
|
|
179
179
|
* @param blockNumber - The block number at which to get the data.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AACA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -272,9 +272,9 @@ export class AztecNodeService {
|
|
|
272
272
|
* @param leafIndex - Index of the leaf in the tree.
|
|
273
273
|
* @returns The sibling path.
|
|
274
274
|
*/
|
|
275
|
-
async
|
|
275
|
+
async getArchiveSiblingPath(blockNumber, leafIndex) {
|
|
276
276
|
const committedDb = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, blockNumber);
|
|
277
|
-
return committedDb.getSiblingPath(MerkleTreeId.
|
|
277
|
+
return committedDb.getSiblingPath(MerkleTreeId.ARCHIVE, leafIndex);
|
|
278
278
|
}
|
|
279
279
|
/**
|
|
280
280
|
* Returns a sibling path for a leaf in the committed public data tree.
|
|
@@ -357,12 +357,12 @@ export class AztecNodeService {
|
|
|
357
357
|
async getTreeRoots() {
|
|
358
358
|
const committedDb = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, 'latest');
|
|
359
359
|
const getTreeRoot = async (id) => Fr.fromBuffer((await committedDb.getTreeInfo(id)).root);
|
|
360
|
-
const [noteHashTree, nullifierTree, contractTree, l1ToL2MessagesTree,
|
|
360
|
+
const [noteHashTree, nullifierTree, contractTree, l1ToL2MessagesTree, archive, publicDataTree] = await Promise.all([
|
|
361
361
|
getTreeRoot(MerkleTreeId.NOTE_HASH_TREE),
|
|
362
362
|
getTreeRoot(MerkleTreeId.NULLIFIER_TREE),
|
|
363
363
|
getTreeRoot(MerkleTreeId.CONTRACT_TREE),
|
|
364
364
|
getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
|
|
365
|
-
getTreeRoot(MerkleTreeId.
|
|
365
|
+
getTreeRoot(MerkleTreeId.ARCHIVE),
|
|
366
366
|
getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE),
|
|
367
367
|
]);
|
|
368
368
|
return {
|
|
@@ -371,7 +371,7 @@ export class AztecNodeService {
|
|
|
371
371
|
[MerkleTreeId.NULLIFIER_TREE]: nullifierTree,
|
|
372
372
|
[MerkleTreeId.PUBLIC_DATA_TREE]: publicDataTree,
|
|
373
373
|
[MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: l1ToL2MessagesTree,
|
|
374
|
-
[MerkleTreeId.
|
|
374
|
+
[MerkleTreeId.ARCHIVE]: archive,
|
|
375
375
|
};
|
|
376
376
|
}
|
|
377
377
|
/**
|
|
@@ -381,7 +381,7 @@ export class AztecNodeService {
|
|
|
381
381
|
async getBlockHeader() {
|
|
382
382
|
const committedDb = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, 'latest');
|
|
383
383
|
const [roots, globalsHash] = await Promise.all([this.getTreeRoots(), committedDb.getLatestGlobalVariablesHash()]);
|
|
384
|
-
return new BlockHeader(roots[MerkleTreeId.NOTE_HASH_TREE], roots[MerkleTreeId.NULLIFIER_TREE], roots[MerkleTreeId.CONTRACT_TREE], roots[MerkleTreeId.L1_TO_L2_MESSAGES_TREE], roots[MerkleTreeId.
|
|
384
|
+
return new BlockHeader(roots[MerkleTreeId.NOTE_HASH_TREE], roots[MerkleTreeId.NULLIFIER_TREE], roots[MerkleTreeId.CONTRACT_TREE], roots[MerkleTreeId.L1_TO_L2_MESSAGES_TREE], roots[MerkleTreeId.ARCHIVE], Fr.ZERO, roots[MerkleTreeId.PUBLIC_DATA_TREE], globalsHash);
|
|
385
385
|
}
|
|
386
386
|
/**
|
|
387
387
|
* Simulates the public part of a transaction with the current state.
|
|
@@ -452,4 +452,4 @@ async function _AztecNodeService_syncWorldState() {
|
|
|
452
452
|
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
453
453
|
return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
|
|
454
454
|
};
|
|
455
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
455
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
package/dest/bin/index.d.ts
CHANGED
|
@@ -1,9 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Creates a router for helper API endpoints of the Private eXecution Environment (PXE).
|
|
5
|
-
* @param apiPrefix - The prefix to use for all api requests
|
|
6
|
-
* @returns - The router for handling status requests.
|
|
7
|
-
*/
|
|
8
|
-
export declare function createStatusRouter(apiPrefix: string): Router<any, {}>;
|
|
2
|
+
export {};
|
|
9
3
|
//# sourceMappingURL=index.d.ts.map
|
package/dest/bin/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":""}
|
package/dest/bin/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
2
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
3
|
import http from 'http';
|
|
4
|
-
import Router from 'koa-router';
|
|
5
4
|
import { AztecNodeService, createAztecNodeRpcServer, getConfigEnvVars } from '../index.js';
|
|
6
5
|
const { AZTEC_NODE_PORT = 8081, API_PREFIX = '' } = process.env;
|
|
7
6
|
const logger = createDebugLogger('aztec:node');
|
|
@@ -12,18 +11,6 @@ async function createAndDeployAztecNode() {
|
|
|
12
11
|
const aztecNodeConfig = { ...getConfigEnvVars() };
|
|
13
12
|
return await AztecNodeService.createAndSync(aztecNodeConfig);
|
|
14
13
|
}
|
|
15
|
-
/**
|
|
16
|
-
* Creates a router for helper API endpoints of the Private eXecution Environment (PXE).
|
|
17
|
-
* @param apiPrefix - The prefix to use for all api requests
|
|
18
|
-
* @returns - The router for handling status requests.
|
|
19
|
-
*/
|
|
20
|
-
export function createStatusRouter(apiPrefix) {
|
|
21
|
-
const router = new Router({ prefix: `${apiPrefix}` });
|
|
22
|
-
router.get('/status', (ctx) => {
|
|
23
|
-
ctx.status = 200;
|
|
24
|
-
});
|
|
25
|
-
return router;
|
|
26
|
-
}
|
|
27
14
|
/**
|
|
28
15
|
* Create and start a new Aztec Node HTTP Server
|
|
29
16
|
*/
|
|
@@ -39,9 +26,6 @@ async function main() {
|
|
|
39
26
|
process.once('SIGTERM', shutdown);
|
|
40
27
|
const rpcServer = createAztecNodeRpcServer(aztecNode);
|
|
41
28
|
const app = rpcServer.getApp(API_PREFIX);
|
|
42
|
-
const apiRouter = createStatusRouter(API_PREFIX);
|
|
43
|
-
app.use(apiRouter.routes());
|
|
44
|
-
app.use(apiRouter.allowedMethods());
|
|
45
29
|
const httpServer = http.createServer(app.callback());
|
|
46
30
|
httpServer.listen(+AZTEC_NODE_PORT);
|
|
47
31
|
logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
|
|
@@ -50,4 +34,4 @@ main().catch(err => {
|
|
|
50
34
|
logger.error(err);
|
|
51
35
|
process.exit(1);
|
|
52
36
|
});
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUxRCxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFFeEIsT0FBTyxFQUFtQixnQkFBZ0IsRUFBRSx3QkFBd0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU1RyxNQUFNLEVBQUUsZUFBZSxHQUFHLElBQUksRUFBRSxVQUFVLEdBQUcsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztBQUVoRSxNQUFNLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUUvQzs7R0FFRztBQUNILEtBQUssVUFBVSx3QkFBd0I7SUFDckMsTUFBTSxlQUFlLEdBQW9CLEVBQUUsR0FBRyxnQkFBZ0IsRUFBRSxFQUFFLENBQUM7SUFFbkUsT0FBTyxNQUFNLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUMvRCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxLQUFLLFVBQVUsSUFBSTtJQUNqQixNQUFNLENBQUMsSUFBSSxDQUFDLDBCQUEwQixDQUFDLENBQUM7SUFFeEMsTUFBTSxTQUFTLEdBQUcsTUFBTSx3QkFBd0IsRUFBRSxDQUFDO0lBRW5ELE1BQU0sUUFBUSxHQUFHLEtBQUssSUFBSSxFQUFFO1FBQzFCLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNoQyxNQUFNLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN2QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xCLENBQUMsQ0FBQztJQUVGLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBRWxDLE1BQU0sU0FBUyxHQUFHLHdCQUF3QixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sR0FBRyxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFekMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNyRCxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDcEMsTUFBTSxDQUFDLElBQUksQ0FBQyxnREFBZ0QsZUFBZSxFQUFFLENBQUMsQ0FBQztBQUNqRixDQUFDO0FBRUQsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO0lBQ2pCLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.5",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": "./dest/index.js",
|
|
@@ -33,16 +33,16 @@
|
|
|
33
33
|
"rootDir": "./src"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@aztec/archiver": "0.16.
|
|
37
|
-
"@aztec/circuits.js": "0.16.
|
|
38
|
-
"@aztec/ethereum": "0.16.
|
|
39
|
-
"@aztec/foundation": "0.16.
|
|
40
|
-
"@aztec/l1-artifacts": "0.16.
|
|
41
|
-
"@aztec/merkle-tree": "0.16.
|
|
42
|
-
"@aztec/p2p": "0.16.
|
|
43
|
-
"@aztec/sequencer-client": "0.16.
|
|
44
|
-
"@aztec/types": "0.16.
|
|
45
|
-
"@aztec/world-state": "0.16.
|
|
36
|
+
"@aztec/archiver": "0.16.5",
|
|
37
|
+
"@aztec/circuits.js": "0.16.5",
|
|
38
|
+
"@aztec/ethereum": "0.16.5",
|
|
39
|
+
"@aztec/foundation": "0.16.5",
|
|
40
|
+
"@aztec/l1-artifacts": "0.16.5",
|
|
41
|
+
"@aztec/merkle-tree": "0.16.5",
|
|
42
|
+
"@aztec/p2p": "0.16.5",
|
|
43
|
+
"@aztec/sequencer-client": "0.16.5",
|
|
44
|
+
"@aztec/types": "0.16.5",
|
|
45
|
+
"@aztec/world-state": "0.16.5",
|
|
46
46
|
"koa": "^2.14.2",
|
|
47
47
|
"koa-router": "^12.0.0",
|
|
48
48
|
"levelup": "^5.1.1",
|
package/src/aztec-node/config.ts
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { ArchiverConfig, getConfigEnvVars as getArchiverVars } from '@aztec/archiver';
|
|
2
|
-
import { P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p';
|
|
3
|
-
import { SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client';
|
|
4
|
-
import { getConfigEnvVars as getWorldStateVars } from '@aztec/world-state';
|
|
5
|
-
|
|
6
|
-
/**
|
|
7
|
-
* The configuration the aztec node.
|
|
8
|
-
*/
|
|
9
|
-
export type AztecNodeConfig = ArchiverConfig &
|
|
10
|
-
SequencerClientConfig &
|
|
11
|
-
P2PConfig & {
|
|
12
|
-
/** Whether the sequencer is disabled for this node. */
|
|
13
|
-
disableSequencer: boolean;
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
/**
|
|
17
|
-
* Returns the config of the aztec node from environment variables with reasonable defaults.
|
|
18
|
-
* @returns A valid aztec node config.
|
|
19
|
-
*/
|
|
20
|
-
export function getConfigEnvVars(): AztecNodeConfig {
|
|
21
|
-
const { SEQ_DISABLED } = process.env;
|
|
22
|
-
const allEnvVars: AztecNodeConfig = {
|
|
23
|
-
...getSequencerVars(),
|
|
24
|
-
...getArchiverVars(),
|
|
25
|
-
...getP2PConfigEnvVars(),
|
|
26
|
-
...getWorldStateVars(),
|
|
27
|
-
disableSequencer: !!SEQ_DISABLED,
|
|
28
|
-
};
|
|
29
|
-
|
|
30
|
-
return allEnvVars;
|
|
31
|
-
}
|
package/src/aztec-node/db.ts
DELETED
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
import { LogFn } from '@aztec/foundation/log';
|
|
2
|
-
|
|
3
|
-
import { LevelDown, default as leveldown } from 'leveldown';
|
|
4
|
-
import { LevelUp, default as levelup } from 'levelup';
|
|
5
|
-
import { RootDatabase, open } from 'lmdb';
|
|
6
|
-
import { MemDown, default as memdown } from 'memdown';
|
|
7
|
-
import { mkdir } from 'node:fs/promises';
|
|
8
|
-
import { join } from 'node:path';
|
|
9
|
-
|
|
10
|
-
import { AztecNodeConfig } from './config.js';
|
|
11
|
-
|
|
12
|
-
export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
|
|
13
|
-
export const createLevelDown = (path: string) => (leveldown as any)(path) as LevelDown;
|
|
14
|
-
|
|
15
|
-
const DB_SUBDIR = 'aztec-node';
|
|
16
|
-
const WORLD_STATE_SUBDIR = 'aztec-world-state';
|
|
17
|
-
const NODE_METADATA_KEY = '@@aztec_node_metadata';
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* The metadata for an aztec node.
|
|
21
|
-
*/
|
|
22
|
-
type NodeMetadata = {
|
|
23
|
-
/**
|
|
24
|
-
* The address of the rollup contract on L1
|
|
25
|
-
*/
|
|
26
|
-
rollupContractAddress: string;
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* Opens the database for the aztec node. If a data directory is specified, then this attempts to create it.
|
|
31
|
-
* @param config - The configuration to be used by the aztec node.
|
|
32
|
-
* @throws If `config.dataDirectory` is set and the directory cannot be created.
|
|
33
|
-
* @returns The database for the aztec node.
|
|
34
|
-
*/
|
|
35
|
-
export async function openDb(
|
|
36
|
-
config: AztecNodeConfig,
|
|
37
|
-
log: LogFn,
|
|
38
|
-
): Promise<[nodeDb: RootDatabase, worldStateDb: LevelUp]> {
|
|
39
|
-
const nodeMetadata: NodeMetadata = {
|
|
40
|
-
rollupContractAddress: config.l1Contracts.rollupAddress.toString(),
|
|
41
|
-
};
|
|
42
|
-
|
|
43
|
-
let nodeDb: RootDatabase;
|
|
44
|
-
let worldStateDb: LevelUp;
|
|
45
|
-
|
|
46
|
-
if (config.dataDirectory) {
|
|
47
|
-
const nodeDir = join(config.dataDirectory, DB_SUBDIR);
|
|
48
|
-
const worldStateDir = join(config.dataDirectory, WORLD_STATE_SUBDIR);
|
|
49
|
-
// this throws if we don't have permissions to create the directory
|
|
50
|
-
await mkdir(nodeDir, { recursive: true });
|
|
51
|
-
await mkdir(worldStateDir, { recursive: true });
|
|
52
|
-
|
|
53
|
-
log(`Opening aztec-node database at ${nodeDir}`);
|
|
54
|
-
nodeDb = open(nodeDir, {});
|
|
55
|
-
|
|
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());
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
await checkNodeMetadataAndClear(nodeDb, worldStateDb, nodeMetadata, log);
|
|
66
|
-
return [nodeDb, worldStateDb];
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
/**
|
|
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.
|
|
73
|
-
*/
|
|
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', {});
|
|
81
|
-
try {
|
|
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();
|
|
91
|
-
}
|
|
92
|
-
}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
import { BlockHeader, FunctionSelector } from '@aztec/circuits.js';
|
|
2
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
|
-
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
-
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
6
|
-
import {
|
|
7
|
-
AztecNode,
|
|
8
|
-
ContractData,
|
|
9
|
-
ExtendedContractData,
|
|
10
|
-
ExtendedUnencryptedL2Log,
|
|
11
|
-
L1ToL2MessageAndIndex,
|
|
12
|
-
L2Block,
|
|
13
|
-
L2BlockL2Logs,
|
|
14
|
-
L2Tx,
|
|
15
|
-
LogId,
|
|
16
|
-
SiblingPath,
|
|
17
|
-
Tx,
|
|
18
|
-
TxHash,
|
|
19
|
-
} from '@aztec/types';
|
|
20
|
-
|
|
21
|
-
/**
|
|
22
|
-
* Wrap an AztecNode instance with a JSON RPC HTTP server.
|
|
23
|
-
* @param node - The AztecNode
|
|
24
|
-
* @returns An JSON-RPC HTTP server
|
|
25
|
-
*/
|
|
26
|
-
export function createAztecNodeRpcServer(node: AztecNode) {
|
|
27
|
-
const rpc = new JsonRpcServer(
|
|
28
|
-
node,
|
|
29
|
-
{
|
|
30
|
-
AztecAddress,
|
|
31
|
-
EthAddress,
|
|
32
|
-
ExtendedContractData,
|
|
33
|
-
ExtendedUnencryptedL2Log,
|
|
34
|
-
ContractData,
|
|
35
|
-
Fr,
|
|
36
|
-
FunctionSelector,
|
|
37
|
-
BlockHeader,
|
|
38
|
-
L2Block,
|
|
39
|
-
L2Tx,
|
|
40
|
-
LogId,
|
|
41
|
-
TxHash,
|
|
42
|
-
SiblingPath,
|
|
43
|
-
L1ToL2MessageAndIndex,
|
|
44
|
-
},
|
|
45
|
-
{ Tx, L2BlockL2Logs },
|
|
46
|
-
false,
|
|
47
|
-
// disable methods not part of the AztecNode interface
|
|
48
|
-
['start', 'stop'],
|
|
49
|
-
);
|
|
50
|
-
return rpc;
|
|
51
|
-
}
|
package/src/aztec-node/server.ts
DELETED
|
@@ -1,624 +0,0 @@
|
|
|
1
|
-
import { Archiver, LMDBArchiverStore } from '@aztec/archiver';
|
|
2
|
-
import {
|
|
3
|
-
BLOCKS_TREE_HEIGHT,
|
|
4
|
-
BlockHeader,
|
|
5
|
-
CONTRACT_TREE_HEIGHT,
|
|
6
|
-
Fr,
|
|
7
|
-
GlobalVariables,
|
|
8
|
-
L1_TO_L2_MSG_TREE_HEIGHT,
|
|
9
|
-
NOTE_HASH_TREE_HEIGHT,
|
|
10
|
-
NULLIFIER_TREE_HEIGHT,
|
|
11
|
-
NullifierLeafPreimage,
|
|
12
|
-
PUBLIC_DATA_TREE_HEIGHT,
|
|
13
|
-
} from '@aztec/circuits.js';
|
|
14
|
-
import { computeGlobalsHash, computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
|
|
15
|
-
import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
|
|
16
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
17
|
-
import { createDebugLogger } from '@aztec/foundation/log';
|
|
18
|
-
import { InMemoryTxPool, P2P, createP2PClient } from '@aztec/p2p';
|
|
19
|
-
import {
|
|
20
|
-
GlobalVariableBuilder,
|
|
21
|
-
PublicProcessorFactory,
|
|
22
|
-
SequencerClient,
|
|
23
|
-
getGlobalVariableBuilder,
|
|
24
|
-
} from '@aztec/sequencer-client';
|
|
25
|
-
import {
|
|
26
|
-
AztecNode,
|
|
27
|
-
ContractData,
|
|
28
|
-
ContractDataSource,
|
|
29
|
-
ExtendedContractData,
|
|
30
|
-
GetUnencryptedLogsResponse,
|
|
31
|
-
INITIAL_L2_BLOCK_NUM,
|
|
32
|
-
L1ToL2MessageAndIndex,
|
|
33
|
-
L1ToL2MessageSource,
|
|
34
|
-
L2Block,
|
|
35
|
-
L2BlockL2Logs,
|
|
36
|
-
L2BlockSource,
|
|
37
|
-
L2LogsSource,
|
|
38
|
-
L2Tx,
|
|
39
|
-
LogFilter,
|
|
40
|
-
LogType,
|
|
41
|
-
MerkleTreeId,
|
|
42
|
-
NullifierMembershipWitness,
|
|
43
|
-
SequencerConfig,
|
|
44
|
-
SiblingPath,
|
|
45
|
-
Tx,
|
|
46
|
-
TxHash,
|
|
47
|
-
} from '@aztec/types';
|
|
48
|
-
import {
|
|
49
|
-
MerkleTrees,
|
|
50
|
-
ServerWorldStateSynchronizer,
|
|
51
|
-
WorldStateConfig,
|
|
52
|
-
WorldStateSynchronizer,
|
|
53
|
-
getConfigEnvVars as getWorldStateConfig,
|
|
54
|
-
} from '@aztec/world-state';
|
|
55
|
-
|
|
56
|
-
import { LevelUp } from 'levelup';
|
|
57
|
-
|
|
58
|
-
import { AztecNodeConfig } from './config.js';
|
|
59
|
-
import { openDb } from './db.js';
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* The aztec node.
|
|
63
|
-
*/
|
|
64
|
-
export class AztecNodeService implements AztecNode {
|
|
65
|
-
constructor(
|
|
66
|
-
protected readonly config: AztecNodeConfig,
|
|
67
|
-
protected readonly p2pClient: P2P,
|
|
68
|
-
protected readonly blockSource: L2BlockSource,
|
|
69
|
-
protected readonly encryptedLogsSource: L2LogsSource,
|
|
70
|
-
protected readonly unencryptedLogsSource: L2LogsSource,
|
|
71
|
-
protected readonly contractDataSource: ContractDataSource,
|
|
72
|
-
protected readonly l1ToL2MessageSource: L1ToL2MessageSource,
|
|
73
|
-
protected readonly worldStateSynchronizer: WorldStateSynchronizer,
|
|
74
|
-
protected readonly sequencer: SequencerClient | undefined,
|
|
75
|
-
protected readonly chainId: number,
|
|
76
|
-
protected readonly version: number,
|
|
77
|
-
protected readonly globalVariableBuilder: GlobalVariableBuilder,
|
|
78
|
-
protected readonly merkleTreesDb: LevelUp,
|
|
79
|
-
private log = createDebugLogger('aztec:node'),
|
|
80
|
-
) {
|
|
81
|
-
const message =
|
|
82
|
-
`Started Aztec Node against chain 0x${chainId.toString(16)} with contracts - \n` +
|
|
83
|
-
`Rollup: ${config.l1Contracts.rollupAddress.toString()}\n` +
|
|
84
|
-
`Registry: ${config.l1Contracts.registryAddress.toString()}\n` +
|
|
85
|
-
`Inbox: ${config.l1Contracts.inboxAddress.toString()}\n` +
|
|
86
|
-
`Outbox: ${config.l1Contracts.outboxAddress.toString()}\n` +
|
|
87
|
-
`Contract Emitter: ${config.l1Contracts.contractDeploymentEmitterAddress.toString()}`;
|
|
88
|
-
this.log(message);
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
/**
|
|
92
|
-
* initializes the Aztec Node, wait for component to sync.
|
|
93
|
-
* @param config - The configuration to be used by the aztec node.
|
|
94
|
-
* @returns - A fully synced Aztec Node for use in development/testing.
|
|
95
|
-
*/
|
|
96
|
-
public static async createAndSync(config: AztecNodeConfig) {
|
|
97
|
-
const ethereumChain = createEthereumChain(config.rpcUrl, config.apiKey);
|
|
98
|
-
//validate that the actual chain id matches that specified in configuration
|
|
99
|
-
if (config.chainId !== ethereumChain.chainInfo.id) {
|
|
100
|
-
throw new Error(
|
|
101
|
-
`RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.chainId}`,
|
|
102
|
-
);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
const log = createDebugLogger('aztec:node');
|
|
106
|
-
const [nodeDb, worldStateDb] = await openDb(config, log);
|
|
107
|
-
|
|
108
|
-
// first create and sync the archiver
|
|
109
|
-
const archiverStore = new LMDBArchiverStore(nodeDb, config.maxLogs);
|
|
110
|
-
const archiver = await Archiver.createAndSync(config, archiverStore, true);
|
|
111
|
-
|
|
112
|
-
// we identify the P2P transaction protocol by using the rollup contract address.
|
|
113
|
-
// this may well change in future
|
|
114
|
-
config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
|
|
115
|
-
|
|
116
|
-
// create the tx pool and the p2p client, which will need the l2 block source
|
|
117
|
-
const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
|
|
118
|
-
|
|
119
|
-
// now create the merkle trees and the world state synchronizer
|
|
120
|
-
const merkleTrees = await MerkleTrees.new(worldStateDb);
|
|
121
|
-
const worldStateConfig: WorldStateConfig = getWorldStateConfig();
|
|
122
|
-
const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(
|
|
123
|
-
worldStateDb,
|
|
124
|
-
merkleTrees,
|
|
125
|
-
archiver,
|
|
126
|
-
worldStateConfig,
|
|
127
|
-
);
|
|
128
|
-
|
|
129
|
-
// start both and wait for them to sync from the block source
|
|
130
|
-
await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
|
|
131
|
-
|
|
132
|
-
// now create the sequencer
|
|
133
|
-
const sequencer = config.disableSequencer
|
|
134
|
-
? undefined
|
|
135
|
-
: await SequencerClient.new(config, p2pClient, worldStateSynchronizer, archiver, archiver, archiver);
|
|
136
|
-
|
|
137
|
-
return new AztecNodeService(
|
|
138
|
-
config,
|
|
139
|
-
p2pClient,
|
|
140
|
-
archiver,
|
|
141
|
-
archiver,
|
|
142
|
-
archiver,
|
|
143
|
-
archiver,
|
|
144
|
-
archiver,
|
|
145
|
-
worldStateSynchronizer,
|
|
146
|
-
sequencer,
|
|
147
|
-
ethereumChain.chainInfo.id,
|
|
148
|
-
config.version,
|
|
149
|
-
getGlobalVariableBuilder(config),
|
|
150
|
-
worldStateDb,
|
|
151
|
-
log,
|
|
152
|
-
);
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
/**
|
|
156
|
-
* Returns the sequencer client instance.
|
|
157
|
-
* @returns The sequencer client instance.
|
|
158
|
-
*/
|
|
159
|
-
public getSequencer(): SequencerClient | undefined {
|
|
160
|
-
return this.sequencer;
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
/**
|
|
164
|
-
* Method to return the currently deployed L1 contract addresses.
|
|
165
|
-
* @returns - The currently deployed L1 contract addresses.
|
|
166
|
-
*/
|
|
167
|
-
public getL1ContractAddresses(): Promise<L1ContractAddresses> {
|
|
168
|
-
return Promise.resolve(this.config.l1Contracts);
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
/**
|
|
172
|
-
* Method to determine if the node is ready to accept transactions.
|
|
173
|
-
* @returns - Flag indicating the readiness for tx submission.
|
|
174
|
-
*/
|
|
175
|
-
public async isReady() {
|
|
176
|
-
return (await this.p2pClient.isReady()) ?? false;
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
/**
|
|
180
|
-
* Get a block specified by its number.
|
|
181
|
-
* @param number - The block number being requested.
|
|
182
|
-
* @returns The requested block.
|
|
183
|
-
*/
|
|
184
|
-
public async getBlock(number: number): Promise<L2Block | undefined> {
|
|
185
|
-
return await this.blockSource.getBlock(number);
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
/**
|
|
189
|
-
* Method to request blocks. Will attempt to return all requested blocks but will return only those available.
|
|
190
|
-
* @param from - The start of the range of blocks to return.
|
|
191
|
-
* @param limit - The maximum number of blocks to obtain.
|
|
192
|
-
* @returns The blocks requested.
|
|
193
|
-
*/
|
|
194
|
-
public async getBlocks(from: number, limit: number): Promise<L2Block[]> {
|
|
195
|
-
return (await this.blockSource.getBlocks(from, limit)) ?? [];
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
/**
|
|
199
|
-
* Method to fetch the current block number.
|
|
200
|
-
* @returns The block number.
|
|
201
|
-
*/
|
|
202
|
-
public async getBlockNumber(): Promise<number> {
|
|
203
|
-
return await this.blockSource.getBlockNumber();
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
/**
|
|
207
|
-
* Method to fetch the version of the rollup the node is connected to.
|
|
208
|
-
* @returns The rollup version.
|
|
209
|
-
*/
|
|
210
|
-
public getVersion(): Promise<number> {
|
|
211
|
-
return Promise.resolve(this.version);
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
/**
|
|
215
|
-
* Method to fetch the chain id of the base-layer for the rollup.
|
|
216
|
-
* @returns The chain id.
|
|
217
|
-
*/
|
|
218
|
-
public getChainId(): Promise<number> {
|
|
219
|
-
return Promise.resolve(this.chainId);
|
|
220
|
-
}
|
|
221
|
-
|
|
222
|
-
/**
|
|
223
|
-
* Get the extended contract data for this contract.
|
|
224
|
-
* @param contractAddress - The contract data address.
|
|
225
|
-
* @returns The extended contract data or undefined if not found.
|
|
226
|
-
*/
|
|
227
|
-
async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
|
|
228
|
-
return await this.contractDataSource.getExtendedContractData(contractAddress);
|
|
229
|
-
}
|
|
230
|
-
|
|
231
|
-
/**
|
|
232
|
-
* Lookup the contract data for this contract.
|
|
233
|
-
* Contains the ethereum portal address .
|
|
234
|
-
* @param contractAddress - The contract data address.
|
|
235
|
-
* @returns The contract's address & portal address.
|
|
236
|
-
*/
|
|
237
|
-
public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
|
|
238
|
-
return await this.contractDataSource.getContractData(contractAddress);
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
/**
|
|
242
|
-
* Gets up to `limit` amount of logs starting from `from`.
|
|
243
|
-
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
244
|
-
* @param limit - The maximum number of logs to return.
|
|
245
|
-
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
246
|
-
* @returns The requested logs.
|
|
247
|
-
*/
|
|
248
|
-
public getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]> {
|
|
249
|
-
const logSource = logType === LogType.ENCRYPTED ? this.encryptedLogsSource : this.unencryptedLogsSource;
|
|
250
|
-
return logSource.getLogs(from, limit, logType);
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
/**
|
|
254
|
-
* Gets unencrypted logs based on the provided filter.
|
|
255
|
-
* @param filter - The filter to apply to the logs.
|
|
256
|
-
* @returns The requested logs.
|
|
257
|
-
*/
|
|
258
|
-
getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
|
|
259
|
-
return this.unencryptedLogsSource.getUnencryptedLogs(filter);
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
/**
|
|
263
|
-
* Method to submit a transaction to the p2p pool.
|
|
264
|
-
* @param tx - The transaction to be submitted.
|
|
265
|
-
*/
|
|
266
|
-
public async sendTx(tx: Tx) {
|
|
267
|
-
this.log.info(`Received tx ${await tx.getTxHash()}`);
|
|
268
|
-
await this.p2pClient!.sendTx(tx);
|
|
269
|
-
}
|
|
270
|
-
|
|
271
|
-
public getTx(txHash: TxHash): Promise<L2Tx | undefined> {
|
|
272
|
-
return this.blockSource.getL2Tx(txHash);
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
/**
|
|
276
|
-
* Method to stop the aztec node.
|
|
277
|
-
*/
|
|
278
|
-
public async stop() {
|
|
279
|
-
this.log.info(`Stopping`);
|
|
280
|
-
await this.sequencer?.stop();
|
|
281
|
-
await this.p2pClient.stop();
|
|
282
|
-
await this.worldStateSynchronizer.stop();
|
|
283
|
-
await this.blockSource.stop();
|
|
284
|
-
this.log.info(`Stopped`);
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
/**
|
|
288
|
-
* Method to retrieve pending txs.
|
|
289
|
-
* @returns - The pending txs.
|
|
290
|
-
*/
|
|
291
|
-
public async getPendingTxs() {
|
|
292
|
-
return await this.p2pClient!.getTxs();
|
|
293
|
-
}
|
|
294
|
-
|
|
295
|
-
/**
|
|
296
|
-
* Method to retrieve a single pending tx.
|
|
297
|
-
* @param txHash - The transaction hash to return.
|
|
298
|
-
* @returns - The pending tx if it exists.
|
|
299
|
-
*/
|
|
300
|
-
public async getPendingTxByHash(txHash: TxHash) {
|
|
301
|
-
return await this.p2pClient!.getTxByHash(txHash);
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
/**
|
|
305
|
-
* Find the index of the given leaf in the given tree.
|
|
306
|
-
* @param blockNumber - The block number at which to get the data
|
|
307
|
-
* @param treeId - The tree to search in.
|
|
308
|
-
* @param leafValue - The value to search for
|
|
309
|
-
* @returns The index of the given leaf in the given tree or undefined if not found.
|
|
310
|
-
*/
|
|
311
|
-
public async findLeafIndex(
|
|
312
|
-
blockNumber: number | 'latest',
|
|
313
|
-
treeId: MerkleTreeId,
|
|
314
|
-
leafValue: Fr,
|
|
315
|
-
): Promise<bigint | undefined> {
|
|
316
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
317
|
-
return committedDb.findLeafIndex(treeId, leafValue.toBuffer());
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
/**
|
|
321
|
-
* Returns a sibling path for the given index in the contract tree.
|
|
322
|
-
* @param blockNumber - The block number at which to get the data.
|
|
323
|
-
* @param leafIndex - The index of the leaf for which the sibling path is required.
|
|
324
|
-
* @returns The sibling path for the leaf index.
|
|
325
|
-
*/
|
|
326
|
-
public async getContractSiblingPath(
|
|
327
|
-
blockNumber: number | 'latest',
|
|
328
|
-
leafIndex: bigint,
|
|
329
|
-
): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>> {
|
|
330
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
331
|
-
return committedDb.getSiblingPath(MerkleTreeId.CONTRACT_TREE, leafIndex);
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
/**
|
|
335
|
-
* Returns a sibling path for the given index in the nullifier tree.
|
|
336
|
-
* @param blockNumber - The block number at which to get the data.
|
|
337
|
-
* @param leafIndex - The index of the leaf for which the sibling path is required.
|
|
338
|
-
* @returns The sibling path for the leaf index.
|
|
339
|
-
*/
|
|
340
|
-
public async getNullifierTreeSiblingPath(
|
|
341
|
-
blockNumber: number | 'latest',
|
|
342
|
-
leafIndex: bigint,
|
|
343
|
-
): Promise<SiblingPath<typeof NULLIFIER_TREE_HEIGHT>> {
|
|
344
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
345
|
-
return committedDb.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, leafIndex);
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
/**
|
|
349
|
-
* Returns a sibling path for the given index in the data tree.
|
|
350
|
-
* @param blockNumber - The block number at which to get the data.
|
|
351
|
-
* @param leafIndex - The index of the leaf for which the sibling path is required.
|
|
352
|
-
* @returns The sibling path for the leaf index.
|
|
353
|
-
*/
|
|
354
|
-
public async getNoteHashSiblingPath(
|
|
355
|
-
blockNumber: number | 'latest',
|
|
356
|
-
leafIndex: bigint,
|
|
357
|
-
): Promise<SiblingPath<typeof NOTE_HASH_TREE_HEIGHT>> {
|
|
358
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
359
|
-
return committedDb.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
|
|
360
|
-
}
|
|
361
|
-
|
|
362
|
-
/**
|
|
363
|
-
* Gets a confirmed/consumed L1 to L2 message for the given message key
|
|
364
|
-
* and its index in the merkle tree.
|
|
365
|
-
* @param messageKey - The message key.
|
|
366
|
-
* @returns The map containing the message and index.
|
|
367
|
-
*/
|
|
368
|
-
public async getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex> {
|
|
369
|
-
// todo: #697 - make this one lookup.
|
|
370
|
-
const index = (await this.findLeafIndex('latest', MerkleTreeId.L1_TO_L2_MESSAGES_TREE, messageKey))!;
|
|
371
|
-
const message = await this.l1ToL2MessageSource.getConfirmedL1ToL2Message(messageKey);
|
|
372
|
-
return Promise.resolve(new L1ToL2MessageAndIndex(index, message));
|
|
373
|
-
}
|
|
374
|
-
|
|
375
|
-
/**
|
|
376
|
-
* Returns a sibling path for a leaf in the committed l1 to l2 data tree.
|
|
377
|
-
* @param blockNumber - The block number at which to get the data.
|
|
378
|
-
* @param leafIndex - Index of the leaf in the tree.
|
|
379
|
-
* @returns The sibling path.
|
|
380
|
-
*/
|
|
381
|
-
public async getL1ToL2MessageSiblingPath(
|
|
382
|
-
blockNumber: number | 'latest',
|
|
383
|
-
leafIndex: bigint,
|
|
384
|
-
): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
|
|
385
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
386
|
-
return committedDb.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGES_TREE, leafIndex);
|
|
387
|
-
}
|
|
388
|
-
|
|
389
|
-
/**
|
|
390
|
-
* Returns a sibling path for a leaf in the committed blocks tree.
|
|
391
|
-
* @param blockNumber - The block number at which to get the data.
|
|
392
|
-
* @param leafIndex - Index of the leaf in the tree.
|
|
393
|
-
* @returns The sibling path.
|
|
394
|
-
*/
|
|
395
|
-
public async getBlocksTreeSiblingPath(
|
|
396
|
-
blockNumber: number | 'latest',
|
|
397
|
-
leafIndex: bigint,
|
|
398
|
-
): Promise<SiblingPath<typeof BLOCKS_TREE_HEIGHT>> {
|
|
399
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
400
|
-
return committedDb.getSiblingPath(MerkleTreeId.BLOCKS_TREE, leafIndex);
|
|
401
|
-
}
|
|
402
|
-
|
|
403
|
-
/**
|
|
404
|
-
* Returns a sibling path for a leaf in the committed public data tree.
|
|
405
|
-
* @param blockNumber - The block number at which to get the data.
|
|
406
|
-
* @param leafIndex - Index of the leaf in the tree.
|
|
407
|
-
* @returns The sibling path.
|
|
408
|
-
*/
|
|
409
|
-
public async getPublicDataTreeSiblingPath(
|
|
410
|
-
blockNumber: number | 'latest',
|
|
411
|
-
leafIndex: bigint,
|
|
412
|
-
): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>> {
|
|
413
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
414
|
-
return committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
|
|
415
|
-
}
|
|
416
|
-
|
|
417
|
-
/**
|
|
418
|
-
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
419
|
-
* @param blockNumber - The block number at which to get the index.
|
|
420
|
-
* @param nullifier - Nullifier we try to find witness for.
|
|
421
|
-
* @returns The nullifier membership witness (if found).
|
|
422
|
-
*/
|
|
423
|
-
public async getNullifierMembershipWitness(
|
|
424
|
-
blockNumber: number | 'latest',
|
|
425
|
-
nullifier: Fr,
|
|
426
|
-
): Promise<NullifierMembershipWitness | undefined> {
|
|
427
|
-
const db = await this.#getWorldState(blockNumber);
|
|
428
|
-
const index = await db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
|
|
429
|
-
if (!index) {
|
|
430
|
-
return undefined;
|
|
431
|
-
}
|
|
432
|
-
|
|
433
|
-
const leafPreimagePromise = db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
|
|
434
|
-
const siblingPathPromise = db.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(
|
|
435
|
-
MerkleTreeId.NULLIFIER_TREE,
|
|
436
|
-
BigInt(index),
|
|
437
|
-
);
|
|
438
|
-
|
|
439
|
-
const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
|
|
440
|
-
|
|
441
|
-
if (!leafPreimage) {
|
|
442
|
-
return undefined;
|
|
443
|
-
}
|
|
444
|
-
|
|
445
|
-
return new NullifierMembershipWitness(BigInt(index), leafPreimage as NullifierLeafPreimage, siblingPath);
|
|
446
|
-
}
|
|
447
|
-
|
|
448
|
-
/**
|
|
449
|
-
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
450
|
-
* @param blockNumber - The block number at which to get the index.
|
|
451
|
-
* @param nullifier - Nullifier we try to find the low nullifier witness for.
|
|
452
|
-
* @returns The low nullifier membership witness (if found).
|
|
453
|
-
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
454
|
-
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
455
|
-
* we are trying to prove non-inclusion for.
|
|
456
|
-
*
|
|
457
|
-
* Note: This function returns the membership witness of the nullifier itself and not the low nullifier when
|
|
458
|
-
* the nullifier already exists in the tree. This is because the `getPreviousValueIndex` function returns the
|
|
459
|
-
* index of the nullifier itself when it already exists in the tree.
|
|
460
|
-
* TODO: This is a confusing behavior and we should eventually address that.
|
|
461
|
-
*/
|
|
462
|
-
public async getLowNullifierMembershipWitness(
|
|
463
|
-
blockNumber: number | 'latest',
|
|
464
|
-
nullifier: Fr,
|
|
465
|
-
): Promise<NullifierMembershipWitness | undefined> {
|
|
466
|
-
const committedDb = await this.#getWorldState(blockNumber);
|
|
467
|
-
const findResult = await committedDb.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
|
|
468
|
-
if (!findResult) {
|
|
469
|
-
return undefined;
|
|
470
|
-
}
|
|
471
|
-
const { index, alreadyPresent } = findResult;
|
|
472
|
-
if (alreadyPresent) {
|
|
473
|
-
this.log.warn(`Nullifier ${nullifier.toBigInt()} already exists in the tree`);
|
|
474
|
-
}
|
|
475
|
-
const preimageData = (await committedDb.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index))!;
|
|
476
|
-
|
|
477
|
-
const siblingPath = await committedDb.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(
|
|
478
|
-
MerkleTreeId.NULLIFIER_TREE,
|
|
479
|
-
BigInt(index),
|
|
480
|
-
);
|
|
481
|
-
return new NullifierMembershipWitness(BigInt(index), preimageData as NullifierLeafPreimage, siblingPath);
|
|
482
|
-
}
|
|
483
|
-
|
|
484
|
-
/**
|
|
485
|
-
* Gets the storage value at the given contract storage slot.
|
|
486
|
-
*
|
|
487
|
-
* @remarks The storage slot here refers to the slot as it is defined in Noir not the index in the merkle tree.
|
|
488
|
-
* Aztec's version of `eth_getStorageAt`.
|
|
489
|
-
*
|
|
490
|
-
* @param contract - Address of the contract to query.
|
|
491
|
-
* @param slot - Slot to query.
|
|
492
|
-
* @returns Storage value at the given contract slot (or undefined if not found).
|
|
493
|
-
*/
|
|
494
|
-
public async getPublicStorageAt(contract: AztecAddress, slot: Fr): Promise<Fr | undefined> {
|
|
495
|
-
const committedDb = await this.#getWorldState('latest');
|
|
496
|
-
const leafIndex = computePublicDataTreeIndex(contract, slot);
|
|
497
|
-
const value = await committedDb.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex.value);
|
|
498
|
-
return value ? Fr.fromBuffer(value) : undefined;
|
|
499
|
-
}
|
|
500
|
-
|
|
501
|
-
/**
|
|
502
|
-
* Returns the current committed roots for the data trees.
|
|
503
|
-
* @returns The current committed roots for the data trees.
|
|
504
|
-
*/
|
|
505
|
-
public async getTreeRoots(): Promise<Record<MerkleTreeId, Fr>> {
|
|
506
|
-
const committedDb = await this.#getWorldState('latest');
|
|
507
|
-
const getTreeRoot = async (id: MerkleTreeId) => Fr.fromBuffer((await committedDb.getTreeInfo(id)).root);
|
|
508
|
-
|
|
509
|
-
const [noteHashTree, nullifierTree, contractTree, l1ToL2MessagesTree, blocksTree, publicDataTree] =
|
|
510
|
-
await Promise.all([
|
|
511
|
-
getTreeRoot(MerkleTreeId.NOTE_HASH_TREE),
|
|
512
|
-
getTreeRoot(MerkleTreeId.NULLIFIER_TREE),
|
|
513
|
-
getTreeRoot(MerkleTreeId.CONTRACT_TREE),
|
|
514
|
-
getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
|
|
515
|
-
getTreeRoot(MerkleTreeId.BLOCKS_TREE),
|
|
516
|
-
getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE),
|
|
517
|
-
]);
|
|
518
|
-
|
|
519
|
-
return {
|
|
520
|
-
[MerkleTreeId.CONTRACT_TREE]: contractTree,
|
|
521
|
-
[MerkleTreeId.NOTE_HASH_TREE]: noteHashTree,
|
|
522
|
-
[MerkleTreeId.NULLIFIER_TREE]: nullifierTree,
|
|
523
|
-
[MerkleTreeId.PUBLIC_DATA_TREE]: publicDataTree,
|
|
524
|
-
[MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: l1ToL2MessagesTree,
|
|
525
|
-
[MerkleTreeId.BLOCKS_TREE]: blocksTree,
|
|
526
|
-
};
|
|
527
|
-
}
|
|
528
|
-
|
|
529
|
-
/**
|
|
530
|
-
* Returns the currently committed block header.
|
|
531
|
-
* @returns The current committed block header.
|
|
532
|
-
*/
|
|
533
|
-
public async getBlockHeader(): Promise<BlockHeader> {
|
|
534
|
-
const committedDb = await this.#getWorldState('latest');
|
|
535
|
-
const [roots, globalsHash] = await Promise.all([this.getTreeRoots(), committedDb.getLatestGlobalVariablesHash()]);
|
|
536
|
-
|
|
537
|
-
return new BlockHeader(
|
|
538
|
-
roots[MerkleTreeId.NOTE_HASH_TREE],
|
|
539
|
-
roots[MerkleTreeId.NULLIFIER_TREE],
|
|
540
|
-
roots[MerkleTreeId.CONTRACT_TREE],
|
|
541
|
-
roots[MerkleTreeId.L1_TO_L2_MESSAGES_TREE],
|
|
542
|
-
roots[MerkleTreeId.BLOCKS_TREE],
|
|
543
|
-
Fr.ZERO,
|
|
544
|
-
roots[MerkleTreeId.PUBLIC_DATA_TREE],
|
|
545
|
-
globalsHash,
|
|
546
|
-
);
|
|
547
|
-
}
|
|
548
|
-
|
|
549
|
-
/**
|
|
550
|
-
* Simulates the public part of a transaction with the current state.
|
|
551
|
-
* @param tx - The transaction to simulate.
|
|
552
|
-
**/
|
|
553
|
-
public async simulatePublicCalls(tx: Tx) {
|
|
554
|
-
this.log.info(`Simulating tx ${await tx.getTxHash()}`);
|
|
555
|
-
const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
|
|
556
|
-
const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(new Fr(blockNumber));
|
|
557
|
-
const prevGlobalVariables = (await this.blockSource.getBlock(-1))?.globalVariables ?? GlobalVariables.empty();
|
|
558
|
-
|
|
559
|
-
// Instantiate merkle trees so uncommitted updates by this simulation are local to it.
|
|
560
|
-
// TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
|
|
561
|
-
// So simulation of public functions doesn't affect the merkle trees.
|
|
562
|
-
const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
|
|
563
|
-
const globalVariablesHash = computeGlobalsHash(prevGlobalVariables);
|
|
564
|
-
await merkleTrees.init({
|
|
565
|
-
globalVariablesHash,
|
|
566
|
-
});
|
|
567
|
-
|
|
568
|
-
const publicProcessorFactory = new PublicProcessorFactory(
|
|
569
|
-
merkleTrees.asLatest(),
|
|
570
|
-
this.contractDataSource,
|
|
571
|
-
this.l1ToL2MessageSource,
|
|
572
|
-
);
|
|
573
|
-
const processor = await publicProcessorFactory.create(prevGlobalVariables, newGlobalVariables);
|
|
574
|
-
const [, failedTxs] = await processor.process([tx]);
|
|
575
|
-
if (failedTxs.length) {
|
|
576
|
-
throw failedTxs[0].error;
|
|
577
|
-
}
|
|
578
|
-
this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
|
|
579
|
-
}
|
|
580
|
-
|
|
581
|
-
public setConfig(config: Partial<SequencerConfig>): Promise<void> {
|
|
582
|
-
this.sequencer?.updateSequencerConfig(config);
|
|
583
|
-
return Promise.resolve();
|
|
584
|
-
}
|
|
585
|
-
|
|
586
|
-
/**
|
|
587
|
-
* Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
|
|
588
|
-
* @param blockNumber - The block number at which to get the data.
|
|
589
|
-
* @returns An instance of a committed MerkleTreeOperations
|
|
590
|
-
*/
|
|
591
|
-
async #getWorldState(blockNumber: number | 'latest') {
|
|
592
|
-
if (typeof blockNumber === 'number' && blockNumber < INITIAL_L2_BLOCK_NUM) {
|
|
593
|
-
throw new Error('Invalid block number to get world state for: ' + blockNumber);
|
|
594
|
-
}
|
|
595
|
-
|
|
596
|
-
let blockSyncedTo: number = 0;
|
|
597
|
-
try {
|
|
598
|
-
// Attempt to sync the world state if necessary
|
|
599
|
-
blockSyncedTo = await this.#syncWorldState();
|
|
600
|
-
} catch (err) {
|
|
601
|
-
this.log.error(`Error getting world state: ${err}`);
|
|
602
|
-
}
|
|
603
|
-
|
|
604
|
-
// using a snapshot could be less efficient than using the committed db
|
|
605
|
-
if (blockNumber === 'latest' || blockNumber === blockSyncedTo) {
|
|
606
|
-
this.log(`Using committed db for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
|
|
607
|
-
return this.worldStateSynchronizer.getCommitted();
|
|
608
|
-
} else if (blockNumber < blockSyncedTo) {
|
|
609
|
-
this.log(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
|
|
610
|
-
return this.worldStateSynchronizer.getSnapshot(blockNumber);
|
|
611
|
-
} else {
|
|
612
|
-
throw new Error(`Block ${blockNumber} not yet synced`);
|
|
613
|
-
}
|
|
614
|
-
}
|
|
615
|
-
|
|
616
|
-
/**
|
|
617
|
-
* Ensure we fully sync the world state
|
|
618
|
-
* @returns A promise that fulfils once the world state is synced
|
|
619
|
-
*/
|
|
620
|
-
async #syncWorldState(): Promise<number> {
|
|
621
|
-
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
622
|
-
return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
|
|
623
|
-
}
|
|
624
|
-
}
|
package/src/bin/index.ts
DELETED
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env -S node --no-warnings
|
|
2
|
-
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
|
-
|
|
4
|
-
import http from 'http';
|
|
5
|
-
import Koa from 'koa';
|
|
6
|
-
import Router from 'koa-router';
|
|
7
|
-
|
|
8
|
-
import { AztecNodeConfig, AztecNodeService, createAztecNodeRpcServer, getConfigEnvVars } from '../index.js';
|
|
9
|
-
|
|
10
|
-
const { AZTEC_NODE_PORT = 8081, API_PREFIX = '' } = process.env;
|
|
11
|
-
|
|
12
|
-
const logger = createDebugLogger('aztec:node');
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Creates the node from provided config
|
|
16
|
-
*/
|
|
17
|
-
async function createAndDeployAztecNode() {
|
|
18
|
-
const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars() };
|
|
19
|
-
|
|
20
|
-
return await AztecNodeService.createAndSync(aztecNodeConfig);
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Creates a router for helper API endpoints of the Private eXecution Environment (PXE).
|
|
25
|
-
* @param apiPrefix - The prefix to use for all api requests
|
|
26
|
-
* @returns - The router for handling status requests.
|
|
27
|
-
*/
|
|
28
|
-
export function createStatusRouter(apiPrefix: string) {
|
|
29
|
-
const router = new Router({ prefix: `${apiPrefix}` });
|
|
30
|
-
router.get('/status', (ctx: Koa.Context) => {
|
|
31
|
-
ctx.status = 200;
|
|
32
|
-
});
|
|
33
|
-
return router;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
/**
|
|
37
|
-
* Create and start a new Aztec Node HTTP Server
|
|
38
|
-
*/
|
|
39
|
-
async function main() {
|
|
40
|
-
logger.info(`Setting up Aztec Node...`);
|
|
41
|
-
|
|
42
|
-
const aztecNode = await createAndDeployAztecNode();
|
|
43
|
-
|
|
44
|
-
const shutdown = async () => {
|
|
45
|
-
logger.info('Shutting down...');
|
|
46
|
-
await aztecNode.stop();
|
|
47
|
-
process.exit(0);
|
|
48
|
-
};
|
|
49
|
-
|
|
50
|
-
process.once('SIGINT', shutdown);
|
|
51
|
-
process.once('SIGTERM', shutdown);
|
|
52
|
-
|
|
53
|
-
const rpcServer = createAztecNodeRpcServer(aztecNode);
|
|
54
|
-
const app = rpcServer.getApp(API_PREFIX);
|
|
55
|
-
const apiRouter = createStatusRouter(API_PREFIX);
|
|
56
|
-
app.use(apiRouter.routes());
|
|
57
|
-
app.use(apiRouter.allowedMethods());
|
|
58
|
-
|
|
59
|
-
const httpServer = http.createServer(app.callback());
|
|
60
|
-
httpServer.listen(+AZTEC_NODE_PORT);
|
|
61
|
-
logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
main().catch(err => {
|
|
65
|
-
logger.error(err);
|
|
66
|
-
process.exit(1);
|
|
67
|
-
});
|
package/src/declaration.d.ts
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
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
|
-
}
|
package/src/index.ts
DELETED