@aztec/aztec-node 0.41.0 → 0.42.0
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 +7 -0
- package/dest/aztec-node/config.d.ts.map +1 -1
- package/dest/aztec-node/config.js +12 -1
- package/dest/aztec-node/http_rpc_server.js +3 -3
- package/dest/aztec-node/server.d.ts +13 -5
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +58 -10
- package/dest/aztec-node/tx_validator/tx_metadata_validator.d.ts +8 -0
- package/dest/aztec-node/tx_validator/tx_metadata_validator.d.ts.map +1 -0
- package/dest/aztec-node/tx_validator/tx_metadata_validator.js +35 -0
- package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts +9 -0
- package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts.map +1 -0
- package/dest/aztec-node/tx_validator/tx_proof_validator.js +29 -0
- package/package.json +17 -15
- package/src/aztec-node/config.ts +13 -0
- package/src/aztec-node/http_rpc_server.ts +2 -2
- package/src/aztec-node/server.ts +85 -11
- package/src/aztec-node/tx_validator/tx_metadata_validator.ts +40 -0
- package/src/aztec-node/tx_validator/tx_proof_validator.ts +28 -0
|
@@ -18,4 +18,11 @@ export type AztecNodeConfig = ArchiverConfig & SequencerClientConfig & ProverCli
|
|
|
18
18
|
* @returns A valid aztec node config.
|
|
19
19
|
*/
|
|
20
20
|
export declare function getConfigEnvVars(): AztecNodeConfig;
|
|
21
|
+
/**
|
|
22
|
+
* Returns package name and version.
|
|
23
|
+
*/
|
|
24
|
+
export declare function getPackageInfo(): {
|
|
25
|
+
version: any;
|
|
26
|
+
name: any;
|
|
27
|
+
};
|
|
21
28
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/aztec-node/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAuC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,KAAK,kBAAkB,EAAoB,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,qBAAqB,EAAwC,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/aztec-node/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAuC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,KAAK,kBAAkB,EAAoB,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,qBAAqB,EAAwC,MAAM,yBAAyB,CAAC;AAO3G;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,cAAc,GAC1C,qBAAqB,GACrB,kBAAkB,GAClB,SAAS,GAAG;IACV,uDAAuD;IACvD,gBAAgB,EAAE,OAAO,CAAC;IAE1B,oDAAoD;IACpD,aAAa,EAAE,OAAO,CAAC;IAEvB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEJ;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,eAAe,CAelD;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAI7B"}
|
|
@@ -3,6 +3,9 @@ import { getP2PConfigEnvVars } from '@aztec/p2p';
|
|
|
3
3
|
import { getProverEnvVars } from '@aztec/prover-client';
|
|
4
4
|
import { getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client';
|
|
5
5
|
import { getConfigEnvVars as getWorldStateVars } from '@aztec/world-state';
|
|
6
|
+
import { readFileSync } from 'fs';
|
|
7
|
+
import { dirname, resolve } from 'path';
|
|
8
|
+
import { fileURLToPath } from 'url';
|
|
6
9
|
/**
|
|
7
10
|
* Returns the config of the aztec node from environment variables with reasonable defaults.
|
|
8
11
|
* @returns A valid aztec node config.
|
|
@@ -21,4 +24,12 @@ export function getConfigEnvVars() {
|
|
|
21
24
|
};
|
|
22
25
|
return allEnvVars;
|
|
23
26
|
}
|
|
24
|
-
|
|
27
|
+
/**
|
|
28
|
+
* Returns package name and version.
|
|
29
|
+
*/
|
|
30
|
+
export function getPackageInfo() {
|
|
31
|
+
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
|
|
32
|
+
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
33
|
+
return { version, name };
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBdUIsZ0JBQWdCLElBQUksZUFBZSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0YsT0FBTyxFQUFrQixtQkFBbUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNqRSxPQUFPLEVBQTJCLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakYsT0FBTyxFQUE4QixnQkFBZ0IsSUFBSSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNHLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQW1CcEM7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixNQUFNLEVBQUUsWUFBWSxFQUFFLGVBQWUsR0FBRyxFQUFFLEVBQUUsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztJQUV6RSxNQUFNLFVBQVUsR0FBb0I7UUFDbEMsR0FBRyxnQkFBZ0IsRUFBRTtRQUNyQixHQUFHLGVBQWUsRUFBRTtRQUNwQixHQUFHLG1CQUFtQixFQUFFO1FBQ3hCLEdBQUcsaUJBQWlCLEVBQUU7UUFDdEIsR0FBRyxnQkFBZ0IsRUFBRTtRQUNyQixnQkFBZ0IsRUFBRSxDQUFDLENBQUMsWUFBWTtRQUNoQyxXQUFXLEVBQUUsWUFBWTtRQUN6QixhQUFhLEVBQUUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQztLQUN2RCxDQUFDO0lBRUYsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGNBQWM7SUFDNUIsTUFBTSxlQUFlLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDL0YsTUFBTSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQy9FLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFDM0IsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EncryptedNoteL2BlockL2Logs, ExtendedUnencryptedL2Log, L2Block, LogId, NullifierMembershipWitness, PublicDataWitness, PublicSimulationOutput, SiblingPath, Tx, TxEffect, TxHash, TxReceipt, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
2
2
|
import { FunctionSelector, Header } from '@aztec/circuits.js';
|
|
3
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
@@ -27,7 +27,7 @@ export function createAztecNodeRpcServer(node) {
|
|
|
27
27
|
PublicSimulationOutput,
|
|
28
28
|
Tx,
|
|
29
29
|
TxReceipt,
|
|
30
|
-
|
|
30
|
+
EncryptedNoteL2BlockL2Logs,
|
|
31
31
|
UnencryptedL2BlockL2Logs,
|
|
32
32
|
NullifierMembershipWitness,
|
|
33
33
|
},
|
|
@@ -35,4 +35,4 @@ export function createAztecNodeRpcServer(node) {
|
|
|
35
35
|
['start', 'stop']);
|
|
36
36
|
return rpc;
|
|
37
37
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cF9ycGNfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvaHR0cF9ycGNfc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCwwQkFBMEIsRUFDMUIsd0JBQXdCLEVBQ3hCLE9BQU8sRUFDUCxLQUFLLEVBQ0wsMEJBQTBCLEVBQzFCLGlCQUFpQixFQUNqQixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLEVBQUUsRUFDRixRQUFRLEVBQ1IsTUFBTSxFQUNOLFNBQVMsRUFDVCx3QkFBd0IsR0FDekIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRWxFOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsd0JBQXdCLENBQUMsSUFBZTtJQUN0RCxNQUFNLEdBQUcsR0FBRyxJQUFJLGFBQWEsQ0FDM0IsSUFBSSxFQUNKO1FBQ0UsWUFBWTtRQUNaLFVBQVU7UUFDVix3QkFBd0I7UUFDeEIsRUFBRTtRQUNGLGdCQUFnQjtRQUNoQixNQUFNO1FBQ04sT0FBTztRQUNQLFFBQVE7UUFDUixLQUFLO1FBQ0wsTUFBTTtRQUNOLGlCQUFpQjtRQUNqQixXQUFXO0tBQ1osRUFDRDtRQUNFLHNCQUFzQjtRQUN0QixFQUFFO1FBQ0YsU0FBUztRQUNULDBCQUEwQjtRQUMxQix3QkFBd0I7UUFDeEIsMEJBQTBCO0tBQzNCO0lBQ0Qsc0RBQXNEO0lBQ3RELENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUNsQixDQUFDO0lBQ0YsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDIn0=
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { type AztecNode, type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, LogType, MerkleTreeId, NullifierMembershipWitness, type ProverClient, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, type SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
1
|
+
import { type AztecNode, type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, LogType, MerkleTreeId, NullifierMembershipWitness, type ProverClient, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, type SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt, type TxValidator } from '@aztec/circuit-types';
|
|
2
2
|
import { type ARCHIVE_HEIGHT, Fr, type Header, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type PUBLIC_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
3
3
|
import { type L1ContractAddresses } from '@aztec/ethereum';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
6
6
|
import { type P2P } from '@aztec/p2p';
|
|
7
7
|
import { type GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
|
|
8
|
-
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
8
|
+
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type ProtocolContractAddresses } from '@aztec/types/contracts';
|
|
9
9
|
import { type WorldStateSynchronizer } from '@aztec/world-state';
|
|
10
10
|
import { type AztecNodeConfig } from './config.js';
|
|
11
11
|
/**
|
|
@@ -13,7 +13,7 @@ import { type AztecNodeConfig } from './config.js';
|
|
|
13
13
|
*/
|
|
14
14
|
export declare class AztecNodeService implements AztecNode {
|
|
15
15
|
#private;
|
|
16
|
-
protected
|
|
16
|
+
protected config: AztecNodeConfig;
|
|
17
17
|
protected readonly p2pClient: P2P;
|
|
18
18
|
protected readonly blockSource: L2BlockSource;
|
|
19
19
|
protected readonly encryptedLogsSource: L2LogsSource;
|
|
@@ -27,8 +27,10 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
27
27
|
protected readonly globalVariableBuilder: GlobalVariableBuilder;
|
|
28
28
|
protected readonly merkleTreesDb: AztecKVStore;
|
|
29
29
|
private readonly prover;
|
|
30
|
+
private txValidator;
|
|
30
31
|
private log;
|
|
31
|
-
|
|
32
|
+
private packageVersion;
|
|
33
|
+
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: AztecKVStore, prover: ProverClient | undefined, txValidator: TxValidator, log?: import("@aztec/foundation/log").Logger);
|
|
32
34
|
/**
|
|
33
35
|
* initializes the Aztec Node, wait for component to sync.
|
|
34
36
|
* @param config - The configuration to be used by the aztec node.
|
|
@@ -40,7 +42,7 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
40
42
|
* @returns The sequencer client instance.
|
|
41
43
|
*/
|
|
42
44
|
getSequencer(): SequencerClient | undefined;
|
|
43
|
-
getProver(): ProverClient;
|
|
45
|
+
getProver(): ProverClient | undefined;
|
|
44
46
|
/**
|
|
45
47
|
* Method to return the currently deployed L1 contract addresses.
|
|
46
48
|
* @returns - The currently deployed L1 contract addresses.
|
|
@@ -69,6 +71,11 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
69
71
|
* @returns The block number.
|
|
70
72
|
*/
|
|
71
73
|
getBlockNumber(): Promise<number>;
|
|
74
|
+
/**
|
|
75
|
+
* Method to fetch the version of the package.
|
|
76
|
+
* @returns The node package version
|
|
77
|
+
*/
|
|
78
|
+
getNodeVersion(): Promise<string>;
|
|
72
79
|
/**
|
|
73
80
|
* Method to fetch the version of the rollup the node is connected to.
|
|
74
81
|
* @returns The rollup version.
|
|
@@ -226,5 +233,6 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
226
233
|
**/
|
|
227
234
|
simulatePublicCalls(tx: Tx): Promise<PublicSimulationOutput>;
|
|
228
235
|
setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
|
|
236
|
+
getProtocolContractAddresses(): Promise<ProtocolContractAddresses>;
|
|
229
237
|
}
|
|
230
238
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
var _AztecNodeService_instances, _AztecNodeService_getWorldState, _AztecNodeService_syncWorldState;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver';
|
|
4
|
-
import {
|
|
4
|
+
import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
|
|
5
|
+
import { AggregateTxValidator, LogType, MerkleTreeId, NullifierMembershipWitness, PublicDataWitness, PublicSimulationOutput, TxReceipt, TxStatus, partitionReverts, } from '@aztec/circuit-types';
|
|
5
6
|
import { EthAddress, Fr, INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '@aztec/circuits.js';
|
|
6
7
|
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
7
8
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
@@ -11,16 +12,24 @@ import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
|
|
|
11
12
|
import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils';
|
|
12
13
|
import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
|
|
13
14
|
import { AztecKVTxPool, createP2PClient } from '@aztec/p2p';
|
|
14
|
-
import {
|
|
15
|
+
import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
|
|
16
|
+
import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
|
|
17
|
+
import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
|
|
18
|
+
import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
|
|
19
|
+
import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
|
|
20
|
+
import { TxProver } from '@aztec/prover-client';
|
|
15
21
|
import { SequencerClient, getGlobalVariableBuilder } from '@aztec/sequencer-client';
|
|
16
22
|
import { PublicProcessorFactory, WASMSimulator } from '@aztec/simulator';
|
|
17
23
|
import { MerkleTrees, ServerWorldStateSynchronizer, getConfigEnvVars as getWorldStateConfig, } from '@aztec/world-state';
|
|
24
|
+
import { getPackageInfo } from './config.js';
|
|
18
25
|
import { getSimulationProvider } from './simulator-factory.js';
|
|
26
|
+
import { MetadataTxValidator } from './tx_validator/tx_metadata_validator.js';
|
|
27
|
+
import { TxProofValidator } from './tx_validator/tx_proof_validator.js';
|
|
19
28
|
/**
|
|
20
29
|
* The aztec node.
|
|
21
30
|
*/
|
|
22
31
|
export class AztecNodeService {
|
|
23
|
-
constructor(config, p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, chainId, version, globalVariableBuilder, merkleTreesDb, prover, log = createDebugLogger('aztec:node')) {
|
|
32
|
+
constructor(config, p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchronizer, sequencer, chainId, version, globalVariableBuilder, merkleTreesDb, prover, txValidator, log = createDebugLogger('aztec:node')) {
|
|
24
33
|
_AztecNodeService_instances.add(this);
|
|
25
34
|
this.config = config;
|
|
26
35
|
this.p2pClient = p2pClient;
|
|
@@ -36,7 +45,9 @@ export class AztecNodeService {
|
|
|
36
45
|
this.globalVariableBuilder = globalVariableBuilder;
|
|
37
46
|
this.merkleTreesDb = merkleTreesDb;
|
|
38
47
|
this.prover = prover;
|
|
48
|
+
this.txValidator = txValidator;
|
|
39
49
|
this.log = log;
|
|
50
|
+
this.packageVersion = getPackageInfo().version;
|
|
40
51
|
const message = `Started Aztec Node against chain 0x${chainId.toString(16)} with contracts - \n` +
|
|
41
52
|
`Rollup: ${config.l1Contracts.rollupAddress.toString()}\n` +
|
|
42
53
|
`Registry: ${config.l1Contracts.registryAddress.toString()}\n` +
|
|
@@ -79,16 +90,23 @@ export class AztecNodeService {
|
|
|
79
90
|
const worldStateSynchronizer = new ServerWorldStateSynchronizer(store, merkleTrees, archiver, worldStateConfig);
|
|
80
91
|
// start both and wait for them to sync from the block source
|
|
81
92
|
await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
|
|
93
|
+
const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
|
|
94
|
+
const txValidator = new AggregateTxValidator(new MetadataTxValidator(config.chainId), new TxProofValidator(proofVerifier));
|
|
82
95
|
// start the prover if we have been told to
|
|
83
96
|
const simulationProvider = await getSimulationProvider(config, log);
|
|
84
97
|
const prover = config.disableProver
|
|
85
|
-
?
|
|
86
|
-
: await TxProver.new(config,
|
|
98
|
+
? undefined
|
|
99
|
+
: await TxProver.new(config, await proofVerifier.getVerificationKeys(), worldStateSynchronizer, await archiver
|
|
100
|
+
.getBlock(-1)
|
|
101
|
+
.then(b => b?.header ?? worldStateSynchronizer.getCommitted().buildInitialHeader()));
|
|
102
|
+
if (!prover && !config.disableSequencer) {
|
|
103
|
+
throw new Error("Can't start a sequencer without a prover");
|
|
104
|
+
}
|
|
87
105
|
// now create the sequencer
|
|
88
106
|
const sequencer = config.disableSequencer
|
|
89
107
|
? undefined
|
|
90
108
|
: await SequencerClient.new(config, p2pClient, worldStateSynchronizer, archiver, archiver, archiver, prover, simulationProvider);
|
|
91
|
-
return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version, getGlobalVariableBuilder(config), store, prover, log);
|
|
109
|
+
return new AztecNodeService(config, p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchronizer, sequencer, ethereumChain.chainInfo.id, config.version, getGlobalVariableBuilder(config), store, prover, txValidator, log);
|
|
92
110
|
}
|
|
93
111
|
/**
|
|
94
112
|
* Returns the sequencer client instance.
|
|
@@ -138,6 +156,13 @@ export class AztecNodeService {
|
|
|
138
156
|
async getBlockNumber() {
|
|
139
157
|
return await this.blockSource.getBlockNumber();
|
|
140
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Method to fetch the version of the package.
|
|
161
|
+
* @returns The node package version
|
|
162
|
+
*/
|
|
163
|
+
getNodeVersion() {
|
|
164
|
+
return Promise.resolve(this.packageVersion);
|
|
165
|
+
}
|
|
141
166
|
/**
|
|
142
167
|
* Method to fetch the version of the rollup the node is connected to.
|
|
143
168
|
* @returns The rollup version.
|
|
@@ -183,6 +208,11 @@ export class AztecNodeService {
|
|
|
183
208
|
*/
|
|
184
209
|
async sendTx(tx) {
|
|
185
210
|
this.log.info(`Received tx ${tx.getTxHash()}`);
|
|
211
|
+
const [_, invalidTxs] = await this.txValidator.validateTxs([tx]);
|
|
212
|
+
if (invalidTxs.length > 0) {
|
|
213
|
+
this.log.warn(`Rejecting tx ${tx.getTxHash()} because of validation errors`);
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
186
216
|
await this.p2pClient.sendTx(tx);
|
|
187
217
|
}
|
|
188
218
|
async getTxReceipt(txHash) {
|
|
@@ -212,7 +242,7 @@ export class AztecNodeService {
|
|
|
212
242
|
await this.p2pClient.stop();
|
|
213
243
|
await this.worldStateSynchronizer.stop();
|
|
214
244
|
await this.blockSource.stop();
|
|
215
|
-
await this.prover
|
|
245
|
+
await this.prover?.stop();
|
|
216
246
|
this.log.info(`Stopped`);
|
|
217
247
|
}
|
|
218
248
|
/**
|
|
@@ -461,11 +491,29 @@ export class AztecNodeService {
|
|
|
461
491
|
}
|
|
462
492
|
this.log.debug(`Simulated tx ${tx.getTxHash()} succeeds`);
|
|
463
493
|
const [processedTx] = processedTxs;
|
|
464
|
-
return new PublicSimulationOutput(processedTx.encryptedLogs, processedTx.unencryptedLogs, processedTx.revertReason, processedTx.data.constants, processedTx.data.end, returns
|
|
494
|
+
return new PublicSimulationOutput(processedTx.encryptedLogs, processedTx.unencryptedLogs, processedTx.revertReason, processedTx.data.constants, processedTx.data.end, returns, processedTx.gasUsed);
|
|
465
495
|
}
|
|
466
496
|
async setConfig(config) {
|
|
497
|
+
const newConfig = { ...this.config, ...config };
|
|
467
498
|
this.sequencer?.updateSequencerConfig(config);
|
|
468
|
-
await this.prover
|
|
499
|
+
await this.prover?.updateProverConfig(config);
|
|
500
|
+
if (newConfig.realProofs !== this.config.realProofs) {
|
|
501
|
+
const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
|
|
502
|
+
this.txValidator = new AggregateTxValidator(new MetadataTxValidator(this.chainId), new TxProofValidator(proofVerifier));
|
|
503
|
+
await this.prover?.updateProverConfig({
|
|
504
|
+
vks: await proofVerifier.getVerificationKeys(),
|
|
505
|
+
});
|
|
506
|
+
}
|
|
507
|
+
this.config = newConfig;
|
|
508
|
+
}
|
|
509
|
+
getProtocolContractAddresses() {
|
|
510
|
+
return Promise.resolve({
|
|
511
|
+
classRegisterer: getCanonicalClassRegisterer().address,
|
|
512
|
+
gasToken: getCanonicalGasToken().address,
|
|
513
|
+
instanceDeployer: getCanonicalInstanceDeployer().address,
|
|
514
|
+
keyRegistry: getCanonicalKeyRegistryAddress(),
|
|
515
|
+
multiCallEntrypoint: getCanonicalMultiCallEntrypointAddress(),
|
|
516
|
+
});
|
|
469
517
|
}
|
|
470
518
|
}
|
|
471
519
|
_AztecNodeService_instances = new WeakSet(), _AztecNodeService_getWorldState =
|
|
@@ -507,4 +555,4 @@ async function _AztecNodeService_syncWorldState() {
|
|
|
507
555
|
const blockSourceHeight = await this.blockSource.getBlockNumber();
|
|
508
556
|
return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
|
|
509
557
|
};
|
|
510
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAsB,QAAQ,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC1G,OAAO,EAWL,OAAO,EACP,YAAY,EACZ,0BAA0B,EAG1B,iBAAiB,EACjB,sBAAsB,EAMtB,SAAS,EACT,QAAQ,EACR,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,UAAU,EACV,EAAE,EAEF,oBAAoB,EAIpB,mCAAmC,GAIpC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAA4B,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAY,eAAe,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAA8B,eAAe,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAChH,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMzE,OAAO,EACL,WAAW,EACX,4BAA4B,EAG5B,gBAAgB,IAAI,mBAAmB,GACxC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;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,aAA2B,EAC7B,MAAoB,EAC7B,MAAM,iBAAiB,CAAC,YAAY,CAAC;;QAd1B,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,CAAc;QAC7B,WAAM,GAAN,MAAM,CAAc;QAC7B,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,wBAAwB,MAAM,CAAC,WAAW,CAAC,yBAAyB,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,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,CAAC;YAClD,MAAM,IAAI,KAAK,CACb,mCAAmC,aAAa,CAAC,SAAS,CAAC,EAAE,oBAAoB,MAAM,CAAC,OAAO,EAAE,CAClG,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,kBAAkB,CACpC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,EAC1D,MAAM,CAAC,WAAW,CAAC,aAAa,EAChC,QAAQ,CACT,CAAC;QAEF,IAAI,QAAuB,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACxB,qCAAqC;YACrC,MAAM,aAAa,GAAG,IAAI,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YACrE,QAAQ,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtD,CAAC;QAED,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,KAAK,EAAE,MAAM,EAAE,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE3F,+DAA+D;QAC/D,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAqB,mBAAmB,EAAE,CAAC;QACjE,MAAM,sBAAsB,GAAG,IAAI,4BAA4B,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAEhH,6DAA6D;QAC7D,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEvE,2CAA2C;QAC3C,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa;YACjC,CAAC,CAAC,MAAM,WAAW,CAAC,GAAG,EAAE;YACzB,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;QAE3E,2BAA2B;QAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB;YACvC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,eAAe,CAAC,GAAG,CACvB,MAAM,EACN,SAAS,EACT,sBAAsB,EACtB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,kBAAkB,CACnB,CAAC;QAEN,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,KAAK,EACL,MAAM,EACN,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,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;IAEM,gBAAgB,CAAC,EAAM;QAC5B,OAAO,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEM,WAAW,CAAC,OAAqB;QACtC,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACI,OAAO,CACZ,IAAY,EACZ,KAAa,EACb,OAAgB;QAEhB,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,CAAoD,CAAC;IACpG,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,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,SAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,MAAc;QACtC,IAAI,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAEnF,8GAA8G;QAC9G,8GAA8G;QAC9G,kEAAkE;QAClE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC5E,IAAI,gBAAgB,EAAE,CAAC;YACrB,SAAS,GAAG,gBAAgB,CAAC;QAC/B,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,WAAW,CAAC,MAAc;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9C,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,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzB,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;;;;;;OAMG;IACI,KAAK,CAAC,aAAa,CACxB,WAA0B,EAC1B,MAAoB,EACpB,SAAa;QAEb,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,uBAAuB,CAClC,WAA0B,EAC1B,SAAiB;QAEjB,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,sBAAsB,CACjC,WAA0B,EAC1B,SAAiB;QAEjB,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,iCAAiC,CAC5C,WAA0B,EAC1B,aAAiB,EACjB,UAAU,GAAG,EAAE;QAEf,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC9F,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,cAAc,CAClD,YAAY,CAAC,qBAAqB,EAClC,KAAK,CACN,CAAC;QACF,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,qBAAqB,CAAC,aAAiB,EAAE,kBAAkB,GAAG,oBAAoB;QAC7F,MAAM,UAAU,GAAG,MAAM,CAAC,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACnH,OAAO,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC;IACzG,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,iCAAiC,CAC5C,WAA0B,EAC1B,aAAiB;QAEjB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAEpH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAErF,MAAM,oBAAoB,GAAG,MAAM,CACjC,cAAc,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAC7F,CAAC;QAEF,IAAI,oBAAoB,KAAK,CAAC,EAAE,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAC3F,CAAC;QAED,0DAA0D;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9E,8FAA8F;QAC9F,MAAM,IAAI,GAAG,IAAI,YAAY,CAC3B,YAAY,CAAC,IAAI,CAAC,EAClB,IAAI,WAAW,EAAE,EACjB,2BAA2B,EAC3B,UAAU,EACV,EAAE,EACF,EAAE,CACH,CAAC;QACF,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAExC,OAAO,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC;IACvF,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,qBAAqB,CAChC,WAA0B,EAC1B,SAAiB;QAEjB,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACrE,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CACnC,WAA0B,EAC1B,SAAiB;QAEjB,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,6BAA6B,CACxC,WAA0B,EAC1B,SAAa;QAEb,MAAM,EAAE,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,mBAAmB,GAAG,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACnF,MAAM,kBAAkB,GAAG,EAAE,CAAC,cAAc,CAC1C,YAAY,CAAC,cAAc,EAC3B,MAAM,CAAC,KAAK,CAAC,CACd,CAAC;QAEF,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEjG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,0BAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,YAAqC,EAAE,WAAW,CAAC,CAAC;IAC3G,CAAC;IAED;;;;;;;;;;;;;OAaG;IACI,KAAK,CAAC,gCAAgC,CAC3C,WAA0B,EAC1B,SAAa;QAEb,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;QAC7C,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,YAAY,GAAG,CAAC,MAAM,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,CAAE,CAAC;QAE9F,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,cAAc,CAClD,YAAY,CAAC,cAAc,EAC3B,MAAM,CAAC,KAAK,CAAC,CACd,CAAC;QACF,OAAO,IAAI,0BAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,YAAqC,EAAE,WAAW,CAAC,CAAC;IAC3G,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,WAA0B,EAAE,QAAY;QACrE,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,WAAW,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,eAAe,CACjD,YAAY,CAAC,gBAAgB,EAC7B,aAAa,CAAC,KAAK,CACpB,CAA+B,CAAC;YACjC,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,cAAc,CAC3C,YAAY,CAAC,gBAAgB,EAC7B,aAAa,CAAC,KAAK,CACpB,CAAC;YACF,OAAO,IAAI,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,kBAAkB,CAAC,QAAsB,EAAE,IAAQ;QAC9D,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,6BAA6B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE/D,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClH,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YACpD,OAAO,EAAE,CAAC,IAAI,CAAC;QACjB,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,eAAe,CACjD,YAAY,CAAC,gBAAgB,EAC7B,aAAa,CAAC,KAAK,CACpB,CAA+B,CAAC;QACjC,OAAO,QAAQ,CAAC,KAAK,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,SAAS;QACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QAED,yDAAyD;QACzD,MAAM,WAAW,GAAG,MAAM,uBAAA,IAAI,oEAAe,MAAnB,IAAI,EAAgB,QAAQ,CAAC,CAAC;QACxD,OAAO,MAAM,WAAW,CAAC,kBAAkB,EAAE,CAAC;IAChD,CAAC;IAED;;;QAGI;IACG,KAAK,CAAC,mBAAmB,CAAC,EAAM;QACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC;QAElE,oFAAoF;QACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC;QAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC;QAEvE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAC9E,IAAI,EAAE,CAAC,WAAW,CAAC,EACnB,QAAQ,EACR,YAAY,CACb,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAEjE,sFAAsF;QACtF,0GAA0G;QAC1G,qEAAqE;QACrE,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAExE,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CACvD,WAAW,CAAC,QAAQ,EAAE,EACtB,IAAI,CAAC,kBAAkB,EACvB,IAAI,aAAa,EAAE,CACpB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QACtF,kEAAkE;QAClE,MAAM,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACzE,qEAAqE;QACrE,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,WAAW,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAC7E,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3B,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;YACrF,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1D,MAAM,CAAC,WAAW,CAAC,GAAG,YAAY,CAAC;QACnC,OAAO,IAAI,sBAAsB,CAC/B,WAAW,CAAC,aAAa,EACzB,WAAW,CAAC,eAAe,EAC3B,WAAW,CAAC,YAAY,EACxB,WAAW,CAAC,IAAI,CAAC,SAAS,EAC1B,WAAW,CAAC,IAAI,CAAC,GAAG,EACpB,OAAO,CAAC,CAAC,CAAC,EACV,WAAW,CAAC,OAAO,CACpB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,MAA+C;QACpE,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CAwCF;;AAtCC;;;;GAIG;AACH,KAAK,0CAAgB,WAA0B;IAC7C,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,GAAG,oBAAoB,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,WAAW,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,aAAa,GAAW,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,+CAA+C;QAC/C,aAAa,GAAG,MAAM,uBAAA,IAAI,qEAAgB,MAApB,IAAI,CAAkB,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,uEAAuE;IACvE,IAAI,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,WAAW,6BAA6B,aAAa,EAAE,CAAC,CAAC;QACxG,OAAO,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;IACpD,CAAC;SAAM,IAAI,WAAW,GAAG,aAAa,EAAE,CAAC;QACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,WAAW,6BAA6B,aAAa,EAAE,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,SAAS,WAAW,iBAAiB,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK;IACH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IAClE,OAAO,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;AACtE,CAAC"}
|
|
558
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Tx, type TxValidator } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr } from '@aztec/circuits.js';
|
|
3
|
+
export declare class MetadataTxValidator implements TxValidator<Tx> {
|
|
4
|
+
#private;
|
|
5
|
+
constructor(chainId: number | Fr);
|
|
6
|
+
validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]>;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=tx_metadata_validator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tx_metadata_validator.d.ts","sourceRoot":"","sources":["../../../src/aztec-node/tx_validator/tx_metadata_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGxC,qBAAa,mBAAoB,YAAW,WAAW,CAAC,EAAE,CAAC;;gBAI7C,OAAO,EAAE,MAAM,GAAG,EAAE;IAIhC,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;CA2BpE"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
var _MetadataTxValidator_instances, _MetadataTxValidator_log, _MetadataTxValidator_chainId, _MetadataTxValidator_hasCorrectChainId;
|
|
2
|
+
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
+
import { Tx } from '@aztec/circuit-types';
|
|
4
|
+
import { Fr } from '@aztec/circuits.js';
|
|
5
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
|
+
export class MetadataTxValidator {
|
|
7
|
+
constructor(chainId) {
|
|
8
|
+
_MetadataTxValidator_instances.add(this);
|
|
9
|
+
_MetadataTxValidator_log.set(this, createDebugLogger('aztec:sequencer:tx_validator:tx_metadata'));
|
|
10
|
+
_MetadataTxValidator_chainId.set(this, void 0);
|
|
11
|
+
__classPrivateFieldSet(this, _MetadataTxValidator_chainId, new Fr(chainId), "f");
|
|
12
|
+
}
|
|
13
|
+
validateTxs(txs) {
|
|
14
|
+
const validTxs = [];
|
|
15
|
+
const invalidTxs = [];
|
|
16
|
+
for (const tx of txs) {
|
|
17
|
+
if (!__classPrivateFieldGet(this, _MetadataTxValidator_instances, "m", _MetadataTxValidator_hasCorrectChainId).call(this, tx)) {
|
|
18
|
+
invalidTxs.push(tx);
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
validTxs.push(tx);
|
|
22
|
+
}
|
|
23
|
+
return Promise.resolve([validTxs, invalidTxs]);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
_MetadataTxValidator_log = new WeakMap(), _MetadataTxValidator_chainId = new WeakMap(), _MetadataTxValidator_instances = new WeakSet(), _MetadataTxValidator_hasCorrectChainId = function _MetadataTxValidator_hasCorrectChainId(tx) {
|
|
27
|
+
if (!tx.data.constants.txContext.chainId.equals(__classPrivateFieldGet(this, _MetadataTxValidator_chainId, "f"))) {
|
|
28
|
+
__classPrivateFieldGet(this, _MetadataTxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because of incorrect chain ${tx.data.constants.txContext.chainId.toNumber()} != ${__classPrivateFieldGet(this, _MetadataTxValidator_chainId, "f").toNumber()}`);
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWV0YWRhdGFfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F6dGVjLW5vZGUvdHhfdmFsaWRhdG9yL3R4X21ldGFkYXRhX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQW9CLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQU0sT0FBTyxtQkFBbUI7SUFJOUIsWUFBWSxPQUFvQjs7UUFIaEMsbUNBQU8saUJBQWlCLENBQUMsMENBQTBDLENBQUMsRUFBQztRQUNyRSwrQ0FBYTtRQUdYLHVCQUFBLElBQUksZ0NBQVksSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQUEsQ0FBQztJQUNsQyxDQUFDO0lBRUQsV0FBVyxDQUFDLEdBQVM7UUFDbkIsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLE1BQU0sVUFBVSxHQUFTLEVBQUUsQ0FBQztRQUM1QixLQUFLLE1BQU0sRUFBRSxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyx1QkFBQSxJQUFJLDhFQUFtQixNQUF2QixJQUFJLEVBQW9CLEVBQUUsQ0FBQyxFQUFFLENBQUM7Z0JBQ2pDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BCLFNBQVM7WUFDWCxDQUFDO1lBRUQsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNwQixDQUFDO1FBRUQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUM7SUFDakQsQ0FBQztDQWNGO2lPQVpvQixFQUFNO0lBQ3ZCLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyx1QkFBQSxJQUFJLG9DQUFTLENBQUMsRUFBRSxDQUFDO1FBQy9ELHVCQUFBLElBQUksZ0NBQUssQ0FBQyxJQUFJLENBQ1osZ0JBQWdCLEVBQUUsQ0FBQyxPQUFPLENBQ3hCLEVBQUUsQ0FDSCwrQkFBK0IsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyx1QkFBQSxJQUFJLG9DQUFTLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FDaEgsQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type ClientProtocolCircuitVerifier, Tx, type TxValidator } from '@aztec/circuit-types';
|
|
2
|
+
export declare class TxProofValidator implements TxValidator<Tx> {
|
|
3
|
+
#private;
|
|
4
|
+
private verifier;
|
|
5
|
+
constructor(verifier: ClientProtocolCircuitVerifier);
|
|
6
|
+
validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]>;
|
|
7
|
+
validateTx(tx: Tx): Promise<boolean>;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=tx_proof_validator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tx_proof_validator.d.ts","sourceRoot":"","sources":["../../../src/aztec-node/tx_validator/tx_proof_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,6BAA6B,EAAE,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGhG,qBAAa,gBAAiB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG1C,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,6BAA6B;IAErD,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAgBzE,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGrC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
var _TxProofValidator_log;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
+
import { Tx } from '@aztec/circuit-types';
|
|
4
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
|
+
export class TxProofValidator {
|
|
6
|
+
constructor(verifier) {
|
|
7
|
+
this.verifier = verifier;
|
|
8
|
+
_TxProofValidator_log.set(this, createDebugLogger('aztec:sequencer:tx_validator:private_proof'));
|
|
9
|
+
}
|
|
10
|
+
async validateTxs(txs) {
|
|
11
|
+
const validTxs = [];
|
|
12
|
+
const invalidTxs = [];
|
|
13
|
+
for (const tx of txs) {
|
|
14
|
+
if (await this.verifier.verifyProof(tx)) {
|
|
15
|
+
validTxs.push(tx);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
__classPrivateFieldGet(this, _TxProofValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
|
|
19
|
+
invalidTxs.push(tx);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return [validTxs, invalidTxs];
|
|
23
|
+
}
|
|
24
|
+
validateTx(tx) {
|
|
25
|
+
return this.verifier.verifyProof(tx);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
_TxProofValidator_log = new WeakMap();
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvb2ZfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F6dGVjLW5vZGUvdHhfdmFsaWRhdG9yL3R4X3Byb29mX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBc0MsRUFBRSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQ2hHLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQU0sT0FBTyxnQkFBZ0I7SUFHM0IsWUFBb0IsUUFBdUM7UUFBdkMsYUFBUSxHQUFSLFFBQVEsQ0FBK0I7UUFGM0QsZ0NBQU8saUJBQWlCLENBQUMsNENBQTRDLENBQUMsRUFBQztJQUVULENBQUM7SUFFL0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxHQUFTO1FBQ3pCLE1BQU0sUUFBUSxHQUFTLEVBQUUsQ0FBQztRQUMxQixNQUFNLFVBQVUsR0FBUyxFQUFFLENBQUM7UUFFNUIsS0FBSyxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNyQixJQUFJLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDeEMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNwQixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sdUJBQUEsSUFBSSw2QkFBSyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsQ0FBQztnQkFDbkUsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN0QixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELFVBQVUsQ0FBQyxFQUFNO1FBQ2YsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0NBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.42.0",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": "./dest/index.js",
|
|
@@ -48,20 +48,22 @@
|
|
|
48
48
|
]
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@aztec/archiver": "0.
|
|
52
|
-
"@aztec/
|
|
53
|
-
"@aztec/
|
|
54
|
-
"@aztec/
|
|
55
|
-
"@aztec/
|
|
56
|
-
"@aztec/
|
|
57
|
-
"@aztec/
|
|
58
|
-
"@aztec/
|
|
59
|
-
"@aztec/
|
|
60
|
-
"@aztec/
|
|
61
|
-
"@aztec/
|
|
62
|
-
"@aztec/
|
|
63
|
-
"@aztec/
|
|
64
|
-
"@aztec/
|
|
51
|
+
"@aztec/archiver": "0.42.0",
|
|
52
|
+
"@aztec/bb-prover": "0.42.0",
|
|
53
|
+
"@aztec/circuit-types": "0.42.0",
|
|
54
|
+
"@aztec/circuits.js": "0.42.0",
|
|
55
|
+
"@aztec/ethereum": "0.42.0",
|
|
56
|
+
"@aztec/foundation": "0.42.0",
|
|
57
|
+
"@aztec/kv-store": "0.42.0",
|
|
58
|
+
"@aztec/l1-artifacts": "0.42.0",
|
|
59
|
+
"@aztec/merkle-tree": "0.42.0",
|
|
60
|
+
"@aztec/p2p": "0.42.0",
|
|
61
|
+
"@aztec/protocol-contracts": "0.42.0",
|
|
62
|
+
"@aztec/prover-client": "0.42.0",
|
|
63
|
+
"@aztec/sequencer-client": "0.42.0",
|
|
64
|
+
"@aztec/simulator": "0.42.0",
|
|
65
|
+
"@aztec/types": "0.42.0",
|
|
66
|
+
"@aztec/world-state": "0.42.0",
|
|
65
67
|
"koa": "^2.14.2",
|
|
66
68
|
"koa-router": "^12.0.0",
|
|
67
69
|
"tslib": "^2.4.0"
|
package/src/aztec-node/config.ts
CHANGED
|
@@ -4,6 +4,10 @@ import { type ProverClientConfig, getProverEnvVars } from '@aztec/prover-client'
|
|
|
4
4
|
import { type SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client';
|
|
5
5
|
import { getConfigEnvVars as getWorldStateVars } from '@aztec/world-state';
|
|
6
6
|
|
|
7
|
+
import { readFileSync } from 'fs';
|
|
8
|
+
import { dirname, resolve } from 'path';
|
|
9
|
+
import { fileURLToPath } from 'url';
|
|
10
|
+
|
|
7
11
|
/**
|
|
8
12
|
* The configuration the aztec node.
|
|
9
13
|
*/
|
|
@@ -41,3 +45,12 @@ export function getConfigEnvVars(): AztecNodeConfig {
|
|
|
41
45
|
|
|
42
46
|
return allEnvVars;
|
|
43
47
|
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Returns package name and version.
|
|
51
|
+
*/
|
|
52
|
+
export function getPackageInfo() {
|
|
53
|
+
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
|
|
54
|
+
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
55
|
+
return { version, name };
|
|
56
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type AztecNode,
|
|
3
|
-
|
|
3
|
+
EncryptedNoteL2BlockL2Logs,
|
|
4
4
|
ExtendedUnencryptedL2Log,
|
|
5
5
|
L2Block,
|
|
6
6
|
LogId,
|
|
@@ -46,7 +46,7 @@ export function createAztecNodeRpcServer(node: AztecNode) {
|
|
|
46
46
|
PublicSimulationOutput,
|
|
47
47
|
Tx,
|
|
48
48
|
TxReceipt,
|
|
49
|
-
|
|
49
|
+
EncryptedNoteL2BlockL2Logs,
|
|
50
50
|
UnencryptedL2BlockL2Logs,
|
|
51
51
|
NullifierMembershipWitness,
|
|
52
52
|
},
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type ArchiveSource, Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver';
|
|
2
|
+
import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
|
|
2
3
|
import {
|
|
4
|
+
AggregateTxValidator,
|
|
3
5
|
type AztecNode,
|
|
4
6
|
type FromLogType,
|
|
5
7
|
type GetUnencryptedLogsResponse,
|
|
@@ -24,6 +26,7 @@ import {
|
|
|
24
26
|
type TxHash,
|
|
25
27
|
TxReceipt,
|
|
26
28
|
TxStatus,
|
|
29
|
+
type TxValidator,
|
|
27
30
|
partitionReverts,
|
|
28
31
|
} from '@aztec/circuit-types';
|
|
29
32
|
import {
|
|
@@ -49,13 +52,19 @@ import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
|
|
|
49
52
|
import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils';
|
|
50
53
|
import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
|
|
51
54
|
import { AztecKVTxPool, type P2P, createP2PClient } from '@aztec/p2p';
|
|
52
|
-
import {
|
|
55
|
+
import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
|
|
56
|
+
import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
|
|
57
|
+
import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
|
|
58
|
+
import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
|
|
59
|
+
import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
|
|
60
|
+
import { TxProver } from '@aztec/prover-client';
|
|
53
61
|
import { type GlobalVariableBuilder, SequencerClient, getGlobalVariableBuilder } from '@aztec/sequencer-client';
|
|
54
62
|
import { PublicProcessorFactory, WASMSimulator } from '@aztec/simulator';
|
|
55
63
|
import {
|
|
56
64
|
type ContractClassPublic,
|
|
57
65
|
type ContractDataSource,
|
|
58
66
|
type ContractInstanceWithAddress,
|
|
67
|
+
type ProtocolContractAddresses,
|
|
59
68
|
} from '@aztec/types/contracts';
|
|
60
69
|
import {
|
|
61
70
|
MerkleTrees,
|
|
@@ -65,15 +74,19 @@ import {
|
|
|
65
74
|
getConfigEnvVars as getWorldStateConfig,
|
|
66
75
|
} from '@aztec/world-state';
|
|
67
76
|
|
|
68
|
-
import { type AztecNodeConfig } from './config.js';
|
|
77
|
+
import { type AztecNodeConfig, getPackageInfo } from './config.js';
|
|
69
78
|
import { getSimulationProvider } from './simulator-factory.js';
|
|
79
|
+
import { MetadataTxValidator } from './tx_validator/tx_metadata_validator.js';
|
|
80
|
+
import { TxProofValidator } from './tx_validator/tx_proof_validator.js';
|
|
70
81
|
|
|
71
82
|
/**
|
|
72
83
|
* The aztec node.
|
|
73
84
|
*/
|
|
74
85
|
export class AztecNodeService implements AztecNode {
|
|
86
|
+
private packageVersion: string;
|
|
87
|
+
|
|
75
88
|
constructor(
|
|
76
|
-
protected
|
|
89
|
+
protected config: AztecNodeConfig,
|
|
77
90
|
protected readonly p2pClient: P2P,
|
|
78
91
|
protected readonly blockSource: L2BlockSource,
|
|
79
92
|
protected readonly encryptedLogsSource: L2LogsSource,
|
|
@@ -86,9 +99,11 @@ export class AztecNodeService implements AztecNode {
|
|
|
86
99
|
protected readonly version: number,
|
|
87
100
|
protected readonly globalVariableBuilder: GlobalVariableBuilder,
|
|
88
101
|
protected readonly merkleTreesDb: AztecKVStore,
|
|
89
|
-
private readonly prover: ProverClient,
|
|
102
|
+
private readonly prover: ProverClient | undefined,
|
|
103
|
+
private txValidator: TxValidator,
|
|
90
104
|
private log = createDebugLogger('aztec:node'),
|
|
91
105
|
) {
|
|
106
|
+
this.packageVersion = getPackageInfo().version;
|
|
92
107
|
const message =
|
|
93
108
|
`Started Aztec Node against chain 0x${chainId.toString(16)} with contracts - \n` +
|
|
94
109
|
`Rollup: ${config.l1Contracts.rollupAddress.toString()}\n` +
|
|
@@ -145,11 +160,28 @@ export class AztecNodeService implements AztecNode {
|
|
|
145
160
|
// start both and wait for them to sync from the block source
|
|
146
161
|
await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
|
|
147
162
|
|
|
163
|
+
const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
|
|
164
|
+
const txValidator = new AggregateTxValidator(
|
|
165
|
+
new MetadataTxValidator(config.chainId),
|
|
166
|
+
new TxProofValidator(proofVerifier),
|
|
167
|
+
);
|
|
168
|
+
|
|
148
169
|
// start the prover if we have been told to
|
|
149
170
|
const simulationProvider = await getSimulationProvider(config, log);
|
|
150
171
|
const prover = config.disableProver
|
|
151
|
-
?
|
|
152
|
-
: await TxProver.new(
|
|
172
|
+
? undefined
|
|
173
|
+
: await TxProver.new(
|
|
174
|
+
config,
|
|
175
|
+
await proofVerifier.getVerificationKeys(),
|
|
176
|
+
worldStateSynchronizer,
|
|
177
|
+
await archiver
|
|
178
|
+
.getBlock(-1)
|
|
179
|
+
.then(b => b?.header ?? worldStateSynchronizer.getCommitted().buildInitialHeader()),
|
|
180
|
+
);
|
|
181
|
+
|
|
182
|
+
if (!prover && !config.disableSequencer) {
|
|
183
|
+
throw new Error("Can't start a sequencer without a prover");
|
|
184
|
+
}
|
|
153
185
|
|
|
154
186
|
// now create the sequencer
|
|
155
187
|
const sequencer = config.disableSequencer
|
|
@@ -161,7 +193,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
161
193
|
archiver,
|
|
162
194
|
archiver,
|
|
163
195
|
archiver,
|
|
164
|
-
prover
|
|
196
|
+
prover!,
|
|
165
197
|
simulationProvider,
|
|
166
198
|
);
|
|
167
199
|
|
|
@@ -180,6 +212,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
180
212
|
getGlobalVariableBuilder(config),
|
|
181
213
|
store,
|
|
182
214
|
prover,
|
|
215
|
+
txValidator,
|
|
183
216
|
log,
|
|
184
217
|
);
|
|
185
218
|
}
|
|
@@ -192,7 +225,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
192
225
|
return this.sequencer;
|
|
193
226
|
}
|
|
194
227
|
|
|
195
|
-
public getProver(): ProverClient {
|
|
228
|
+
public getProver(): ProverClient | undefined {
|
|
196
229
|
return this.prover;
|
|
197
230
|
}
|
|
198
231
|
|
|
@@ -239,6 +272,14 @@ export class AztecNodeService implements AztecNode {
|
|
|
239
272
|
return await this.blockSource.getBlockNumber();
|
|
240
273
|
}
|
|
241
274
|
|
|
275
|
+
/**
|
|
276
|
+
* Method to fetch the version of the package.
|
|
277
|
+
* @returns The node package version
|
|
278
|
+
*/
|
|
279
|
+
public getNodeVersion(): Promise<string> {
|
|
280
|
+
return Promise.resolve(this.packageVersion);
|
|
281
|
+
}
|
|
282
|
+
|
|
242
283
|
/**
|
|
243
284
|
* Method to fetch the version of the rollup the node is connected to.
|
|
244
285
|
* @returns The rollup version.
|
|
@@ -294,6 +335,13 @@ export class AztecNodeService implements AztecNode {
|
|
|
294
335
|
*/
|
|
295
336
|
public async sendTx(tx: Tx) {
|
|
296
337
|
this.log.info(`Received tx ${tx.getTxHash()}`);
|
|
338
|
+
|
|
339
|
+
const [_, invalidTxs] = await this.txValidator.validateTxs([tx]);
|
|
340
|
+
if (invalidTxs.length > 0) {
|
|
341
|
+
this.log.warn(`Rejecting tx ${tx.getTxHash()} because of validation errors`);
|
|
342
|
+
return;
|
|
343
|
+
}
|
|
344
|
+
|
|
297
345
|
await this.p2pClient!.sendTx(tx);
|
|
298
346
|
}
|
|
299
347
|
|
|
@@ -329,7 +377,7 @@ export class AztecNodeService implements AztecNode {
|
|
|
329
377
|
await this.p2pClient.stop();
|
|
330
378
|
await this.worldStateSynchronizer.stop();
|
|
331
379
|
await this.blockSource.stop();
|
|
332
|
-
await this.prover
|
|
380
|
+
await this.prover?.stop();
|
|
333
381
|
this.log.info(`Stopped`);
|
|
334
382
|
}
|
|
335
383
|
|
|
@@ -680,14 +728,40 @@ export class AztecNodeService implements AztecNode {
|
|
|
680
728
|
processedTx.revertReason,
|
|
681
729
|
processedTx.data.constants,
|
|
682
730
|
processedTx.data.end,
|
|
683
|
-
returns
|
|
731
|
+
returns,
|
|
684
732
|
processedTx.gasUsed,
|
|
685
733
|
);
|
|
686
734
|
}
|
|
687
735
|
|
|
688
736
|
public async setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void> {
|
|
737
|
+
const newConfig = { ...this.config, ...config };
|
|
689
738
|
this.sequencer?.updateSequencerConfig(config);
|
|
690
|
-
await this.prover
|
|
739
|
+
await this.prover?.updateProverConfig(config);
|
|
740
|
+
|
|
741
|
+
if (newConfig.realProofs !== this.config.realProofs) {
|
|
742
|
+
const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
|
|
743
|
+
|
|
744
|
+
this.txValidator = new AggregateTxValidator(
|
|
745
|
+
new MetadataTxValidator(this.chainId),
|
|
746
|
+
new TxProofValidator(proofVerifier),
|
|
747
|
+
);
|
|
748
|
+
|
|
749
|
+
await this.prover?.updateProverConfig({
|
|
750
|
+
vks: await proofVerifier.getVerificationKeys(),
|
|
751
|
+
});
|
|
752
|
+
}
|
|
753
|
+
|
|
754
|
+
this.config = newConfig;
|
|
755
|
+
}
|
|
756
|
+
|
|
757
|
+
public getProtocolContractAddresses(): Promise<ProtocolContractAddresses> {
|
|
758
|
+
return Promise.resolve({
|
|
759
|
+
classRegisterer: getCanonicalClassRegisterer().address,
|
|
760
|
+
gasToken: getCanonicalGasToken().address,
|
|
761
|
+
instanceDeployer: getCanonicalInstanceDeployer().address,
|
|
762
|
+
keyRegistry: getCanonicalKeyRegistryAddress(),
|
|
763
|
+
multiCallEntrypoint: getCanonicalMultiCallEntrypointAddress(),
|
|
764
|
+
});
|
|
691
765
|
}
|
|
692
766
|
|
|
693
767
|
/**
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { Tx, type TxValidator } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr } from '@aztec/circuits.js';
|
|
3
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
|
+
|
|
5
|
+
export class MetadataTxValidator implements TxValidator<Tx> {
|
|
6
|
+
#log = createDebugLogger('aztec:sequencer:tx_validator:tx_metadata');
|
|
7
|
+
#chainId: Fr;
|
|
8
|
+
|
|
9
|
+
constructor(chainId: number | Fr) {
|
|
10
|
+
this.#chainId = new Fr(chainId);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]> {
|
|
14
|
+
const validTxs: Tx[] = [];
|
|
15
|
+
const invalidTxs: Tx[] = [];
|
|
16
|
+
for (const tx of txs) {
|
|
17
|
+
if (!this.#hasCorrectChainId(tx)) {
|
|
18
|
+
invalidTxs.push(tx);
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
validTxs.push(tx);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return Promise.resolve([validTxs, invalidTxs]);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
#hasCorrectChainId(tx: Tx): boolean {
|
|
29
|
+
if (!tx.data.constants.txContext.chainId.equals(this.#chainId)) {
|
|
30
|
+
this.#log.warn(
|
|
31
|
+
`Rejecting tx ${Tx.getHash(
|
|
32
|
+
tx,
|
|
33
|
+
)} because of incorrect chain ${tx.data.constants.txContext.chainId.toNumber()} != ${this.#chainId.toNumber()}`,
|
|
34
|
+
);
|
|
35
|
+
return false;
|
|
36
|
+
} else {
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { type ClientProtocolCircuitVerifier, Tx, type TxValidator } from '@aztec/circuit-types';
|
|
2
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
|
+
|
|
4
|
+
export class TxProofValidator implements TxValidator<Tx> {
|
|
5
|
+
#log = createDebugLogger('aztec:sequencer:tx_validator:private_proof');
|
|
6
|
+
|
|
7
|
+
constructor(private verifier: ClientProtocolCircuitVerifier) {}
|
|
8
|
+
|
|
9
|
+
async validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]> {
|
|
10
|
+
const validTxs: Tx[] = [];
|
|
11
|
+
const invalidTxs: Tx[] = [];
|
|
12
|
+
|
|
13
|
+
for (const tx of txs) {
|
|
14
|
+
if (await this.verifier.verifyProof(tx)) {
|
|
15
|
+
validTxs.push(tx);
|
|
16
|
+
} else {
|
|
17
|
+
this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
|
|
18
|
+
invalidTxs.push(tx);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
return [validTxs, invalidTxs];
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
validateTx(tx: Tx): Promise<boolean> {
|
|
26
|
+
return this.verifier.verifyProof(tx);
|
|
27
|
+
}
|
|
28
|
+
}
|