Skip to content
Merged
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
11 changes: 8 additions & 3 deletions packages/beacon-node/src/api/rest/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {parse as parseQueryString} from "qs";
import {addSszContentTypeParser} from "@lodestar/api/server";
import {NUMBER_OF_COLUMNS} from "@lodestar/params";
import {ErrorAborted, Gauge, Histogram, Logger} from "@lodestar/utils";
import {GossipActionError} from "../../chain/errors/gossipValidation.js";
import {isLocalhostIP} from "../../util/ip.js";
import {ApiError, FailureList, IndexedError, NodeIsSyncing} from "../impl/errors.js";
import {HttpActiveSocketsTracker, SocketMetrics} from "./activeSockets.js";
Expand Down Expand Up @@ -121,8 +122,8 @@ export class RestApiServer {
};
void res.status(err.statusCode).send(payload);
} else {
// Convert our custom ApiError into status code
const statusCode = err instanceof ApiError ? err.statusCode : 500;
// Convert known request errors into status codes
const statusCode = err instanceof ApiError ? err.statusCode : err instanceof GossipActionError ? 400 : 500;
const payload: ErrorResponse = {code: statusCode, message: err.message, stacktraces};
void res.status(statusCode).send(payload);
}
Expand Down Expand Up @@ -170,7 +171,11 @@ export class RestApiServer {

const operationId = getOperationId(req);

if (err instanceof ApiError || [INVALID_MEDIA_TYPE_CODE, SCHEMA_VALIDATION_ERROR_CODE].includes(err.code)) {
if (
err instanceof ApiError ||
err instanceof GossipActionError ||
[INVALID_MEDIA_TYPE_CODE, SCHEMA_VALIDATION_ERROR_CODE].includes(err.code)
) {
this.logger.warn(`Req ${req.id} ${operationId} failed`, {reason: err.message});
} else {
this.logger.error(`Req ${req.id} ${operationId} error`, {}, err);
Expand Down
Loading