Skip to content
Open
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
3 changes: 1 addition & 2 deletions packages/brain/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const config = brainConfig();
logger.debug(`Chain config: ${JSON.stringify(config.chain)}`);

// Create API instances. Must preceed db initialization
const { prometheusApi, signerApi, blockExplorerApi, validatorApi, beaconchainApi, dappmanagerApi, postgresClient } =
const { prometheusApi, signerApi, validatorApi, beaconchainApi, dappmanagerApi, postgresClient } =
getApiClients(config);

// Create DB instance
Expand Down Expand Up @@ -69,7 +69,6 @@ const { uiServer, launchpadServer, brainApiServer } = getServers({
brainConfig: config,
uiBuildPath: path.resolve(__dirname, params.uiBuildDirName),
signerApi,
blockExplorerApi,
postgresClient,
validatorApi,
beaconchainApi,
Expand Down

This file was deleted.

50 changes: 0 additions & 50 deletions packages/brain/src/modules/apiClients/blockExplorer/index.ts

This file was deleted.

19 changes: 0 additions & 19 deletions packages/brain/src/modules/apiClients/blockExplorer/types.ts

This file was deleted.

17 changes: 2 additions & 15 deletions packages/brain/src/modules/apiClients/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { BlockExplorerApi } from "./blockExplorer/index.js";
import { DappmanagerApi } from "./dappmanager/index.js";
import { PrometheusApi } from "./prometheus/index.js";
import { BeaconchainApi } from "./beaconchain/index.js";
Expand All @@ -9,7 +8,6 @@ import { BrainConfig } from "../config/types.js";
import { DappnodeSignatureVerifier } from "./signatureVerifier/index.js";

export {
BlockExplorerApi,
DappmanagerApi,
PrometheusApi,
BeaconchainApi,
Expand All @@ -20,18 +18,8 @@ export {
};

export const getApiClients = (brainConfig: BrainConfig) => {
const {
prometheusUrl,
signerUrl,
blockExplorerUrl,
validatorUrl,
beaconchainUrl,
dappmanagerUrl,
postgresUrl,
token,
tlsCert,
host
} = brainConfig.apis;
const { prometheusUrl, signerUrl, validatorUrl, beaconchainUrl, dappmanagerUrl, postgresUrl, token, tlsCert, host } =
brainConfig.apis;
const { minGenesisTime, secondsPerSlot, slotsPerEpoch, network } = brainConfig.chain;
return {
prometheusApi: new PrometheusApi({
Expand All @@ -49,7 +37,6 @@ export const getApiClients = (brainConfig: BrainConfig) => {
},
network
),
blockExplorerApi: new BlockExplorerApi({ baseUrl: blockExplorerUrl }, network),
validatorApi: new ValidatorApi(
{
baseUrl: validatorUrl,
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/apiClients/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from "./beaconchain/types.js";
export * from "./blockExplorer/types.js";
export * from "./signer/types.js";
export * from "./validator/types.js";
export * from "./postgres/types.js";
Expand Down
4 changes: 0 additions & 4 deletions packages/brain/src/modules/apiServers/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { BlockExplorerApi } from "../apiClients/blockExplorer/index.js";
import { PostgresClient } from "../apiClients/postgres/index.js";
import { Web3SignerApi } from "../apiClients/signer/index.js";
import { ValidatorApi } from "../apiClients/validator/index.js";
Expand All @@ -15,7 +14,6 @@ export const getServers = ({
brainConfig,
uiBuildPath,
signerApi,
blockExplorerApi,
postgresClient,
validatorApi,
beaconchainApi,
Expand All @@ -26,7 +24,6 @@ export const getServers = ({
brainConfig: BrainConfig;
uiBuildPath: string;
signerApi: Web3SignerApi;
blockExplorerApi: BlockExplorerApi;
postgresClient: PostgresClient;
validatorApi: ValidatorApi;
beaconchainApi: BeaconchainApi;
Expand All @@ -46,7 +43,6 @@ export const getServers = ({
reloadValidatorsCronTask,
signerApi,
validatorApi,
blockExplorerApi,
beaconchainApi,
postgresClient,
allowedOriginsFromEnv
Expand Down
22 changes: 0 additions & 22 deletions packages/brain/src/modules/apiServers/ui/calls/beaconchaApi.ts

This file was deleted.

15 changes: 1 addition & 14 deletions packages/brain/src/modules/apiServers/ui/calls/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { beaconchaFetchAllValidatorsInfo, beaconchaFetchValidatorsInfo } from "./beaconchaApi.js";
import { fetchValidatorsPerformanceData } from "./fetchValidatorsPerformanceData.js";
import { deleteValidators } from "./deleteValidators.js";
import { exitValidators, getExitValidators } from "./exitValidators.js";
Expand All @@ -13,19 +12,12 @@ import { CronJob } from "../../../cron/cron.js";
import { ActionRequestOrigin, CustomImportRequest, CustomValidatorUpdateRequest, RpcMethods } from "./types.js";
import { Web3signerDeleteRequest } from "../../../apiClients/types.js";
import { NumberOfDaysToQuery } from "../../../validatorsDataIngest/types.js";
import {
BeaconchainApi,
BlockExplorerApi,
PostgresClient,
ValidatorApi,
Web3SignerApi
} from "../../../apiClients/index.js";
import { BeaconchainApi, PostgresClient, ValidatorApi, Web3SignerApi } from "../../../apiClients/index.js";
import { BrainConfig } from "../../../config/types.js";
import { getBuilderRelayPresets } from "../../../config/builderRelayPresets.js";

export const createRpcMethods = ({
postgresClient,
blockExplorerApi,
beaconchainApi,
validatorApi,
signerApi,
Expand All @@ -34,7 +26,6 @@ export const createRpcMethods = ({
brainConfig
}: {
postgresClient: PostgresClient;
blockExplorerApi: BlockExplorerApi;
beaconchainApi: BeaconchainApi;
validatorApi: ValidatorApi;
signerApi: Web3SignerApi;
Expand All @@ -48,10 +39,6 @@ export const createRpcMethods = ({
return {
getBuilderRelayPresets: async () => getBuilderRelayPresets(network),
getBuilderConfigs: async (pubkeys: string[]) => await getBuilderConfigs({ pubkeys, brainDb, validatorApi }),
beaconchaFetchAllValidatorsInfo: async (pubkeys: string[]) =>
await beaconchaFetchAllValidatorsInfo({ blockExplorerApi, pubkeys }),
beaconchaFetchValidatorsInfo: async (pubkeys: string[]) =>
await beaconchaFetchValidatorsInfo({ blockExplorerApi, pubkeys }),
deleteValidators: async (deleteRequest: Web3signerDeleteRequest) =>
await deleteValidators({ brainDb, reloadValidatorsCronTask, validatorApi, signerApi, deleteRequest }),
exitValidators: async ({ pubkeys }: { pubkeys: string[] }) =>
Expand Down
3 changes: 0 additions & 3 deletions packages/brain/src/modules/apiServers/ui/calls/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { BuilderConfig, BuilderConfigStatus, BuilderRelayPresets, StakerConfig, Tag } from "@stakingbrain/common";
import type {
BeaconchaGetResponse,
Web3signerDeleteRequest,
Web3signerDeleteResponse,
ValidatorExitExecute,
Expand All @@ -14,8 +13,6 @@ import { NumberOfDaysToQuery } from "../../../validatorsDataIngest/types.js";
// Define the type for RPC methods
export interface RpcMethods {
getBuilderRelayPresets: () => Promise<BuilderRelayPresets>;
beaconchaFetchAllValidatorsInfo: (pubkeys: string[]) => Promise<BeaconchaGetResponse[]>;
beaconchaFetchValidatorsInfo: (pubkeys: string[]) => Promise<BeaconchaGetResponse>;
deleteValidators: (deleteRequest: Web3signerDeleteRequest) => Promise<Web3signerDeleteResponse>;
exitValidators: ({ pubkeys }: { pubkeys: string[] }) => Promise<ValidatorExitExecute[]>;
getExitValidators: ({ pubkeys }: { pubkeys: string[] }) => Promise<BeaconchainPoolVoluntaryExitsPostRequest[]>;
Expand Down
11 changes: 1 addition & 10 deletions packages/brain/src/modules/apiServers/ui/startUiServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,11 @@ import { createRpcMethods } from "./calls/index.js";
import { CronJob } from "../../cron/cron.js";
import { BrainDataBase } from "../../db/index.js";
import { BrainConfig } from "../../config/types.js";
import {
BeaconchainApi,
BlockExplorerApi,
PostgresClient,
ValidatorApi,
Web3SignerApi
} from "../../apiClients/index.js";
import { BeaconchainApi, PostgresClient, ValidatorApi, Web3SignerApi } from "../../apiClients/index.js";
import { allowedOrigins, uiSocketOptions } from "./config.js";

export function startUiServer({
brainDb,
blockExplorerApi,
beaconchainApi,
validatorApi,
signerApi,
Expand All @@ -34,7 +27,6 @@ export function startUiServer({
allowedOriginsFromEnv
}: {
brainDb: BrainDataBase;
blockExplorerApi: BlockExplorerApi;
beaconchainApi: BeaconchainApi;
validatorApi: ValidatorApi;
signerApi: Web3SignerApi;
Expand All @@ -51,7 +43,6 @@ export function startUiServer({
// Initialize RPC methods
const rpcMethods = createRpcMethods({
postgresClient,
blockExplorerApi,
beaconchainApi,
validatorApi,
signerApi,
Expand Down
3 changes: 1 addition & 2 deletions packages/brain/src/modules/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const brainConfig = (): BrainConfig => {
validatorUrl = `http://validator.${network}.dncore.dappnode:3500`;
}

const { blockExplorerUrl, minGenesisTime, secondsPerSlot, slotsPerEpoch } = networkConfig(network);
const { minGenesisTime, secondsPerSlot, slotsPerEpoch } = networkConfig(network);

// Default beaconchainUrl if not already set
if (!beaconchainUrl) {
Expand All @@ -48,7 +48,6 @@ export const brainConfig = (): BrainConfig => {
apis: {
prometheusUrl: "http://prometheus.dms.dappnode:9090",
dappmanagerUrl: "http://my.dappnode:9000",
blockExplorerUrl,
executionClientUrl: `http://execution.${network}.dncore.dappnode:8545`,
validatorUrl,
beaconchainUrl,
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/config/networks/gnosis.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const gnosisBrainConfig = () => {
return {
blockExplorerUrl: "https://gnosischa.in",
minGenesisTime: 1638968400, // Dec 8, 2021, 13:00 UTC
secondsPerSlot: 5,
slotsPerEpoch: 16
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/config/networks/hoodi.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const hoodiBrainConfig = () => {
return {
blockExplorerUrl: "https://hoodi.beaconcha.in",
minGenesisTime: 1742212800, // Monday, 17 March 2025 12:00:00
secondsPerSlot: 12,
slotsPerEpoch: 32
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/config/networks/lukso.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const luksoBrainConfig = () => {
return {
blockExplorerUrl: "https://explorer.consensus.mainnet.lukso.network/",
minGenesisTime: 1684856400, // Tuesday, 23 May 2023 15:40:00 GMT
secondsPerSlot: 12,
slotsPerEpoch: 32
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/config/networks/mainnet.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const mainnetBrainConfig = () => {
return {
blockExplorerUrl: "https://beaconcha.in",
minGenesisTime: 1606824000,
secondsPerSlot: 12,
slotsPerEpoch: 32
Expand Down
1 change: 0 additions & 1 deletion packages/brain/src/modules/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export interface BrainConfig {
export interface ApisConfig {
prometheusUrl: string;
signerUrl: string;
blockExplorerUrl: string;
validatorUrl: string;
beaconchainUrl: string;
executionClientUrl: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@ import { ConsensusClient, ExecutionClient, Network } from "@stakingbrain/common"
import { startBrainApi } from "../../../src/modules/apiServers/brain/startBrainApi.js";
import { startLaunchpadApi } from "../../../src/modules/apiServers/launchpad/startLaunchpadApi.js";
import { startUiServer } from "../../../src/modules/apiServers/ui/startUiServer.js";
import {
BeaconchainApi,
BlockExplorerApi,
PostgresClient,
ValidatorApi,
Web3SignerApi
} from "../../../src/modules/apiClients/index.js";
import { BeaconchainApi, PostgresClient, ValidatorApi, Web3SignerApi } from "../../../src/modules/apiClients/index.js";
import { BrainDataBase } from "../../../src/modules/db/index.js";
import { CronJob } from "../../../src/modules/cron/cron.js";
import { params } from "../../../src/params.js";
Expand Down Expand Up @@ -85,7 +79,6 @@ describe("JSON request content encoding", () => {
signerApi,
beaconchainApi,
reloadValidatorsCronTask,
blockExplorerApi: sinon.createStubInstance(BlockExplorerApi),
postgresClient: sinon.createStubInstance(PostgresClient),
uiBuildPath: directory,
allowedOriginsFromEnv,
Expand All @@ -106,7 +99,6 @@ describe("JSON request content encoding", () => {
executionClientUrl: signerUrl,
prometheusUrl: signerUrl,
dappmanagerUrl: signerUrl,
blockExplorerUrl: signerUrl,
postgresUrl: signerUrl,
token: "",
tlsCert: null,
Expand Down
Loading
Loading