Clean up imports

packages/api/src/beacon/index.ts

@@ -5,7 +5,6 @@ import type {Api} from "./routes/index.js";
 export * as routes from "./routes/index.js";
 export {getClient} from "./client/index.js";
 export type {Api};
-export type {BlockRewards} from "./routes/index.js";
 
 // Declare namespaces for CLI options
 export type ApiNamespace = keyof Api;

packages/api/src/beacon/routes/index.ts

@@ -30,8 +30,6 @@ export type Api = {
   validator: ValidatorApi;
 };
 
-export type {BlockRewards} from "./beacon/index.js";
-
 // Reasoning of the API definitions
 // ================================
 //

packages/beacon-node/src/chain/chain.ts

@@ -33,7 +33,6 @@ import {ProcessShutdownCallback} from "@lodestar/validator";
 import {Logger, gweiToWei, isErrorAborted, pruneSetToMax, sleep, toHex} from "@lodestar/utils";
 import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
 
-import {type BlockRewards} from "@lodestar/api";
 import {GENESIS_EPOCH, ZERO_HASH} from "../constants/index.js";
 import {IBeaconDb} from "../db/index.js";
 import {Metrics} from "../metrics/index.js";
@@ -77,7 +76,7 @@ import {BlockAttributes, produceBlockBody, produceCommonBlockBody} from "./produ
 import {computeNewStateRoot} from "./produceBlock/computeNewStateRoot.js";
 import {BlockInput} from "./blocks/types.js";
 import {SeenAttestationDatas} from "./seenCache/seenAttestationData.js";
-import {computeBlockRewards} from "./rewards/blockRewards.js";
+import {BlockRewards, computeBlockRewards} from "./rewards/blockRewards.js";
 import {ShufflingCache} from "./shufflingCache.js";
 import {StateContextCache} from "./stateCache/stateContextCache.js";
 import {SeenGossipBlockInput} from "./seenCache/index.js";

packages/beacon-node/src/chain/interface.ts

@@ -24,7 +24,6 @@ import {BeaconConfig} from "@lodestar/config";
 import {Logger} from "@lodestar/utils";
 
 import {IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
-import {type BlockRewards} from "@lodestar/api";
 import {IEth1ForBlockProduction} from "../eth1/index.js";
 import {IExecutionEngine, IExecutionBuilder} from "../execution/index.js";
 import {Metrics} from "../metrics/metrics.js";
@@ -53,6 +52,7 @@ import {AssembledBlockType, BlockAttributes, BlockType} from "./produceBlock/pro
 import {SeenAttestationDatas} from "./seenCache/seenAttestationData.js";
 import {SeenGossipBlockInput} from "./seenCache/index.js";
 import {ShufflingCache} from "./shufflingCache.js";
+import {BlockRewards} from "./rewards/blockRewards.js";
 
 export {BlockType, type AssembledBlockType};
 export {type ProposerPreparationData};

packages/beacon-node/src/chain/rewards/blockRewards.ts

@@ -7,8 +7,9 @@ import {
 } from "@lodestar/state-transition";
 import {allForks, altair, phase0} from "@lodestar/types";
 import {ForkName, WHISTLEBLOWER_REWARD_QUOTIENT} from "@lodestar/params";
-import {type BlockRewards} from "@lodestar/api";
+import {routes} from "@lodestar/api";
 
+export type BlockRewards = routes.beacon.BlockRewards;
 type SubRewardValue = number; // All reward values should be integer
 
 /**