@aztec/aztec-node 0.71.0 → 0.73.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 +2 -1
- package/dest/aztec-node/config.d.ts.map +1 -1
- package/dest/aztec-node/config.js +3 -1
- package/dest/aztec-node/http_rpc_server.js +3 -3
- package/dest/aztec-node/server.d.ts +6 -6
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +16 -17
- package/dest/bin/index.js +4 -1
- package/package.json +20 -20
- package/src/aztec-node/config.ts +3 -0
- package/src/aztec-node/http_rpc_server.ts +2 -2
- package/src/aztec-node/server.ts +20 -20
- package/src/bin/index.ts +3 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig } from '@aztec/archiver/config';
|
|
2
|
+
import { type BlobSinkConfig } from '@aztec/blob-sink/client';
|
|
2
3
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
3
4
|
import { type DataStoreConfig } from '@aztec/kv-store/config';
|
|
4
5
|
import { type P2PConfig } from '@aztec/p2p/config';
|
|
@@ -10,7 +11,7 @@ export { sequencerClientConfigMappings, SequencerClientConfig };
|
|
|
10
11
|
/**
|
|
11
12
|
* The configuration the aztec node.
|
|
12
13
|
*/
|
|
13
|
-
export type AztecNodeConfig = ArchiverConfig & SequencerClientConfig & ValidatorClientConfig & ProverClientConfig & WorldStateConfig & Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> & P2PConfig & {
|
|
14
|
+
export type AztecNodeConfig = ArchiverConfig & BlobSinkConfig & SequencerClientConfig & ValidatorClientConfig & ProverClientConfig & WorldStateConfig & Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> & P2PConfig & {
|
|
14
15
|
/** Whether the validator is disabled for this node */
|
|
15
16
|
disableValidator: boolean;
|
|
16
17
|
} & DataStoreConfig;
|
|
@@ -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,wBAAwB,CAAC;AACrF,OAAO,EAAE,KAAK,kBAAkB,EAA8C,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,KAAK,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAM5F,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,CAAC;AAEhE;;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,sDAAsD;IACtD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,GAAG,eAAe,CAAC;AAEtB,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,wBAAwB,CAAC;AACrF,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,KAAK,kBAAkB,EAA8C,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,KAAK,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAM5F,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,CAAC;AAEhE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,cAAc,GAC1C,cAAc,GACd,qBAAqB,GACrB,qBAAqB,GACrB,kBAAkB,GAClB,gBAAgB,GAChB,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,oBAAoB,GAAG,YAAY,CAAC,GAC9E,SAAS,GAAG;IACV,sDAAsD;IACtD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,GAAG,eAAe,CAAC;AAEtB,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAcvE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,eAAe,CAElD;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAI7B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
+
import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
|
|
2
3
|
import { booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
|
|
3
4
|
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
4
5
|
import { p2pConfigMappings } from '@aztec/p2p/config';
|
|
@@ -18,6 +19,7 @@ export const aztecNodeConfigMappings = {
|
|
|
18
19
|
...worldStateConfigMappings,
|
|
19
20
|
...p2pConfigMappings,
|
|
20
21
|
...dataConfigMappings,
|
|
22
|
+
...blobSinkConfigMapping,
|
|
21
23
|
disableValidator: {
|
|
22
24
|
env: 'VALIDATOR_DISABLED',
|
|
23
25
|
description: 'Whether the validator is disabled for this node.',
|
|
@@ -39,4 +41,4 @@ export function getPackageInfo() {
|
|
|
39
41
|
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
40
42
|
return { version, name };
|
|
41
43
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBdUIsc0JBQXNCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRixPQUFPLEVBQXVCLHFCQUFxQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckYsT0FBTyxFQUEyQixtQkFBbUIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQy9HLE9BQU8sRUFBd0Isa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNsRixPQUFPLEVBQWtCLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEUsT0FBTyxFQUEyQiwwQkFBMEIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2xHLE9BQU8sRUFBOEIsNkJBQTZCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMzRyxPQUFPLEVBQThCLDZCQUE2QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDM0csT0FBTyxFQUF5Qix3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTVGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUVwQyxPQUFPLEVBQUUsNkJBQTZCLEVBQXlCLENBQUM7QUFpQmhFLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUF3QztJQUMxRSxHQUFHLHNCQUFzQjtJQUN6QixHQUFHLDZCQUE2QjtJQUNoQyxHQUFHLDZCQUE2QjtJQUNoQyxHQUFHLDBCQUEwQjtJQUM3QixHQUFHLHdCQUF3QjtJQUMzQixHQUFHLGlCQUFpQjtJQUNwQixHQUFHLGtCQUFrQjtJQUNyQixHQUFHLHFCQUFxQjtJQUN4QixnQkFBZ0IsRUFBRTtRQUNoQixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSxrREFBa0Q7UUFDL0QsR0FBRyxtQkFBbUIsRUFBRTtLQUN6QjtDQUNGLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCO0lBQzlCLE9BQU8scUJBQXFCLENBQWtCLHVCQUF1QixDQUFDLENBQUM7QUFDekUsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGNBQWM7SUFDNUIsTUFBTSxlQUFlLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDL0YsTUFBTSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQy9FLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFDM0IsQ0FBQyJ9
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { AztecNodeApiSchema } from '@aztec/circuit-types';
|
|
2
|
-
import {
|
|
2
|
+
import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
|
|
3
3
|
/**
|
|
4
4
|
* Wrap an AztecNode instance with a JSON RPC HTTP server.
|
|
5
5
|
* @param node - The AztecNode
|
|
6
6
|
* @returns An JSON-RPC HTTP server
|
|
7
7
|
*/
|
|
8
8
|
export function createAztecNodeRpcServer(node) {
|
|
9
|
-
return
|
|
9
|
+
return createTracedJsonRpcServer(node, AztecNodeApiSchema);
|
|
10
10
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cF9ycGNfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvaHR0cF9ycGNfc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBa0Isa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVwRTs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHdCQUF3QixDQUFDLElBQWU7SUFDdEQsT0FBTyx5QkFBeUIsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztBQUM3RCxDQUFDIn0=
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
|
|
2
|
-
import { type AztecNode, type ClientProtocolCircuitVerifier, type EpochProofQuote, type
|
|
2
|
+
import { type AztecNode, type ClientProtocolCircuitVerifier, type EpochProofQuote, type GetContractClassLogsResponse, type GetPublicLogsResponse, type InBlock, type L1ToL2MessageSource, type L2Block, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, MerkleTreeId, NullifierMembershipWitness, type NullifierWithBlockSource, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, type Service, SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt, type TxScopedL2Log, type TxValidationResult, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
3
3
|
import { type ARCHIVE_HEIGHT, type BlockHeader, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, Fr, type GasFees, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type NodeInfo, type PUBLIC_DATA_TREE_HEIGHT, type PrivateLog, type ProtocolContractAddresses } from '@aztec/circuits.js';
|
|
4
4
|
import { type L1ContractAddresses } from '@aztec/ethereum';
|
|
5
5
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
6
|
import { type Logger } from '@aztec/foundation/log';
|
|
7
7
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
8
8
|
import { type P2P } from '@aztec/p2p';
|
|
9
|
-
import { GlobalVariableBuilder, type
|
|
9
|
+
import { GlobalVariableBuilder, SequencerClient, type SequencerPublisher } from '@aztec/sequencer-client';
|
|
10
10
|
import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
11
11
|
import { type AztecNodeConfig } from './config.js';
|
|
12
12
|
/**
|
|
@@ -44,7 +44,7 @@ export declare class AztecNodeService implements AztecNode, Traceable {
|
|
|
44
44
|
static createAndSync(config: AztecNodeConfig, deps?: {
|
|
45
45
|
telemetry?: TelemetryClient;
|
|
46
46
|
logger?: Logger;
|
|
47
|
-
publisher?:
|
|
47
|
+
publisher?: SequencerPublisher;
|
|
48
48
|
dateProvider?: DateProvider;
|
|
49
49
|
blobSinkClient?: BlobSinkClientInterface;
|
|
50
50
|
}): Promise<AztecNodeService>;
|
|
@@ -124,17 +124,17 @@ export declare class AztecNodeService implements AztecNode, Traceable {
|
|
|
124
124
|
*/
|
|
125
125
|
getLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]>;
|
|
126
126
|
/**
|
|
127
|
-
* Gets
|
|
127
|
+
* Gets public logs based on the provided filter.
|
|
128
128
|
* @param filter - The filter to apply to the logs.
|
|
129
129
|
* @returns The requested logs.
|
|
130
130
|
*/
|
|
131
|
-
|
|
131
|
+
getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse>;
|
|
132
132
|
/**
|
|
133
133
|
* Gets contract class logs based on the provided filter.
|
|
134
134
|
* @param filter - The filter to apply to the logs.
|
|
135
135
|
* @returns The requested logs.
|
|
136
136
|
*/
|
|
137
|
-
getContractClassLogs(filter: LogFilter): Promise<
|
|
137
|
+
getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
|
|
138
138
|
/**
|
|
139
139
|
* Method to submit a transaction to the p2p pool.
|
|
140
140
|
* @param tx - The transaction to be submitted.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EACL,KAAK,SAAS,EACd,KAAK,6BAA6B,EAClC,KAAK,eAAe,EACpB,KAAK,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ let AztecNodeService = (() => {
|
|
|
69
69
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
70
70
|
const log = deps.logger ?? createLogger('node');
|
|
71
71
|
const dateProvider = deps.dateProvider ?? new DateProvider();
|
|
72
|
-
const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config
|
|
72
|
+
const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
|
|
73
73
|
const ethereumChain = createEthereumChain(config.l1RpcUrl, config.l1ChainId);
|
|
74
74
|
//validate that the actual chain id matches that specified in configuration
|
|
75
75
|
if (config.l1ChainId !== ethereumChain.chainInfo.id) {
|
|
@@ -226,7 +226,7 @@ let AztecNodeService = (() => {
|
|
|
226
226
|
// to emit the corresponding nullifier, which is now being checked. Note that this method
|
|
227
227
|
// is only called by the PXE to check if a contract is publicly registered.
|
|
228
228
|
if (klazz) {
|
|
229
|
-
const classNullifier = siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
229
|
+
const classNullifier = await siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
230
230
|
const worldState = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, 'latest');
|
|
231
231
|
const [index] = await worldState.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [classNullifier.toBuffer()]);
|
|
232
232
|
this.log.debug(`Registration nullifier ${classNullifier} for contract class ${id} found at index ${index}`);
|
|
@@ -258,12 +258,12 @@ let AztecNodeService = (() => {
|
|
|
258
258
|
return this.logsSource.getLogsByTags(tags);
|
|
259
259
|
}
|
|
260
260
|
/**
|
|
261
|
-
* Gets
|
|
261
|
+
* Gets public logs based on the provided filter.
|
|
262
262
|
* @param filter - The filter to apply to the logs.
|
|
263
263
|
* @returns The requested logs.
|
|
264
264
|
*/
|
|
265
|
-
|
|
266
|
-
return this.logsSource.
|
|
265
|
+
getPublicLogs(filter) {
|
|
266
|
+
return this.logsSource.getPublicLogs(filter);
|
|
267
267
|
}
|
|
268
268
|
/**
|
|
269
269
|
* Gets contract class logs based on the provided filter.
|
|
@@ -279,7 +279,7 @@ let AztecNodeService = (() => {
|
|
|
279
279
|
*/
|
|
280
280
|
async sendTx(tx) {
|
|
281
281
|
const timer = new Timer();
|
|
282
|
-
const txHash = tx.getTxHash().toString();
|
|
282
|
+
const txHash = (await tx.getTxHash()).toString();
|
|
283
283
|
const valid = await this.isValidTx(tx);
|
|
284
284
|
if (valid.result !== 'valid') {
|
|
285
285
|
const reason = valid.reason.join(', ');
|
|
@@ -291,14 +291,14 @@ let AztecNodeService = (() => {
|
|
|
291
291
|
}
|
|
292
292
|
await this.p2pClient.sendTx(tx);
|
|
293
293
|
this.metrics.receivedTx(timer.ms(), true);
|
|
294
|
-
this.log.info(`Received tx ${
|
|
294
|
+
this.log.info(`Received tx ${txHash}`, { txHash });
|
|
295
295
|
}
|
|
296
296
|
async getTxReceipt(txHash) {
|
|
297
297
|
let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
|
|
298
298
|
// We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
|
|
299
299
|
// for mined and then for pending there could be a race condition where the tx is mined between the two checks
|
|
300
300
|
// and we would incorrectly return a TxReceipt with status DROPPED
|
|
301
|
-
if (this.p2pClient.getTxStatus(txHash) === 'pending') {
|
|
301
|
+
if ((await this.p2pClient.getTxStatus(txHash)) === 'pending') {
|
|
302
302
|
txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
|
|
303
303
|
}
|
|
304
304
|
const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
|
|
@@ -563,7 +563,7 @@ let AztecNodeService = (() => {
|
|
|
563
563
|
*/
|
|
564
564
|
async getPublicStorageAt(contract, slot, blockNumber) {
|
|
565
565
|
const committedDb = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, blockNumber);
|
|
566
|
-
const leafSlot = computePublicDataTreeLeafSlot(contract, slot);
|
|
566
|
+
const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
|
|
567
567
|
const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
|
|
568
568
|
if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
|
|
569
569
|
return Fr.ZERO;
|
|
@@ -584,13 +584,12 @@ let AztecNodeService = (() => {
|
|
|
584
584
|
* @param tx - The transaction to simulate.
|
|
585
585
|
**/
|
|
586
586
|
async simulatePublicCalls(tx, enforceFeePayment = true) {
|
|
587
|
-
const txHash = tx.getTxHash();
|
|
587
|
+
const txHash = await tx.getTxHash();
|
|
588
588
|
const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
|
|
589
589
|
// If sequencer is not initialized, we just set these values to zero for simulation.
|
|
590
590
|
const coinbase = this.sequencer?.coinbase || EthAddress.ZERO;
|
|
591
591
|
const feeRecipient = this.sequencer?.feeRecipient || AztecAddress.ZERO;
|
|
592
592
|
const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(new Fr(blockNumber), coinbase, feeRecipient);
|
|
593
|
-
const prevHeader = (await this.blockSource.getBlock(-1))?.header;
|
|
594
593
|
const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, new DateProvider(), this.telemetry);
|
|
595
594
|
const fork = await this.worldStateSynchronizer.fork();
|
|
596
595
|
this.log.verbose(`Simulating public calls for tx ${tx.getTxHash()}`, {
|
|
@@ -599,7 +598,7 @@ let AztecNodeService = (() => {
|
|
|
599
598
|
blockNumber,
|
|
600
599
|
});
|
|
601
600
|
try {
|
|
602
|
-
const processor = publicProcessorFactory.create(fork,
|
|
601
|
+
const processor = publicProcessorFactory.create(fork, newGlobalVariables, enforceFeePayment);
|
|
603
602
|
// REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
|
|
604
603
|
const [processedTxs, failedTxs, returns] = await processor.process([tx]);
|
|
605
604
|
// REFACTOR: Consider returning the error rather than throwing
|
|
@@ -622,14 +621,14 @@ let AztecNodeService = (() => {
|
|
|
622
621
|
blockNumber,
|
|
623
622
|
l1ChainId: this.l1ChainId,
|
|
624
623
|
enforceFees: !!this.config.enforceFees,
|
|
625
|
-
setupAllowList: this.config.allowedInSetup ?? getDefaultAllowedSetupFunctions(),
|
|
624
|
+
setupAllowList: this.config.allowedInSetup ?? (await getDefaultAllowedSetupFunctions()),
|
|
626
625
|
gasFees: await this.getCurrentBaseFees(),
|
|
627
626
|
});
|
|
628
627
|
return await validator.validateTx(tx);
|
|
629
628
|
}
|
|
630
629
|
async setConfig(config) {
|
|
631
630
|
const newConfig = { ...this.config, ...config };
|
|
632
|
-
this.sequencer?.updateSequencerConfig(config);
|
|
631
|
+
await this.sequencer?.updateSequencerConfig(config);
|
|
633
632
|
if (newConfig.realProofs !== this.config.realProofs) {
|
|
634
633
|
this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
|
|
635
634
|
}
|
|
@@ -702,8 +701,8 @@ let AztecNodeService = (() => {
|
|
|
702
701
|
},
|
|
703
702
|
(() => {
|
|
704
703
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
705
|
-
_simulatePublicCalls_decorators = [trackSpan('AztecNodeService.simulatePublicCalls', (tx) => ({
|
|
706
|
-
[Attributes.TX_HASH]: tx.getTxHash().toString(),
|
|
704
|
+
_simulatePublicCalls_decorators = [trackSpan('AztecNodeService.simulatePublicCalls', async (tx) => ({
|
|
705
|
+
[Attributes.TX_HASH]: (await tx.getTxHash()).toString(),
|
|
707
706
|
}))];
|
|
708
707
|
__esDecorate(_a, null, _simulatePublicCalls_decorators, { kind: "method", name: "simulatePublicCalls", static: false, private: false, access: { has: obj => "simulatePublicCalls" in obj, get: obj => obj.simulatePublicCalls }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
709
708
|
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
@@ -711,4 +710,4 @@ let AztecNodeService = (() => {
|
|
|
711
710
|
_a;
|
|
712
711
|
})();
|
|
713
712
|
export { AztecNodeService };
|
|
714
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
713
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
package/dest/bin/index.js
CHANGED
|
@@ -22,10 +22,13 @@ async function main() {
|
|
|
22
22
|
await aztecNode.stop();
|
|
23
23
|
process.exit(0);
|
|
24
24
|
};
|
|
25
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
25
26
|
process.once('SIGINT', shutdown);
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
26
28
|
process.once('SIGTERM', shutdown);
|
|
27
29
|
const rpcServer = createAztecNodeRpcServer(aztecNode);
|
|
28
30
|
const app = rpcServer.getApp(API_PREFIX);
|
|
31
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
29
32
|
const httpServer = http.createServer(app.callback());
|
|
30
33
|
httpServer.listen(+AZTEC_NODE_PORT);
|
|
31
34
|
logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
|
|
@@ -34,4 +37,4 @@ main().catch(err => {
|
|
|
34
37
|
logger.error(err);
|
|
35
38
|
process.exit(1);
|
|
36
39
|
});
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFckQsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRXhCLE9BQU8sRUFBd0IsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFakgsTUFBTSxFQUFFLGVBQWUsR0FBRyxJQUFJLEVBQUUsVUFBVSxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7QUFFaEUsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRXBDOztHQUVHO0FBQ0gsS0FBSyxVQUFVLHdCQUF3QjtJQUNyQyxNQUFNLGVBQWUsR0FBb0IsRUFBRSxHQUFHLGdCQUFnQixFQUFFLEVBQUUsQ0FBQztJQUVuRSxPQUFPLE1BQU0sZ0JBQWdCLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7R0FFRztBQUNILEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsMEJBQTBCLENBQUMsQ0FBQztJQUV4QyxNQUFNLFNBQVMsR0FBRyxNQUFNLHdCQUF3QixFQUFFLENBQUM7SUFFbkQsTUFBTSxRQUFRLEdBQUcsS0FBSyxJQUFJLEVBQUU7UUFDMUIsTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQ2hDLE1BQU0sU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQyxDQUFDO0lBRUYsa0VBQWtFO0lBQ2xFLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLGtFQUFrRTtJQUNsRSxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUVsQyxNQUFNLFNBQVMsR0FBRyx3QkFBd0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN0RCxNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXpDLGtFQUFrRTtJQUNsRSxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3JELFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNwQyxNQUFNLENBQUMsSUFBSSxDQUFDLGdEQUFnRCxlQUFlLEVBQUUsQ0FBQyxDQUFDO0FBQ2pGLENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7SUFDakIsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNsQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec-node",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.73.0",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -62,25 +62,25 @@
|
|
|
62
62
|
]
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@aztec/archiver": "0.
|
|
66
|
-
"@aztec/bb-prover": "0.
|
|
67
|
-
"@aztec/blob-sink": "0.
|
|
68
|
-
"@aztec/circuit-types": "0.
|
|
69
|
-
"@aztec/circuits.js": "0.
|
|
70
|
-
"@aztec/epoch-cache": "0.
|
|
71
|
-
"@aztec/ethereum": "0.
|
|
72
|
-
"@aztec/foundation": "0.
|
|
73
|
-
"@aztec/kv-store": "0.
|
|
74
|
-
"@aztec/merkle-tree": "0.
|
|
75
|
-
"@aztec/p2p": "0.
|
|
76
|
-
"@aztec/protocol-contracts": "0.
|
|
77
|
-
"@aztec/prover-client": "0.
|
|
78
|
-
"@aztec/sequencer-client": "0.
|
|
79
|
-
"@aztec/simulator": "0.
|
|
80
|
-
"@aztec/telemetry-client": "0.
|
|
81
|
-
"@aztec/types": "0.
|
|
82
|
-
"@aztec/validator-client": "0.
|
|
83
|
-
"@aztec/world-state": "0.
|
|
65
|
+
"@aztec/archiver": "0.73.0",
|
|
66
|
+
"@aztec/bb-prover": "0.73.0",
|
|
67
|
+
"@aztec/blob-sink": "0.73.0",
|
|
68
|
+
"@aztec/circuit-types": "0.73.0",
|
|
69
|
+
"@aztec/circuits.js": "0.73.0",
|
|
70
|
+
"@aztec/epoch-cache": "0.73.0",
|
|
71
|
+
"@aztec/ethereum": "0.73.0",
|
|
72
|
+
"@aztec/foundation": "0.73.0",
|
|
73
|
+
"@aztec/kv-store": "0.73.0",
|
|
74
|
+
"@aztec/merkle-tree": "0.73.0",
|
|
75
|
+
"@aztec/p2p": "0.73.0",
|
|
76
|
+
"@aztec/protocol-contracts": "0.73.0",
|
|
77
|
+
"@aztec/prover-client": "0.73.0",
|
|
78
|
+
"@aztec/sequencer-client": "0.73.0",
|
|
79
|
+
"@aztec/simulator": "0.73.0",
|
|
80
|
+
"@aztec/telemetry-client": "0.73.0",
|
|
81
|
+
"@aztec/types": "0.73.0",
|
|
82
|
+
"@aztec/validator-client": "0.73.0",
|
|
83
|
+
"@aztec/world-state": "0.73.0",
|
|
84
84
|
"koa": "^2.14.2",
|
|
85
85
|
"koa-router": "^12.0.0",
|
|
86
86
|
"tslib": "^2.4.0"
|
package/src/aztec-node/config.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
|
+
import { type BlobSinkConfig, blobSinkConfigMapping } from '@aztec/blob-sink/client';
|
|
2
3
|
import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
|
|
3
4
|
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
|
|
4
5
|
import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
|
|
@@ -17,6 +18,7 @@ export { sequencerClientConfigMappings, SequencerClientConfig };
|
|
|
17
18
|
* The configuration the aztec node.
|
|
18
19
|
*/
|
|
19
20
|
export type AztecNodeConfig = ArchiverConfig &
|
|
21
|
+
BlobSinkConfig &
|
|
20
22
|
SequencerClientConfig &
|
|
21
23
|
ValidatorClientConfig &
|
|
22
24
|
ProverClientConfig &
|
|
@@ -35,6 +37,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
|
|
|
35
37
|
...worldStateConfigMappings,
|
|
36
38
|
...p2pConfigMappings,
|
|
37
39
|
...dataConfigMappings,
|
|
40
|
+
...blobSinkConfigMapping,
|
|
38
41
|
disableValidator: {
|
|
39
42
|
env: 'VALIDATOR_DISABLED',
|
|
40
43
|
description: 'Whether the validator is disabled for this node.',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type AztecNode, AztecNodeApiSchema } from '@aztec/circuit-types';
|
|
2
|
-
import {
|
|
2
|
+
import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Wrap an AztecNode instance with a JSON RPC HTTP server.
|
|
@@ -7,5 +7,5 @@ import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
|
7
7
|
* @returns An JSON-RPC HTTP server
|
|
8
8
|
*/
|
|
9
9
|
export function createAztecNodeRpcServer(node: AztecNode) {
|
|
10
|
-
return
|
|
10
|
+
return createTracedJsonRpcServer(node, AztecNodeApiSchema);
|
|
11
11
|
}
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -5,7 +5,8 @@ import {
|
|
|
5
5
|
type AztecNode,
|
|
6
6
|
type ClientProtocolCircuitVerifier,
|
|
7
7
|
type EpochProofQuote,
|
|
8
|
-
type
|
|
8
|
+
type GetContractClassLogsResponse,
|
|
9
|
+
type GetPublicLogsResponse,
|
|
9
10
|
type InBlock,
|
|
10
11
|
type L1ToL2MessageSource,
|
|
11
12
|
type L2Block,
|
|
@@ -67,8 +68,8 @@ import { type P2P, createP2PClient } from '@aztec/p2p';
|
|
|
67
68
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
68
69
|
import {
|
|
69
70
|
GlobalVariableBuilder,
|
|
70
|
-
type L1Publisher,
|
|
71
71
|
SequencerClient,
|
|
72
|
+
type SequencerPublisher,
|
|
72
73
|
createSlasherClient,
|
|
73
74
|
createValidatorForAcceptingTxs,
|
|
74
75
|
getDefaultAllowedSetupFunctions,
|
|
@@ -143,7 +144,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
143
144
|
deps: {
|
|
144
145
|
telemetry?: TelemetryClient;
|
|
145
146
|
logger?: Logger;
|
|
146
|
-
publisher?:
|
|
147
|
+
publisher?: SequencerPublisher;
|
|
147
148
|
dateProvider?: DateProvider;
|
|
148
149
|
blobSinkClient?: BlobSinkClientInterface;
|
|
149
150
|
} = {},
|
|
@@ -151,7 +152,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
151
152
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
152
153
|
const log = deps.logger ?? createLogger('node');
|
|
153
154
|
const dateProvider = deps.dateProvider ?? new DateProvider();
|
|
154
|
-
const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config
|
|
155
|
+
const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
|
|
155
156
|
const ethereumChain = createEthereumChain(config.l1RpcUrl, config.l1ChainId);
|
|
156
157
|
//validate that the actual chain id matches that specified in configuration
|
|
157
158
|
if (config.l1ChainId !== ethereumChain.chainInfo.id) {
|
|
@@ -365,7 +366,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
365
366
|
// to emit the corresponding nullifier, which is now being checked. Note that this method
|
|
366
367
|
// is only called by the PXE to check if a contract is publicly registered.
|
|
367
368
|
if (klazz) {
|
|
368
|
-
const classNullifier = siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
369
|
+
const classNullifier = await siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
369
370
|
const worldState = await this.#getWorldState('latest');
|
|
370
371
|
const [index] = await worldState.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [classNullifier.toBuffer()]);
|
|
371
372
|
this.log.debug(`Registration nullifier ${classNullifier} for contract class ${id} found at index ${index}`);
|
|
@@ -402,12 +403,12 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
402
403
|
}
|
|
403
404
|
|
|
404
405
|
/**
|
|
405
|
-
* Gets
|
|
406
|
+
* Gets public logs based on the provided filter.
|
|
406
407
|
* @param filter - The filter to apply to the logs.
|
|
407
408
|
* @returns The requested logs.
|
|
408
409
|
*/
|
|
409
|
-
|
|
410
|
-
return this.logsSource.
|
|
410
|
+
getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
|
|
411
|
+
return this.logsSource.getPublicLogs(filter);
|
|
411
412
|
}
|
|
412
413
|
|
|
413
414
|
/**
|
|
@@ -415,7 +416,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
415
416
|
* @param filter - The filter to apply to the logs.
|
|
416
417
|
* @returns The requested logs.
|
|
417
418
|
*/
|
|
418
|
-
getContractClassLogs(filter: LogFilter): Promise<
|
|
419
|
+
getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
|
|
419
420
|
return this.logsSource.getContractClassLogs(filter);
|
|
420
421
|
}
|
|
421
422
|
|
|
@@ -425,7 +426,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
425
426
|
*/
|
|
426
427
|
public async sendTx(tx: Tx) {
|
|
427
428
|
const timer = new Timer();
|
|
428
|
-
const txHash = tx.getTxHash().toString();
|
|
429
|
+
const txHash = (await tx.getTxHash()).toString();
|
|
429
430
|
|
|
430
431
|
const valid = await this.isValidTx(tx);
|
|
431
432
|
if (valid.result !== 'valid') {
|
|
@@ -439,7 +440,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
439
440
|
|
|
440
441
|
await this.p2pClient!.sendTx(tx);
|
|
441
442
|
this.metrics.receivedTx(timer.ms(), true);
|
|
442
|
-
this.log.info(`Received tx ${
|
|
443
|
+
this.log.info(`Received tx ${txHash}`, { txHash });
|
|
443
444
|
}
|
|
444
445
|
|
|
445
446
|
public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
|
|
@@ -448,7 +449,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
448
449
|
// We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
|
|
449
450
|
// for mined and then for pending there could be a race condition where the tx is mined between the two checks
|
|
450
451
|
// and we would incorrectly return a TxReceipt with status DROPPED
|
|
451
|
-
if (this.p2pClient.getTxStatus(txHash) === 'pending') {
|
|
452
|
+
if ((await this.p2pClient.getTxStatus(txHash)) === 'pending') {
|
|
452
453
|
txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
|
|
453
454
|
}
|
|
454
455
|
|
|
@@ -811,7 +812,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
811
812
|
*/
|
|
812
813
|
public async getPublicStorageAt(contract: AztecAddress, slot: Fr, blockNumber: L2BlockNumber): Promise<Fr> {
|
|
813
814
|
const committedDb = await this.#getWorldState(blockNumber);
|
|
814
|
-
const leafSlot = computePublicDataTreeLeafSlot(contract, slot);
|
|
815
|
+
const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
|
|
815
816
|
|
|
816
817
|
const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
|
|
817
818
|
if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
|
|
@@ -839,11 +840,11 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
839
840
|
* Simulates the public part of a transaction with the current state.
|
|
840
841
|
* @param tx - The transaction to simulate.
|
|
841
842
|
**/
|
|
842
|
-
@trackSpan('AztecNodeService.simulatePublicCalls', (tx: Tx) => ({
|
|
843
|
-
[Attributes.TX_HASH]: tx.getTxHash().toString(),
|
|
843
|
+
@trackSpan('AztecNodeService.simulatePublicCalls', async (tx: Tx) => ({
|
|
844
|
+
[Attributes.TX_HASH]: (await tx.getTxHash()).toString(),
|
|
844
845
|
}))
|
|
845
846
|
public async simulatePublicCalls(tx: Tx, enforceFeePayment = true): Promise<PublicSimulationOutput> {
|
|
846
|
-
const txHash = tx.getTxHash();
|
|
847
|
+
const txHash = await tx.getTxHash();
|
|
847
848
|
const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
|
|
848
849
|
|
|
849
850
|
// If sequencer is not initialized, we just set these values to zero for simulation.
|
|
@@ -855,7 +856,6 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
855
856
|
coinbase,
|
|
856
857
|
feeRecipient,
|
|
857
858
|
);
|
|
858
|
-
const prevHeader = (await this.blockSource.getBlock(-1))?.header;
|
|
859
859
|
const publicProcessorFactory = new PublicProcessorFactory(
|
|
860
860
|
this.contractDataSource,
|
|
861
861
|
new DateProvider(),
|
|
@@ -870,7 +870,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
870
870
|
});
|
|
871
871
|
|
|
872
872
|
try {
|
|
873
|
-
const processor = publicProcessorFactory.create(fork,
|
|
873
|
+
const processor = publicProcessorFactory.create(fork, newGlobalVariables, enforceFeePayment);
|
|
874
874
|
|
|
875
875
|
// REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
|
|
876
876
|
const [processedTxs, failedTxs, returns] = await processor.process([tx]);
|
|
@@ -901,7 +901,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
901
901
|
blockNumber,
|
|
902
902
|
l1ChainId: this.l1ChainId,
|
|
903
903
|
enforceFees: !!this.config.enforceFees,
|
|
904
|
-
setupAllowList: this.config.allowedInSetup ?? getDefaultAllowedSetupFunctions(),
|
|
904
|
+
setupAllowList: this.config.allowedInSetup ?? (await getDefaultAllowedSetupFunctions()),
|
|
905
905
|
gasFees: await this.getCurrentBaseFees(),
|
|
906
906
|
});
|
|
907
907
|
|
|
@@ -910,7 +910,7 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
910
910
|
|
|
911
911
|
public async setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void> {
|
|
912
912
|
const newConfig = { ...this.config, ...config };
|
|
913
|
-
this.sequencer?.updateSequencerConfig(config);
|
|
913
|
+
await this.sequencer?.updateSequencerConfig(config);
|
|
914
914
|
|
|
915
915
|
if (newConfig.realProofs !== this.config.realProofs) {
|
|
916
916
|
this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
|
package/src/bin/index.ts
CHANGED
|
@@ -32,12 +32,15 @@ async function main() {
|
|
|
32
32
|
process.exit(0);
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
35
36
|
process.once('SIGINT', shutdown);
|
|
37
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
36
38
|
process.once('SIGTERM', shutdown);
|
|
37
39
|
|
|
38
40
|
const rpcServer = createAztecNodeRpcServer(aztecNode);
|
|
39
41
|
const app = rpcServer.getApp(API_PREFIX);
|
|
40
42
|
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
41
44
|
const httpServer = http.createServer(app.callback());
|
|
42
45
|
httpServer.listen(+AZTEC_NODE_PORT);
|
|
43
46
|
logger.info(`Aztec Node JSON-RPC Server listening on port ${AZTEC_NODE_PORT}`);
|