@aztec/aztec-node 0.49.2 → 0.50.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.
- package/dest/aztec-node/config.d.ts +4 -1
- package/dest/aztec-node/config.d.ts.map +1 -1
- package/dest/aztec-node/config.js +8 -1
- package/dest/aztec-node/http_rpc_server.js +3 -3
- package/dest/aztec-node/server.d.ts +3 -1
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +21 -10
- package/package.json +19 -18
- package/src/aztec-node/config.ts +11 -0
- package/src/aztec-node/http_rpc_server.ts +2 -2
- package/src/aztec-node/server.ts +29 -14
|
@@ -3,14 +3,17 @@ import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
|
3
3
|
import { type P2PConfig } from '@aztec/p2p';
|
|
4
4
|
import { type ProverClientConfig } from '@aztec/prover-client';
|
|
5
5
|
import { type SequencerClientConfig } from '@aztec/sequencer-client';
|
|
6
|
+
import { type ValidatorClientConfig } from '@aztec/validator-client';
|
|
6
7
|
import { type WorldStateConfig } from '@aztec/world-state';
|
|
7
8
|
export { sequencerClientConfigMappings, SequencerClientConfig } from '@aztec/sequencer-client';
|
|
8
9
|
/**
|
|
9
10
|
* The configuration the aztec node.
|
|
10
11
|
*/
|
|
11
|
-
export type AztecNodeConfig = ArchiverConfig & SequencerClientConfig & ProverClientConfig & WorldStateConfig & Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> & P2PConfig & {
|
|
12
|
+
export type AztecNodeConfig = ArchiverConfig & SequencerClientConfig & ValidatorClientConfig & ProverClientConfig & WorldStateConfig & Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> & P2PConfig & {
|
|
12
13
|
/** Whether the sequencer is disabled for this node. */
|
|
13
14
|
disableSequencer: boolean;
|
|
15
|
+
/** Whether the validator is disabled for this node */
|
|
16
|
+
disableValidator: boolean;
|
|
14
17
|
};
|
|
15
18
|
export declare const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig>;
|
|
16
19
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/aztec-node/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,KAAK,kBAAkB,EAA8C,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,oBAAoB,CAAC;AAMrF,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAE/F;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,cAAc,GAC1C,qBAAqB,GACrB,kBAAkB,GAClB,gBAAgB,GAChB,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,oBAAoB,GAAG,YAAY,CAAC,GAC9E,SAAS,GAAG;IACV,uDAAuD;IACvD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEJ,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/aztec-node/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,KAAK,kBAAkB,EAA8C,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,oBAAoB,CAAC;AAMrF,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAE/F;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,cAAc,GAC1C,qBAAqB,GACrB,qBAAqB,GACrB,kBAAkB,GAClB,gBAAgB,GAChB,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,oBAAoB,GAAG,YAAY,CAAC,GAC9E,SAAS,GAAG;IACV,uDAAuD;IACvD,gBAAgB,EAAE,OAAO,CAAC;IAE1B,sDAAsD;IACtD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEJ,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAiBvE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,eAAe,CAElD;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAI7B"}
|
|
@@ -3,6 +3,7 @@ import { booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/co
|
|
|
3
3
|
import { p2pConfigMappings } from '@aztec/p2p';
|
|
4
4
|
import { proverClientConfigMappings } from '@aztec/prover-client';
|
|
5
5
|
import { sequencerClientConfigMappings } from '@aztec/sequencer-client';
|
|
6
|
+
import { validatorClientConfigMappings } from '@aztec/validator-client';
|
|
6
7
|
import { worldStateConfigMappings } from '@aztec/world-state';
|
|
7
8
|
import { readFileSync } from 'fs';
|
|
8
9
|
import { dirname, resolve } from 'path';
|
|
@@ -11,6 +12,7 @@ export { sequencerClientConfigMappings } from '@aztec/sequencer-client';
|
|
|
11
12
|
export const aztecNodeConfigMappings = {
|
|
12
13
|
...archiverConfigMappings,
|
|
13
14
|
...sequencerClientConfigMappings,
|
|
15
|
+
...validatorClientConfigMappings,
|
|
14
16
|
...proverClientConfigMappings,
|
|
15
17
|
...worldStateConfigMappings,
|
|
16
18
|
...p2pConfigMappings,
|
|
@@ -19,6 +21,11 @@ export const aztecNodeConfigMappings = {
|
|
|
19
21
|
description: 'Whether the sequencer is disabled for this node.',
|
|
20
22
|
...booleanConfigHelper(),
|
|
21
23
|
},
|
|
24
|
+
disableValidator: {
|
|
25
|
+
env: 'VALIDATOR_DISABLED',
|
|
26
|
+
description: 'Whether the validator is disabled for this node.',
|
|
27
|
+
...booleanConfigHelper(),
|
|
28
|
+
},
|
|
22
29
|
};
|
|
23
30
|
/**
|
|
24
31
|
* Returns the config of the aztec node from environment variables with reasonable defaults.
|
|
@@ -35,4 +42,4 @@ export function getPackageInfo() {
|
|
|
35
42
|
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
36
43
|
return { version, name };
|
|
37
44
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBdUIsc0JBQXNCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM5RSxPQUFPLEVBQTJCLG1CQUFtQixFQUFFLHFCQUFxQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0csT0FBTyxFQUFrQixpQkFBaUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUMvRCxPQUFPLEVBQTJCLDBCQUEwQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDM0YsT0FBTyxFQUE4Qiw2QkFBNkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3BHLE9BQU8sRUFBOEIsNkJBQTZCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNwRyxPQUFPLEVBQXlCLHdCQUF3QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLElBQUksQ0FBQztBQUNsQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN4QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXBDLE9BQU8sRUFBRSw2QkFBNkIsRUFBeUIsTUFBTSx5QkFBeUIsQ0FBQztBQW1CL0YsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQXdDO0lBQzFFLEdBQUcsc0JBQXNCO0lBQ3pCLEdBQUcsNkJBQTZCO0lBQ2hDLEdBQUcsNkJBQTZCO0lBQ2hDLEdBQUcsMEJBQTBCO0lBQzdCLEdBQUcsd0JBQXdCO0lBQzNCLEdBQUcsaUJBQWlCO0lBQ3BCLGdCQUFnQixFQUFFO1FBQ2hCLEdBQUcsRUFBRSxjQUFjO1FBQ25CLFdBQVcsRUFBRSxrREFBa0Q7UUFDL0QsR0FBRyxtQkFBbUIsRUFBRTtLQUN6QjtJQUNELGdCQUFnQixFQUFFO1FBQ2hCLEdBQUcsRUFBRSxvQkFBb0I7UUFDekIsV0FBVyxFQUFFLGtEQUFrRDtRQUMvRCxHQUFHLG1CQUFtQixFQUFFO0tBQ3pCO0NBQ0YsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsT0FBTyxxQkFBcUIsQ0FBa0IsdUJBQXVCLENBQUMsQ0FBQztBQUN6RSxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsY0FBYztJQUM1QixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztJQUMvRixNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDL0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUMzQixDQUFDIn0=
|
|
@@ -2,9 +2,9 @@ import { EncryptedNoteL2BlockL2Logs, ExtendedUnencryptedL2Log, L2Block, LogId, N
|
|
|
2
2
|
import { FunctionSelector, Header } from '@aztec/circuits.js';
|
|
3
3
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
+
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
5
6
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
7
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
|
-
import { BaseHashType } from '@aztec/foundation/hash';
|
|
8
8
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
9
9
|
/**
|
|
10
10
|
* Wrap an AztecNode instance with a JSON RPC HTTP server.
|
|
@@ -23,7 +23,7 @@ export function createAztecNodeRpcServer(node) {
|
|
|
23
23
|
TxEffect,
|
|
24
24
|
LogId,
|
|
25
25
|
TxHash,
|
|
26
|
-
|
|
26
|
+
Buffer32,
|
|
27
27
|
PublicDataWitness,
|
|
28
28
|
SiblingPath,
|
|
29
29
|
}, {
|
|
@@ -39,4 +39,4 @@ export function createAztecNodeRpcServer(node) {
|
|
|
39
39
|
['start', 'stop']);
|
|
40
40
|
return rpc;
|
|
41
41
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cF9ycGNfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvaHR0cF9ycGNfc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCwwQkFBMEIsRUFDMUIsd0JBQXdCLEVBQ3hCLE9BQU8sRUFDUCxLQUFLLEVBQ0wsMEJBQTBCLEVBQzFCLGlCQUFpQixFQUNqQixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLEVBQUUsRUFDRixRQUFRLEVBQ1IsTUFBTSxFQUNOLFNBQVMsRUFDVCx3QkFBd0IsR0FDekIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbEU7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx3QkFBd0IsQ0FBQyxJQUFlO0lBQ3RELE1BQU0sR0FBRyxHQUFHLElBQUksYUFBYSxDQUMzQixJQUFJLEVBQ0o7UUFDRSxZQUFZO1FBQ1osVUFBVTtRQUNWLHdCQUF3QjtRQUN4QixFQUFFO1FBQ0YsZ0JBQWdCO1FBQ2hCLE1BQU07UUFDTixPQUFPO1FBQ1AsUUFBUTtRQUNSLEtBQUs7UUFDTCxNQUFNO1FBQ04sUUFBUTtRQUNSLGlCQUFpQjtRQUNqQixXQUFXO0tBQ1osRUFDRDtRQUNFLDBCQUEwQjtRQUMxQixZQUFZO1FBQ1osMEJBQTBCO1FBQzFCLHNCQUFzQjtRQUN0QixFQUFFO1FBQ0YsU0FBUztRQUNULHdCQUF3QjtLQUN6QjtJQUNELHNEQUFzRDtJQUN0RCxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FDbEIsQ0FBQztJQUNGLE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyJ9
|
|
@@ -5,7 +5,7 @@ import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
|
5
5
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
6
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
7
7
|
import { type P2P } from '@aztec/p2p';
|
|
8
|
-
import {
|
|
8
|
+
import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
|
|
9
9
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type ProtocolContractAddresses } from '@aztec/types/contracts';
|
|
11
11
|
import { type WorldStateSynchronizer } from '@aztec/world-state';
|
|
@@ -122,6 +122,7 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
122
122
|
* @returns - The pending txs.
|
|
123
123
|
*/
|
|
124
124
|
getPendingTxs(): Promise<Tx[]>;
|
|
125
|
+
getPendingTxCount(): Promise<number>;
|
|
125
126
|
/**
|
|
126
127
|
* Method to retrieve a single tx from the mempool or unfinalised chain.
|
|
127
128
|
* @param txHash - The transaction hash to return.
|
|
@@ -242,5 +243,6 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
242
243
|
setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
|
|
243
244
|
getProtocolContractAddresses(): Promise<ProtocolContractAddresses>;
|
|
244
245
|
addContractArtifact(address: AztecAddress, artifact: ContractArtifact): Promise<void>;
|
|
246
|
+
flushTxs(): Promise<void>;
|
|
245
247
|
}
|
|
246
248
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,OAAO,EACP,YAAY,EACZ,0BAA0B,EAC1B,KAAK,YAAY,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,KAAK,eAAe,EACpB,WAAW,EACX,KAAK,EAAE,EACP,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,SAAS,EAET,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,cAAc,EAEnB,EAAE,EACF,KAAK,MAAM,EAEX,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAG1B,KAAK,uBAAuB,EAE7B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,mBAAmB,EAAuB,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,20 +8,20 @@ import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
|
8
8
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
9
9
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
10
10
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
11
|
-
import { sha256Trunc } from '@aztec/foundation/crypto';
|
|
12
11
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
13
12
|
import { Timer } from '@aztec/foundation/timer';
|
|
14
13
|
import { createStore, openTmpStore } from '@aztec/kv-store/utils';
|
|
15
14
|
import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
|
|
16
|
-
import { AztecKVTxPool, createP2PClient } from '@aztec/p2p';
|
|
15
|
+
import { AztecKVTxPool, InMemoryAttestationPool, createP2PClient } from '@aztec/p2p';
|
|
17
16
|
import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
|
|
18
17
|
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
19
18
|
import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
|
|
20
19
|
import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
|
|
21
20
|
import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
|
|
22
|
-
import { AggregateTxValidator, DataTxValidator,
|
|
21
|
+
import { AggregateTxValidator, DataTxValidator, GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
|
|
23
22
|
import { PublicProcessorFactory, WASMSimulator, createSimulationProvider } from '@aztec/simulator';
|
|
24
23
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
24
|
+
import { createValidatorClient } from '@aztec/validator-client';
|
|
25
25
|
import { MerkleTrees, createWorldStateSynchronizer } from '@aztec/world-state';
|
|
26
26
|
import { getPackageInfo } from './config.js';
|
|
27
27
|
import { NodeMetrics } from './node_metrics.js';
|
|
@@ -77,19 +77,20 @@ export class AztecNodeService {
|
|
|
77
77
|
// this may well change in future
|
|
78
78
|
config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
|
|
79
79
|
// create the tx pool and the p2p client, which will need the l2 block source
|
|
80
|
-
const p2pClient = await createP2PClient(config, store, new AztecKVTxPool(store, telemetry), archiver);
|
|
80
|
+
const p2pClient = await createP2PClient(config, store, new AztecKVTxPool(store, telemetry), new InMemoryAttestationPool(), archiver);
|
|
81
81
|
// now create the merkle trees and the world state synchronizer
|
|
82
|
-
const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver);
|
|
82
|
+
const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver, telemetry);
|
|
83
83
|
// start both and wait for them to sync from the block source
|
|
84
84
|
await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
|
|
85
85
|
const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
|
|
86
86
|
const txValidator = new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator(config.l1ChainId), new TxProofValidator(proofVerifier));
|
|
87
87
|
const simulationProvider = await createSimulationProvider(config, log);
|
|
88
|
+
const validatorClient = createValidatorClient(config, p2pClient);
|
|
88
89
|
// now create the sequencer
|
|
89
90
|
const sequencer = config.disableSequencer
|
|
90
91
|
? undefined
|
|
91
|
-
: await SequencerClient.new(config, p2pClient, worldStateSynchronizer, archiver, archiver, archiver, simulationProvider, telemetry);
|
|
92
|
-
return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version,
|
|
92
|
+
: await SequencerClient.new(config, validatorClient, p2pClient, worldStateSynchronizer, archiver, archiver, archiver, simulationProvider, telemetry);
|
|
93
|
+
return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version, new GlobalVariableBuilder(config), store, txValidator, telemetry, log);
|
|
93
94
|
}
|
|
94
95
|
/**
|
|
95
96
|
* Returns the sequencer client instance.
|
|
@@ -237,6 +238,9 @@ export class AztecNodeService {
|
|
|
237
238
|
getPendingTxs() {
|
|
238
239
|
return Promise.resolve(this.p2pClient.getTxs('pending'));
|
|
239
240
|
}
|
|
241
|
+
getPendingTxCount() {
|
|
242
|
+
return Promise.resolve(this.p2pClient.getTxs('pending').length);
|
|
243
|
+
}
|
|
240
244
|
/**
|
|
241
245
|
* Method to retrieve a single tx from the mempool or unfinalised chain.
|
|
242
246
|
* @param txHash - The transaction hash to return.
|
|
@@ -342,7 +346,7 @@ export class AztecNodeService {
|
|
|
342
346
|
const subtreePathOfL2ToL1Message = await l2toL1Subtrees[indexOfMsgTx].getSiblingPath(BigInt(indexOfMsgInSubtree), true);
|
|
343
347
|
let l2toL1SubtreeRoots = l2toL1Subtrees.map(t => Fr.fromBuffer(t.getRoot(true)));
|
|
344
348
|
if (l2toL1SubtreeRoots.length < 2) {
|
|
345
|
-
l2toL1SubtreeRoots = padArrayEnd(l2toL1SubtreeRoots, Fr.
|
|
349
|
+
l2toL1SubtreeRoots = padArrayEnd(l2toL1SubtreeRoots, Fr.ZERO, 2);
|
|
346
350
|
}
|
|
347
351
|
const maxTreeHeight = Math.ceil(Math.log2(l2toL1SubtreeRoots.length));
|
|
348
352
|
// The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
|
|
@@ -480,7 +484,7 @@ export class AztecNodeService {
|
|
|
480
484
|
// Instantiate merkle trees so uncommitted updates by this simulation are local to it.
|
|
481
485
|
// TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
|
|
482
486
|
// So simulation of public functions doesn't affect the merkle trees.
|
|
483
|
-
const merkleTrees = await MerkleTrees.new(this.merkleTreesDb, this.log);
|
|
487
|
+
const merkleTrees = await MerkleTrees.new(this.merkleTreesDb, new NoopTelemetryClient(), this.log);
|
|
484
488
|
const publicProcessorFactory = new PublicProcessorFactory(merkleTrees.asLatest(), this.contractDataSource, new WASMSimulator(), this.telemetry);
|
|
485
489
|
const processor = publicProcessorFactory.create(prevHeader, newGlobalVariables);
|
|
486
490
|
// REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
|
|
@@ -528,6 +532,13 @@ export class AztecNodeService {
|
|
|
528
532
|
addContractArtifact(address, artifact) {
|
|
529
533
|
return this.contractDataSource.addContractArtifact(address, artifact);
|
|
530
534
|
}
|
|
535
|
+
flushTxs() {
|
|
536
|
+
if (!this.sequencer) {
|
|
537
|
+
throw new Error(`Sequencer is not initialized`);
|
|
538
|
+
}
|
|
539
|
+
this.sequencer.flush();
|
|
540
|
+
return Promise.resolve();
|
|
541
|
+
}
|
|
531
542
|
}
|
|
532
543
|
_AztecNodeService_instances = new WeakSet(), _AztecNodeService_getWorldState =
|
|
533
544
|
/**
|
|
@@ -568,4 +579,4 @@ async function _AztecNodeService_syncWorldState() {
|
|
|
568
579
|
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
569
580
|
return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
|
|
570
581
|
};
|
|
571
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
582
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.50.1",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": "./dest/index.js",
|
|
@@ -56,23 +56,24 @@
|
|
|
56
56
|
]
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@aztec/archiver": "0.
|
|
60
|
-
"@aztec/bb-prover": "0.
|
|
61
|
-
"@aztec/circuit-types": "0.
|
|
62
|
-
"@aztec/circuits.js": "0.
|
|
63
|
-
"@aztec/ethereum": "0.
|
|
64
|
-
"@aztec/foundation": "0.
|
|
65
|
-
"@aztec/kv-store": "0.
|
|
66
|
-
"@aztec/l1-artifacts": "0.
|
|
67
|
-
"@aztec/merkle-tree": "0.
|
|
68
|
-
"@aztec/p2p": "0.
|
|
69
|
-
"@aztec/protocol-contracts": "0.
|
|
70
|
-
"@aztec/prover-client": "0.
|
|
71
|
-
"@aztec/sequencer-client": "0.
|
|
72
|
-
"@aztec/simulator": "0.
|
|
73
|
-
"@aztec/telemetry-client": "0.
|
|
74
|
-
"@aztec/types": "0.
|
|
75
|
-
"@aztec/
|
|
59
|
+
"@aztec/archiver": "0.50.1",
|
|
60
|
+
"@aztec/bb-prover": "0.50.1",
|
|
61
|
+
"@aztec/circuit-types": "0.50.1",
|
|
62
|
+
"@aztec/circuits.js": "0.50.1",
|
|
63
|
+
"@aztec/ethereum": "0.50.1",
|
|
64
|
+
"@aztec/foundation": "0.50.1",
|
|
65
|
+
"@aztec/kv-store": "0.50.1",
|
|
66
|
+
"@aztec/l1-artifacts": "0.50.1",
|
|
67
|
+
"@aztec/merkle-tree": "0.50.1",
|
|
68
|
+
"@aztec/p2p": "0.50.1",
|
|
69
|
+
"@aztec/protocol-contracts": "0.50.1",
|
|
70
|
+
"@aztec/prover-client": "0.50.1",
|
|
71
|
+
"@aztec/sequencer-client": "0.50.1",
|
|
72
|
+
"@aztec/simulator": "0.50.1",
|
|
73
|
+
"@aztec/telemetry-client": "0.50.1",
|
|
74
|
+
"@aztec/types": "0.50.1",
|
|
75
|
+
"@aztec/validator-client": "0.50.1",
|
|
76
|
+
"@aztec/world-state": "0.50.1",
|
|
76
77
|
"koa": "^2.14.2",
|
|
77
78
|
"koa-router": "^12.0.0",
|
|
78
79
|
"tslib": "^2.4.0"
|
package/src/aztec-node/config.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } f
|
|
|
3
3
|
import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p';
|
|
4
4
|
import { type ProverClientConfig, proverClientConfigMappings } from '@aztec/prover-client';
|
|
5
5
|
import { type SequencerClientConfig, sequencerClientConfigMappings } from '@aztec/sequencer-client';
|
|
6
|
+
import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client';
|
|
6
7
|
import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state';
|
|
7
8
|
|
|
8
9
|
import { readFileSync } from 'fs';
|
|
@@ -16,17 +17,22 @@ export { sequencerClientConfigMappings, SequencerClientConfig } from '@aztec/seq
|
|
|
16
17
|
*/
|
|
17
18
|
export type AztecNodeConfig = ArchiverConfig &
|
|
18
19
|
SequencerClientConfig &
|
|
20
|
+
ValidatorClientConfig &
|
|
19
21
|
ProverClientConfig &
|
|
20
22
|
WorldStateConfig &
|
|
21
23
|
Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
|
|
22
24
|
P2PConfig & {
|
|
23
25
|
/** Whether the sequencer is disabled for this node. */
|
|
24
26
|
disableSequencer: boolean;
|
|
27
|
+
|
|
28
|
+
/** Whether the validator is disabled for this node */
|
|
29
|
+
disableValidator: boolean;
|
|
25
30
|
};
|
|
26
31
|
|
|
27
32
|
export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
|
|
28
33
|
...archiverConfigMappings,
|
|
29
34
|
...sequencerClientConfigMappings,
|
|
35
|
+
...validatorClientConfigMappings,
|
|
30
36
|
...proverClientConfigMappings,
|
|
31
37
|
...worldStateConfigMappings,
|
|
32
38
|
...p2pConfigMappings,
|
|
@@ -35,6 +41,11 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
|
|
|
35
41
|
description: 'Whether the sequencer is disabled for this node.',
|
|
36
42
|
...booleanConfigHelper(),
|
|
37
43
|
},
|
|
44
|
+
disableValidator: {
|
|
45
|
+
env: 'VALIDATOR_DISABLED',
|
|
46
|
+
description: 'Whether the validator is disabled for this node.',
|
|
47
|
+
...booleanConfigHelper(),
|
|
48
|
+
},
|
|
38
49
|
};
|
|
39
50
|
|
|
40
51
|
/**
|
|
@@ -17,9 +17,9 @@ import {
|
|
|
17
17
|
import { FunctionSelector, Header } from '@aztec/circuits.js';
|
|
18
18
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
19
19
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
20
|
+
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
20
21
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
21
22
|
import { Fr } from '@aztec/foundation/fields';
|
|
22
|
-
import { BaseHashType } from '@aztec/foundation/hash';
|
|
23
23
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
24
24
|
|
|
25
25
|
/**
|
|
@@ -41,7 +41,7 @@ export function createAztecNodeRpcServer(node: AztecNode) {
|
|
|
41
41
|
TxEffect,
|
|
42
42
|
LogId,
|
|
43
43
|
TxHash,
|
|
44
|
-
|
|
44
|
+
Buffer32,
|
|
45
45
|
PublicDataWitness,
|
|
46
46
|
SiblingPath,
|
|
47
47
|
},
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -46,25 +46,18 @@ import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
|
|
|
46
46
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
47
47
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
48
48
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
49
|
-
import { sha256Trunc } from '@aztec/foundation/crypto';
|
|
50
49
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
51
50
|
import { Timer } from '@aztec/foundation/timer';
|
|
52
51
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
53
52
|
import { createStore, openTmpStore } from '@aztec/kv-store/utils';
|
|
54
53
|
import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
|
|
55
|
-
import { AztecKVTxPool, type P2P, createP2PClient } from '@aztec/p2p';
|
|
54
|
+
import { AztecKVTxPool, InMemoryAttestationPool, type P2P, createP2PClient } from '@aztec/p2p';
|
|
56
55
|
import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
|
|
57
56
|
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
58
57
|
import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
|
|
59
58
|
import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
|
|
60
59
|
import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
|
|
61
|
-
import {
|
|
62
|
-
AggregateTxValidator,
|
|
63
|
-
DataTxValidator,
|
|
64
|
-
type GlobalVariableBuilder,
|
|
65
|
-
SequencerClient,
|
|
66
|
-
getGlobalVariableBuilder,
|
|
67
|
-
} from '@aztec/sequencer-client';
|
|
60
|
+
import { AggregateTxValidator, DataTxValidator, GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
|
|
68
61
|
import { PublicProcessorFactory, WASMSimulator, createSimulationProvider } from '@aztec/simulator';
|
|
69
62
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
70
63
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
@@ -74,6 +67,7 @@ import {
|
|
|
74
67
|
type ContractInstanceWithAddress,
|
|
75
68
|
type ProtocolContractAddresses,
|
|
76
69
|
} from '@aztec/types/contracts';
|
|
70
|
+
import { createValidatorClient } from '@aztec/validator-client';
|
|
77
71
|
import { MerkleTrees, type WorldStateSynchronizer, createWorldStateSynchronizer } from '@aztec/world-state';
|
|
78
72
|
|
|
79
73
|
import { type AztecNodeConfig, getPackageInfo } from './config.js';
|
|
@@ -149,10 +143,16 @@ export class AztecNodeService implements AztecNode {
|
|
|
149
143
|
config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
|
|
150
144
|
|
|
151
145
|
// create the tx pool and the p2p client, which will need the l2 block source
|
|
152
|
-
const p2pClient = await createP2PClient(
|
|
146
|
+
const p2pClient = await createP2PClient(
|
|
147
|
+
config,
|
|
148
|
+
store,
|
|
149
|
+
new AztecKVTxPool(store, telemetry),
|
|
150
|
+
new InMemoryAttestationPool(),
|
|
151
|
+
archiver,
|
|
152
|
+
);
|
|
153
153
|
|
|
154
154
|
// now create the merkle trees and the world state synchronizer
|
|
155
|
-
const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver);
|
|
155
|
+
const worldStateSynchronizer = await createWorldStateSynchronizer(config, store, archiver, telemetry);
|
|
156
156
|
|
|
157
157
|
// start both and wait for them to sync from the block source
|
|
158
158
|
await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
|
|
@@ -166,11 +166,14 @@ export class AztecNodeService implements AztecNode {
|
|
|
166
166
|
|
|
167
167
|
const simulationProvider = await createSimulationProvider(config, log);
|
|
168
168
|
|
|
169
|
+
const validatorClient = createValidatorClient(config, p2pClient);
|
|
170
|
+
|
|
169
171
|
// now create the sequencer
|
|
170
172
|
const sequencer = config.disableSequencer
|
|
171
173
|
? undefined
|
|
172
174
|
: await SequencerClient.new(
|
|
173
175
|
config,
|
|
176
|
+
validatorClient,
|
|
174
177
|
p2pClient,
|
|
175
178
|
worldStateSynchronizer,
|
|
176
179
|
archiver,
|
|
@@ -192,7 +195,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
192
195
|
sequencer,
|
|
193
196
|
ethereumChain.chainInfo.id,
|
|
194
197
|
config.version,
|
|
195
|
-
|
|
198
|
+
new GlobalVariableBuilder(config),
|
|
196
199
|
store,
|
|
197
200
|
txValidator,
|
|
198
201
|
telemetry,
|
|
@@ -375,6 +378,10 @@ export class AztecNodeService implements AztecNode {
|
|
|
375
378
|
return Promise.resolve(this.p2pClient!.getTxs('pending'));
|
|
376
379
|
}
|
|
377
380
|
|
|
381
|
+
public getPendingTxCount() {
|
|
382
|
+
return Promise.resolve(this.p2pClient!.getTxs('pending').length);
|
|
383
|
+
}
|
|
384
|
+
|
|
378
385
|
/**
|
|
379
386
|
* Method to retrieve a single tx from the mempool or unfinalised chain.
|
|
380
387
|
* @param txHash - The transaction hash to return.
|
|
@@ -525,7 +532,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
525
532
|
|
|
526
533
|
let l2toL1SubtreeRoots = l2toL1Subtrees.map(t => Fr.fromBuffer(t.getRoot(true)));
|
|
527
534
|
if (l2toL1SubtreeRoots.length < 2) {
|
|
528
|
-
l2toL1SubtreeRoots = padArrayEnd(l2toL1SubtreeRoots, Fr.
|
|
535
|
+
l2toL1SubtreeRoots = padArrayEnd(l2toL1SubtreeRoots, Fr.ZERO, 2);
|
|
529
536
|
}
|
|
530
537
|
const maxTreeHeight = Math.ceil(Math.log2(l2toL1SubtreeRoots.length));
|
|
531
538
|
// The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
|
|
@@ -715,7 +722,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
715
722
|
// Instantiate merkle trees so uncommitted updates by this simulation are local to it.
|
|
716
723
|
// TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
|
|
717
724
|
// So simulation of public functions doesn't affect the merkle trees.
|
|
718
|
-
const merkleTrees = await MerkleTrees.new(this.merkleTreesDb, this.log);
|
|
725
|
+
const merkleTrees = await MerkleTrees.new(this.merkleTreesDb, new NoopTelemetryClient(), this.log);
|
|
719
726
|
|
|
720
727
|
const publicProcessorFactory = new PublicProcessorFactory(
|
|
721
728
|
merkleTrees.asLatest(),
|
|
@@ -791,6 +798,14 @@ export class AztecNodeService implements AztecNode {
|
|
|
791
798
|
return this.contractDataSource.addContractArtifact(address, artifact);
|
|
792
799
|
}
|
|
793
800
|
|
|
801
|
+
public flushTxs(): Promise<void> {
|
|
802
|
+
if (!this.sequencer) {
|
|
803
|
+
throw new Error(`Sequencer is not initialized`);
|
|
804
|
+
}
|
|
805
|
+
this.sequencer.flush();
|
|
806
|
+
return Promise.resolve();
|
|
807
|
+
}
|
|
808
|
+
|
|
794
809
|
/**
|
|
795
810
|
* Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
|
|
796
811
|
* @param blockNumber - The block number at which to get the data.
|