Skip to content

Commit

Permalink
Review abstractions
Browse files Browse the repository at this point in the history
  • Loading branch information
@dapplion
dapplion committed Nov 18, 2022
1 parent d2c3d79 commit 38b9225
Show file tree
Hide file tree
Showing 53 changed files with 872 additions and 1,135 deletions.
24 changes: 0 additions & 24 deletions packages/beacon-node/src/network/reqresp/BeaconNodeReqResp.ts
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/beacon-node/src/network/reqresp/handlers/beaconBlocksByRoot.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {EncodedPayload, EncodedPayloadType, ContextBytesType} from "@lodestar/reqresp";
import {getSlotFromBytes} from "@lodestar/reqresp/utils";
import {allForks, phase0, Slot} from "@lodestar/types";
import {IBeaconChain} from "../../../chain/index.js";
import {IBeaconDb} from "../../../db/index.js";
import {getSlotFromBytes} from "../../../util/multifork.js";

export async function* onBeaconBlocksByRoot(
requestBody: phase0.BeaconBlocksByRootRequest,
Expand Down
14 changes: 7 additions & 7 deletions packages/beacon-node/src/network/reqresp/handlers/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ export function getReqRespHandlers({
db: IBeaconDb;
chain: IBeaconChain;
}): {
onStatus: HandlerTypeFromMessage<typeof messages.v1.Status>;
onBeaconBlocksByRange: HandlerTypeFromMessage<typeof messages.v1.BeaconBlocksByRange>;
onBeaconBlocksByRoot: HandlerTypeFromMessage<typeof messages.v1.BeaconBlocksByRoot>;
onLightClientBootstrap: HandlerTypeFromMessage<typeof messages.v1.LightClientBootstrap>;
onLightClientUpdatesByRange: HandlerTypeFromMessage<typeof messages.v1.LightClientUpdatesByRange>;
onLightClientFinalityUpdate: HandlerTypeFromMessage<typeof messages.v1.LightClientFinalityUpdate>;
onLightClientOptimisticUpdate: HandlerTypeFromMessage<typeof messages.v1.LightClientOptimisticUpdate>;
onStatus: HandlerTypeFromMessage<typeof messages.Status>;
onBeaconBlocksByRange: HandlerTypeFromMessage<typeof messages.BeaconBlocksByRange>;
onBeaconBlocksByRoot: HandlerTypeFromMessage<typeof messages.BeaconBlocksByRoot>;
onLightClientBootstrap: HandlerTypeFromMessage<typeof messages.LightClientBootstrap>;
onLightClientUpdatesByRange: HandlerTypeFromMessage<typeof messages.LightClientUpdatesByRange>;
onLightClientFinalityUpdate: HandlerTypeFromMessage<typeof messages.LightClientFinalityUpdate>;
onLightClientOptimisticUpdate: HandlerTypeFromMessage<typeof messages.LightClientOptimisticUpdate>;
} {
return {
async *onStatus() {
Expand Down
311 changes: 265 additions & 46 deletions packages/beacon-node/src/network/reqresp/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,269 @@
import {getMetrics as getReqResMetrics, IReqResp, MetricsRegister} from "@lodestar/reqresp";
import {Libp2p} from "libp2p";
import {PeerId} from "@libp2p/interface-peer-id";
import {ForkName} from "@lodestar/params";
import {ILogger} from "@lodestar/utils";
import {IBeaconConfig} from "@lodestar/config";
import {ReqRespOpts} from "@lodestar/reqresp/lib/ReqResp.js";

import {allForks, altair, phase0, Root, Slot} from "@lodestar/types";
import {
collectExactOne,
collectMaxResponse,
EncodedPayload,
EncodedPayloadType,
ReqResp,
RequestError,
ResponseError,
} from "@lodestar/reqresp";
import messages from "@lodestar/reqresp/messages";
import {IMetrics} from "../../metrics/index.js";
import {BeaconNodeReqResp, BeaconNodeReqRespModules} from "./BeaconNodeReqResp.js";
import {IMetrics} from "../../metrics/metrics.js";
import {INetworkEventBus, NetworkEvent} from "../events.js";
import {IPeerRpcScoreStore} from "../peers/score.js";
import {MetadataController} from "../metadata.js";
import {PeerData, PeersData} from "../peers/peersData.js";
import {ReqRespHandlers} from "./handlers/index.js";
import {collectSequentialBlocksInRange} from "./utils/collectSequentialBlocksInRange.js";
import {IReqResp, RateLimiter, RespStatus} from "./interface.js";
import {Method, RequestTypedContainer, Version} from "./types.js";
import {onOutgoingReqRespError} from "./score.js";

export const getBeaconNodeReqResp = (
modules: Omit<BeaconNodeReqRespModules, "metrics"> & {
metrics: IMetrics | null;
},
reqRespHandlers: ReqRespHandlers
): IReqResp => {
const metrics = modules.metrics
? getReqResMetrics((modules.metrics as unknown) as MetricsRegister, {
version: "",
commit: "",
network: "",
})
: null;

const reqRespModules = {
...modules,
metrics,
} as BeaconNodeReqRespModules;

const reqresp = new BeaconNodeReqResp(reqRespModules);

reqresp.registerProtocol(messages.v1.Ping(reqRespModules));
reqresp.registerProtocol(messages.v1.Status(reqRespModules, reqRespHandlers.onStatus));
reqresp.registerProtocol(messages.v1.Metadata(reqRespModules));
reqresp.registerProtocol(messages.v1.Goodbye(reqRespModules));
reqresp.registerProtocol(messages.v1.BeaconBlocksByRange(reqRespModules, reqRespHandlers.onBeaconBlocksByRange));
reqresp.registerProtocol(messages.v1.BeaconBlocksByRoot(reqRespModules, reqRespHandlers.onBeaconBlocksByRoot));
reqresp.registerProtocol(messages.v1.LightClientBootstrap(reqRespModules, reqRespHandlers.onLightClientBootstrap));
reqresp.registerProtocol(
messages.v1.LightClientFinalityUpdate(reqRespModules, reqRespHandlers.onLightClientFinalityUpdate)
);
reqresp.registerProtocol(
messages.v1.LightClientOptimisticUpdate(reqRespModules, reqRespHandlers.onLightClientOptimisticUpdate)
);
reqresp.registerProtocol(
messages.v1.LightClientUpdatesByRange(reqRespModules, reqRespHandlers.onLightClientUpdatesByRange)
);

reqresp.registerProtocol(messages.v2.Metadata(reqRespModules));
reqresp.registerProtocol(messages.v2.BeaconBlocksByRange(reqRespModules, reqRespHandlers.onBeaconBlocksByRange));
reqresp.registerProtocol(messages.v2.BeaconBlocksByRoot(reqRespModules, reqRespHandlers.onBeaconBlocksByRoot));

return reqresp;
/** This type helps response to beacon_block_by_range and beacon_block_by_root more efficiently */
export type ReqRespBlockResponse = {
/** Deserialized data of allForks.SignedBeaconBlock */
bytes: Uint8Array;
slot: Slot;
};

export interface ReqRespBeaconNodeModules {
libp2p: Libp2p;
peersData: PeersData;
logger: ILogger;
config: IBeaconConfig;
metrics: IMetrics | null;
reqRespHandlers: ReqRespHandlers;
metadataController: MetadataController;
peerRpcScores: IPeerRpcScoreStore;
networkEventBus: INetworkEventBus;
}

/**
* Implementation of Ethereum Consensus p2p Req/Resp domain.
* For the spec that this code is based on, see:
* https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/phase0/p2p-interface.md#the-reqresp-domain
* https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/p2p-interface.md#the-reqresp-domain
*/
export class ReqRespBeaconNode extends ReqResp implements IReqResp {
private readonly reqRespHandlers: ReqRespHandlers;
private readonly metadataController: MetadataController;
private readonly peerRpcScores: IPeerRpcScoreStore;
private readonly inboundRateLimiter: RateLimiter;
private readonly networkEventBus: INetworkEventBus;
private readonly peerData: PeerData;

constructor(modules: ReqRespBeaconNodeModules, options?: Partial<ReqRespOpts> & Partial<RateLimiterOptions>) {
super(modules, {...defaultReqRespOptions, ...options});
const reqRespHandlers: ReqRespHandlers = 1;
this.peerRpcScores = modules.peerRpcScores;
this.metadataController = modules.metadataController;
this.inboundRateLimiter = new InboundRateLimiter({...InboundRateLimiter.defaults, ...options}, modules);

// TODO: Do not register everything! Some protocols are fork dependant
this.registerProtocol(messages.Ping(modules, this.onPing.bind(this)));
this.registerProtocol(messages.Status(modules, this.onStatus.bind(this)));
this.registerProtocol(messages.Metadata(modules, this.onMetadata.bind(this)));
this.registerProtocol(messages.MetadataV2(modules, this.onMetadata.bind(this)));
this.registerProtocol(messages.Goodbye(modules, this.onGoodbye.bind(this)));
this.registerProtocol(messages.BeaconBlocksByRange(modules, this.onBeaconBlocksByRange.bind(this)));
this.registerProtocol(messages.BeaconBlocksByRangeV2(modules, this.onBeaconBlocksByRange.bind(this)));
this.registerProtocol(messages.BeaconBlocksByRoot(modules, this.onBeaconBlocksByRoot.bind(this)));
this.registerProtocol(messages.BeaconBlocksByRootV2(modules, this.onBeaconBlocksByRoot.bind(this)));
this.registerProtocol(messages.LightClientBootstrap(modules, reqRespHandlers.onLightClientBootstrap));
this.registerProtocol(messages.LightClientFinalityUpdate(modules, reqRespHandlers.onLightClientFinalityUpdate));
this.registerProtocol(messages.LightClientOptimisticUpdate(modules, reqRespHandlers.onLightClientOptimisticUpdate));
this.registerProtocol(messages.LightClientUpdatesByRange(modules, reqRespHandlers.onLightClientUpdatesByRange));
}

async start(): Promise<void> {
await super.start();
this.inboundRateLimiter.start();
}

async stop(): Promise<void> {
await super.stop();
this.inboundRateLimiter.stop();
}

pruneOnPeerDisconnect(peerId: PeerId): void {
this.inboundRateLimiter.prune(peerId);
}

async status(peerId: PeerId, request: phase0.Status): Promise<phase0.Status> {
return collectExactOne(
this.sendRequest<phase0.Status, phase0.Status>(peerId, Method.Status, [Version.V1], request)
);
}

async goodbye(peerId: PeerId, request: phase0.Goodbye): Promise<void> {
// TODO: Replace with "ignore response after request"
await collectExactOne(
this.sendRequest<phase0.Goodbye, phase0.Goodbye>(peerId, Method.Goodbye, [Version.V1], request)
);
}

async ping(peerId: PeerId): Promise<phase0.Ping> {
return collectExactOne(
this.sendRequest<phase0.Ping, phase0.Ping>(peerId, Method.Ping, [Version.V1], this.metadataController.seqNumber)
);
}

async metadata(peerId: PeerId, fork?: ForkName): Promise<allForks.Metadata> {
// Only request V1 if forcing phase0 fork. It's safe to not specify `fork` and let stream negotiation pick the version
const versions = fork === ForkName.phase0 ? [Version.V1] : [Version.V2, Version.V1];
return collectExactOne(this.sendRequest<null, allForks.Metadata>(peerId, Method.Metadata, versions, null));
}

async beaconBlocksByRange(
peerId: PeerId,
request: phase0.BeaconBlocksByRangeRequest
): Promise<allForks.SignedBeaconBlock[]> {
return collectSequentialBlocksInRange(
this.sendRequest<phase0.BeaconBlocksByRangeRequest, allForks.SignedBeaconBlock>(
peerId,
Method.BeaconBlocksByRange,
[Version.V2, Version.V1], // Prioritize V2
request
),
request
);
}

async beaconBlocksByRoot(
peerId: PeerId,
request: phase0.BeaconBlocksByRootRequest
): Promise<allForks.SignedBeaconBlock[]> {
return collectMaxResponse(
this.sendRequest<phase0.BeaconBlocksByRootRequest, allForks.SignedBeaconBlock>(
peerId,
Method.BeaconBlocksByRoot,
[Version.V2, Version.V1], // Prioritize V2
request
),
request.length
);
}

async lightClientBootstrap(peerId: PeerId, request: Root): Promise<altair.LightClientBootstrap> {
return collectExactOne(
this.sendRequest<Root, altair.LightClientBootstrap>(peerId, Method.LightClientBootstrap, [Version.V1], request)
);
}

async lightClientOptimisticUpdate(peerId: PeerId): Promise<altair.LightClientOptimisticUpdate> {
return collectExactOne(
this.sendRequest<null, altair.LightClientOptimisticUpdate>(
peerId,
Method.LightClientOptimisticUpdate,
[Version.V1],
null
)
);
}

async lightClientFinalityUpdate(peerId: PeerId): Promise<altair.LightClientFinalityUpdate> {
return collectExactOne(
this.sendRequest<null, altair.LightClientFinalityUpdate>(
peerId,
Method.LightClientFinalityUpdate,
[Version.V1],
null
)
);
}

async lightClientUpdatesByRange(
peerId: PeerId,
request: altair.LightClientUpdatesByRange
): Promise<altair.LightClientUpdate[]> {
return collectMaxResponse(
this.sendRequest<altair.LightClientUpdatesByRange, altair.LightClientUpdate>(
peerId,
Method.LightClientUpdatesByRange,
[Version.V1],
request
),
request.count
);
}

protected sendRequest<Req, Resp>(peerId: PeerId, method: string, versions: number[], body: Req): AsyncIterable<Resp> {
// Remember prefered encoding
const encoding = this.peersData.getEncodingPreference(peerId.toString()) ?? Encoding.SSZ_SNAPPY;

return super.sendRequest(peerId, method, versions, encoding, body);
}

protected onIncomingRequestBody(req: RequestTypedContainer, peerId: PeerId): void {
// Allow onRequest to return and close the stream
// For Goodbye there may be a race condition where the listener of `receivedGoodbye`
// disconnects in the same syncronous call, preventing the stream from ending cleanly
setTimeout(() => this.networkEventBus.emit(NetworkEvent.reqRespRequest, req, peerId), 0);
}

protected onIncomingRequest(peerId: PeerId, method: Method): void {
if (method !== Method.Goodbye && !this.inboundRateLimiter.allowRequest(peerId)) {
throw new ResponseError(RespStatus.RATE_LIMITED, "rate limit");
}
}

protected onOutgoingRequestError(peerId: PeerId, method: Method, error: RequestError): void {
const peerAction = onOutgoingReqRespError(error, method);
if (peerAction !== null) {
this.peerRpcScores.applyAction(peerId, peerAction, error.type.code);
}
}

private async *onStatus(req: phase0.Status, peerId: PeerId): AsyncIterable<EncodedPayload<phase0.Status>> {
this.onIncomingRequestBody({method: Method.Status, body: req}, peerId);
// Remember prefered encoding
const encoding = this.peersData.getEncodingPreference(peerId.toString()) ?? Encoding.SSZ_SNAPPY;
yield* this.reqRespHandlers.onStatus(req, peerId);
}

private async *onGoodbye(req: phase0.Goodbye, peerId: PeerId): AsyncIterable<EncodedPayload<phase0.Goodbye>> {
this.onIncomingRequestBody({method: Method.Goodbye, body: req}, peerId);
yield {type: EncodedPayloadType.ssz, data: BigInt(0)};
}

private async *onPing(req: phase0.Ping, peerId: PeerId): AsyncIterable<EncodedPayload<phase0.Ping>> {
this.onIncomingRequestBody({method: Method.Goodbye, body: req}, peerId);
yield {type: EncodedPayloadType.ssz, data: this.metadataController.seqNumber};
}

private async *onMetadata(req: null, peerId: PeerId): AsyncIterable<EncodedPayload<allForks.Metadata>> {
this.onIncomingRequestBody({method: Method.Metadata, body: req}, peerId);

// V1 -> phase0, V2 -> altair. But the type serialization of phase0.Metadata will just ignore the extra .syncnets property
// It's safe to return altair.Metadata here for all versions
yield {type: EncodedPayloadType.ssz, data: this.metadataController.json};
}

private async *onBeaconBlocksByRange(
req: phase0.BeaconBlocksByRangeRequest,
peerId: PeerId
): AsyncIterable<EncodedPayload<allForks.SignedBeaconBlock>> {
if (!this.inboundRateLimiter.allowBlockByRequest(peerId, req.count)) {
throw new ResponseError(RespStatus.RATE_LIMITED, "rate limit");
}
yield* this.reqRespHandlers.onBeaconBlocksByRange(req, peerId);
}

private async *onBeaconBlocksByRoot(
req: phase0.BeaconBlocksByRootRequest,
peerId: PeerId
): AsyncIterable<EncodedPayload<allForks.SignedBeaconBlock>> {
if (!this.inboundRateLimiter.allowBlockByRequest(peerId, req.length)) {
throw new ResponseError(RespStatus.RATE_LIMITED, "rate limit");
}
yield* this.reqRespHandlers.onBeaconBlocksByRoot(req, peerId);
}
}
Loading

0 comments on commit 38b9225

Please sign in to comment.