Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions yarn-project/aztec-node/src/aztec-node/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,13 @@ export function getConfigEnvVars(): AztecNodeConfig {
}

/**
* Returns package name and version.
* Returns package version.
*/
export function getPackageInfo() {
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
return { version, name };
export function getPackageVersion() {
const releasePleaseManifestPath = resolve(
dirname(fileURLToPath(import.meta.url)),
'../../../../.release-please-manifest.json',
);
const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString());
return version['.'];
}
15 changes: 15 additions & 0 deletions yarn-project/aztec-node/src/aztec-node/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import { mockTx } from '@aztec/stdlib/testing';
import { MerkleTreeId, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
import { BlockHeader, GlobalVariables, MaxBlockNumber } from '@aztec/stdlib/tx';

import { readFileSync } from 'fs';
import { type MockProxy, mock } from 'jest-mock-extended';
import { dirname, resolve } from 'path';
import { fileURLToPath } from 'url';

import { type AztecNodeConfig, getConfigEnvVars } from './config.js';
import { AztecNodeService } from './server.js';
Expand Down Expand Up @@ -204,6 +207,18 @@ describe('aztec node', () => {
});
});

describe('Node Info', () => {
it('returns the correct node version', async () => {
const releasePleaseVersionFile = readFileSync(
resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json'),
).toString();
const releasePleaseVersion = JSON.parse(releasePleaseVersionFile)['.'];

const nodeInfo = await node.getNodeInfo();
expect(nodeInfo.nodeVersion).toBe(releasePleaseVersion);
});
});

describe('getters', () => {
describe('getBlockHeader', () => {
let initialHeader: BlockHeader;
Expand Down
5 changes: 3 additions & 2 deletions yarn-project/aztec-node/src/aztec-node/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import {
import { createValidatorClient } from '@aztec/validator-client';
import { createWorldStateSynchronizer } from '@aztec/world-state';

import { type AztecNodeConfig, getPackageInfo } from './config.js';
import { type AztecNodeConfig, getPackageVersion } from './config.js';
import { NodeMetrics } from './node_metrics.js';

/**
Expand Down Expand Up @@ -109,10 +109,11 @@ export class AztecNodeService implements AztecNode, Traceable {
private telemetry: TelemetryClient = getTelemetryClient(),
private log = createLogger('node'),
) {
this.packageVersion = getPackageInfo().version;
this.packageVersion = getPackageVersion();
this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
this.tracer = telemetry.getTracer('AztecNodeService');

this.log.info(`Aztec Node version: ${this.packageVersion}`);
this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
}

Expand Down