Skip to content

Commit 5502901

Browse files
authored
chore(node): return correct node version (#12520)
1 parent 778bfa6 commit 5502901

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

yarn-project/aztec-node/src/aztec-node/config.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ export function getConfigEnvVars(): AztecNodeConfig {
5959
}
6060

6161
/**
62-
* Returns package name and version.
62+
* Returns package version.
6363
*/
64-
export function getPackageInfo() {
65-
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
66-
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
67-
return { version, name };
64+
export function getPackageVersion() {
65+
const releasePleaseManifestPath = resolve(
66+
dirname(fileURLToPath(import.meta.url)),
67+
'../../../../.release-please-manifest.json',
68+
);
69+
const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString());
70+
return version['.'];
6871
}

yarn-project/aztec-node/src/aztec-node/server.test.ts

+15
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ import { mockTx } from '@aztec/stdlib/testing';
1616
import { MerkleTreeId, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
1717
import { BlockHeader, GlobalVariables, MaxBlockNumber } from '@aztec/stdlib/tx';
1818

19+
import { readFileSync } from 'fs';
1920
import { type MockProxy, mock } from 'jest-mock-extended';
21+
import { dirname, resolve } from 'path';
22+
import { fileURLToPath } from 'url';
2023

2124
import { type AztecNodeConfig, getConfigEnvVars } from './config.js';
2225
import { AztecNodeService } from './server.js';
@@ -204,6 +207,18 @@ describe('aztec node', () => {
204207
});
205208
});
206209

210+
describe('Node Info', () => {
211+
it('returns the correct node version', async () => {
212+
const releasePleaseVersionFile = readFileSync(
213+
resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json'),
214+
).toString();
215+
const releasePleaseVersion = JSON.parse(releasePleaseVersionFile)['.'];
216+
217+
const nodeInfo = await node.getNodeInfo();
218+
expect(nodeInfo.nodeVersion).toBe(releasePleaseVersion);
219+
});
220+
});
221+
207222
describe('getters', () => {
208223
describe('getBlockHeader', () => {
209224
let initialHeader: BlockHeader;

yarn-project/aztec-node/src/aztec-node/server.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import {
8080
import { createValidatorClient } from '@aztec/validator-client';
8181
import { createWorldStateSynchronizer } from '@aztec/world-state';
8282

83-
import { type AztecNodeConfig, getPackageInfo } from './config.js';
83+
import { type AztecNodeConfig, getPackageVersion } from './config.js';
8484
import { NodeMetrics } from './node_metrics.js';
8585

8686
/**
@@ -109,10 +109,11 @@ export class AztecNodeService implements AztecNode, Traceable {
109109
private telemetry: TelemetryClient = getTelemetryClient(),
110110
private log = createLogger('node'),
111111
) {
112-
this.packageVersion = getPackageInfo().version;
112+
this.packageVersion = getPackageVersion();
113113
this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
114114
this.tracer = telemetry.getTracer('AztecNodeService');
115115

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

0 commit comments

Comments
 (0)