Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set lodestar version in agent version #4612

Merged
merged 1 commit into from
Oct 5, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/beacon-node/src/network/nodejs/bundle.ts
Expand Up @@ -19,6 +19,7 @@ export interface ILibp2pOptions {
maxConnections?: number;
minConnections?: number;
metrics?: boolean;
lodestarVersion?: string;
}

export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2p> {
Expand Down Expand Up @@ -84,5 +85,11 @@ export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2
maxListeners: 0,
},
},

identify: {
host: {
agentVersion: options.lodestarVersion ? `lodestar/${options.lodestarVersion}` : "lodestar",
},
},
});
}
1 change: 1 addition & 0 deletions packages/beacon-node/src/network/nodejs/util.ts
Expand Up @@ -73,5 +73,6 @@ export async function createNodeJsLibp2p(
// If peer discovery is enabled let the default in NodejsNode
peerDiscovery: disablePeerDiscovery ? [] : undefined,
metrics: nodeJsLibp2pOpts.metrics,
lodestarVersion: networkOpts.version,
});
}
1 change: 1 addition & 0 deletions packages/beacon-node/src/network/options.ts
Expand Up @@ -9,6 +9,7 @@ export interface INetworkOptions extends PeerManagerOpts, RateLimiterOpts, Gossi
bootMultiaddrs?: string[];
subscribeAllSubnets?: boolean;
connectToDiscv5Bootnodes?: boolean;
version?: string;
}

export const defaultDiscv5Options: IDiscv5DiscoveryInputOptions = {
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/cmds/beacon/handler.ts
Expand Up @@ -140,6 +140,8 @@ export async function beaconHandlerInit(args: IBeaconArgs & IGlobalArgs) {

// Inject ENR to beacon options
beaconNodeOptions.set({network: {discv5: {enr: fileENR, enrUpdate: !enr.ip && !enr.ip6}}});
// Add simple version string for libp2p agent version
beaconNodeOptions.set({network: {version: version.split("/")[0]}});

// Render final options
const options = beaconNodeOptions.getWithDefaults();
Expand Down