Fix import order

biome.jsonc

@@ -18,10 +18,7 @@
     "ignore": ["**/lib", "**/.nyc_output", "./packages/*/spec-tests", "**/node_modules", "./packages/*/node_modules/**"]
   },
   "organizeImports": {
-    // TODO: We will enable this settings as soon mono-repo support is provided in biome.
-    // Currently it didn't recognize local packages in repo and sort those higher than npm packages
-    // https://github.com/biomejs/biome/issues/2228
-    "enabled": false
+    "enabled": true
   },
   "linter": {
     "enabled": true,

packages/api/src/beacon/client/debug.ts

@@ -1,5 +1,5 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {ApiClientMethods, createApiClientMethods, IHttpClient} from "../../utils/client/index.js";
+import {ApiClientMethods, IHttpClient, createApiClientMethods} from "../../utils/client/index.js";
 import {Endpoints, getDefinitions} from "../routes/debug.js";
 
 export type ApiClient = ApiClientMethods<Endpoints>;

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

@@ -1,30 +1,30 @@
 import {ContainerType, ListCompositeType, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
+import {ForkName, ForkPreElectra, ForkPreExecution, isForkBlobs, isForkExecution} from "@lodestar/params";
 import {
-  Slot,
-  ssz,
+  BeaconBlockBody,
   RootHex,
-  deneb,
-  isSignedBlockContents,
   SignedBeaconBlock,
-  BeaconBlockBody,
   SignedBeaconBlockOrContents,
   SignedBlindedBeaconBlock,
   SignedBlockContents,
+  Slot,
+  deneb,
+  isSignedBlockContents,
+  ssz,
   sszTypesFor,
 } from "@lodestar/types";
-import {ForkName, ForkPreElectra, ForkPreExecution, isForkBlobs, isForkExecution} from "@lodestar/params";
-import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
 import {EmptyMeta, EmptyResponseCodec, EmptyResponseData, WithVersion} from "../../../utils/codecs.js";
+import {getExecutionForkTypes, toForkName} from "../../../utils/fork.js";
+import {fromHeaders} from "../../../utils/headers.js";
+import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
 import {
   ExecutionOptimisticAndFinalizedCodec,
   ExecutionOptimisticAndFinalizedMeta,
   ExecutionOptimisticFinalizedAndVersionCodec,
   ExecutionOptimisticFinalizedAndVersionMeta,
   MetaHeader,
 } from "../../../utils/metadata.js";
-import {getExecutionForkTypes, toForkName} from "../../../utils/fork.js";
-import {fromHeaders} from "../../../utils/headers.js";
 import {WireFormat} from "../../../utils/wireFormat.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

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

@@ -1,11 +1,11 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {phase0, ssz} from "@lodestar/types";
+import {EmptyArgs, EmptyMeta, EmptyMetaCodec, EmptyRequest, EmptyRequestCodec} from "../../../utils/codecs.js";
 import {Endpoint, RouteDefinitions} from "../../../utils/types.js";
-import {EmptyArgs, EmptyRequestCodec, EmptyMeta, EmptyMetaCodec, EmptyRequest} from "../../../utils/codecs.js";
 import * as block from "./block.js";
 import * as pool from "./pool.js";
-import * as state from "./state.js";
 import * as rewards from "./rewards.js";
+import * as state from "./state.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 

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

@@ -1,22 +1,22 @@
 import {ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {isForkPostElectra} from "@lodestar/params";
-import {phase0, capella, CommitteeIndex, Slot, ssz, electra, AttesterSlashing} from "@lodestar/types";
-import {Schema, Endpoint, RouteDefinitions} from "../../../utils/index.js";
+import {AttesterSlashing, CommitteeIndex, Slot, capella, electra, phase0, ssz} from "@lodestar/types";
 import {
   ArrayOf,
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyMetaCodec,
   EmptyRequest,
+  EmptyRequestCodec,
   EmptyResponseCodec,
   EmptyResponseData,
   WithVersion,
 } from "../../../utils/codecs.js";
-import {MetaHeader, VersionCodec, VersionMeta} from "../../../utils/metadata.js";
 import {toForkName} from "../../../utils/fork.js";
 import {fromHeaders} from "../../../utils/headers.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../../utils/index.js";
+import {MetaHeader, VersionCodec, VersionMeta} from "../../../utils/metadata.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 

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

@@ -2,10 +2,10 @@ import {ContainerType, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {Epoch, ssz} from "@lodestar/types";
 
-import {Schema, Endpoint, RouteDefinitions} from "../../../utils/index.js";
-import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
 import {ArrayOf, JsonOnlyReq} from "../../../utils/codecs.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../../utils/index.js";
 import {ExecutionOptimisticAndFinalizedCodec, ExecutionOptimisticAndFinalizedMeta} from "../../../utils/metadata.js";
+import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
 import {BlockArgs} from "./block.js";
 import {ValidatorId} from "./state.js";
 

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

@@ -1,9 +1,9 @@
 import {ContainerType, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {MAX_VALIDATORS_PER_COMMITTEE} from "@lodestar/params";
-import {phase0, CommitteeIndex, Slot, Epoch, ssz, RootHex, StringType, ValidatorStatus} from "@lodestar/types";
-import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
+import {CommitteeIndex, Epoch, RootHex, Slot, StringType, ValidatorStatus, phase0, ssz} from "@lodestar/types";
 import {ArrayOf, JsonOnlyReq} from "../../../utils/codecs.js";
+import {Endpoint, RequestCodec, RouteDefinitions, Schema} from "../../../utils/index.js";
 import {ExecutionOptimisticAndFinalizedCodec, ExecutionOptimisticAndFinalizedMeta} from "../../../utils/metadata.js";
 import {fromValidatorIdsStr, toValidatorIdsStr} from "../../../utils/serdes.js";
 import {WireFormat} from "../../../utils/wireFormat.js";

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

@@ -4,10 +4,10 @@ import {ssz} from "@lodestar/types";
 import {
   ArrayOf,
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyMetaCodec,
   EmptyRequest,
+  EmptyRequestCodec,
   JsonOnlyResp,
 } from "../../utils/codecs.js";
 import {Endpoint, RouteDefinitions} from "../../utils/index.js";

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

@@ -1,22 +1,22 @@
 import {ContainerType, Type, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
-import {ssz, StringType, BeaconState} from "@lodestar/types";
+import {BeaconState, StringType, ssz} from "@lodestar/types";
 import {
   ArrayOf,
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyMetaCodec,
   EmptyRequest,
+  EmptyRequestCodec,
   WithVersion,
 } from "../../utils/codecs.js";
 import {
   ExecutionOptimisticFinalizedAndVersionCodec,
   ExecutionOptimisticFinalizedAndVersionMeta,
 } from "../../utils/metadata.js";
+import {Schema} from "../../utils/schema.js";
 import {Endpoint, RouteDefinitions} from "../../utils/types.js";
 import {WireFormat} from "../../utils/wireFormat.js";
-import {Schema} from "../../utils/schema.js";
 import {StateArgs} from "./beacon/state.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

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

@@ -1,27 +1,27 @@
 import {ContainerType, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
+import {ForkName} from "@lodestar/params";
 import {
+  Attestation,
+  AttesterSlashing,
   Epoch,
-  phase0,
-  capella,
+  LightClientFinalityUpdate,
+  LightClientOptimisticUpdate,
+  RootHex,
+  SSEPayloadAttributes,
   Slot,
-  ssz,
   StringType,
-  RootHex,
-  altair,
   UintNum64,
-  LightClientOptimisticUpdate,
-  LightClientFinalityUpdate,
-  SSEPayloadAttributes,
-  Attestation,
-  AttesterSlashing,
+  altair,
+  capella,
+  phase0,
+  ssz,
   sszTypesFor,
 } from "@lodestar/types";
-import {ForkName} from "@lodestar/params";
 
-import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {EmptyMeta, EmptyResponseCodec, EmptyResponseData} from "../../utils/codecs.js";
 import {getExecutionForkTypes, getLightClientForkTypes} from "../../utils/fork.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {VersionType} from "../../utils/metadata.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

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

@@ -1,27 +1,27 @@
 import {ListCompositeType, ValueOf} from "@chainsafe/ssz";
+import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
+import {NetworkName, genesisData} from "@lodestar/config/networks";
+import {ForkName, ZERO_HASH} from "@lodestar/params";
 import {
   LightClientBootstrap,
   LightClientFinalityUpdate,
   LightClientOptimisticUpdate,
   LightClientUpdate,
-  ssz,
   SyncPeriod,
+  ssz,
 } from "@lodestar/types";
 import {fromHex} from "@lodestar/utils";
-import {ForkName, ZERO_HASH} from "@lodestar/params";
-import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
-import {genesisData, NetworkName} from "@lodestar/config/networks";
-import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
-import {MetaHeader, VersionCodec, VersionMeta} from "../../utils/metadata.js";
-import {getLightClientForkTypes, toForkName} from "../../utils/fork.js";
 import {
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyMetaCodec,
   EmptyRequest,
+  EmptyRequestCodec,
   WithVersion,
 } from "../../utils/codecs.js";
+import {getLightClientForkTypes, toForkName} from "../../utils/fork.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
+import {MetaHeader, VersionCodec, VersionMeta} from "../../utils/metadata.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 

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

@@ -1,15 +1,15 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {Epoch, RootHex, Slot} from "@lodestar/types";
-import {Schema, Endpoint, RouteDefinitions} from "../../utils/index.js";
 import {
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyRequest,
+  EmptyRequestCodec,
   EmptyResponseCodec,
   EmptyResponseData,
   JsonOnlyResponseCodec,
 } from "../../utils/codecs.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {FilterGetPeers, NodePeer, PeerDirection, PeerState} from "./node.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

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

@@ -1,19 +1,19 @@
 import {ContainerType, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {ssz, stringType} from "@lodestar/types";
-import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {
   ArrayOf,
   EmptyArgs,
-  EmptyRequestCodec,
   EmptyMeta,
   EmptyMetaCodec,
   EmptyRequest,
+  EmptyRequestCodec,
   EmptyResponseCodec,
   EmptyResponseData,
   JsonOnlyResponseCodec,
 } from "../../utils/codecs.js";
 import {HttpStatusCode} from "../../utils/httpStatusCode.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {WireFormat} from "../../utils/wireFormat.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes

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

@@ -1,10 +1,10 @@
 import {CompactMultiProof, ProofType} from "@chainsafe/persistent-merkle-tree";
 import {ByteListType, ContainerType} from "@chainsafe/ssz";
-import {fromHex, toHex} from "@lodestar/utils";
 import {ChainForkConfig} from "@lodestar/config";
 import {ssz} from "@lodestar/types";
-import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
+import {fromHex, toHex} from "@lodestar/utils";
 import {ArrayOf} from "../../utils/codecs.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {VersionCodec, VersionMeta} from "../../utils/metadata.js";
 
 export const CompactMultiProofType = new ContainerType({

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

@@ -2,27 +2,24 @@ import {ContainerType, Type, ValueOf} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {isForkBlobs, isForkPostElectra} from "@lodestar/params";
 import {
-  altair,
+  Attestation,
   BLSSignature,
+  BeaconBlockOrContents,
+  BlindedBeaconBlock,
   CommitteeIndex,
   Epoch,
-  phase0,
+  ProducedBlockSource,
   Root,
   Slot,
-  ssz,
   UintBn64,
   ValidatorIndex,
-  ProducedBlockSource,
-  stringType,
-  BeaconBlockOrContents,
-  BlindedBeaconBlock,
-  Attestation,
+  altair,
+  phase0,
+  ssz,
   sszTypesFor,
+  stringType,
 } from "@lodestar/types";
 import {fromHex, toHex, toRootHex} from "@lodestar/utils";
-import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
-import {fromGraffitiHex, toBoolean, toGraffitiHex} from "../../utils/serdes.js";
-import {getExecutionForkTypes, toForkName} from "../../utils/fork.js";
 import {
   ArrayOf,
   EmptyMeta,
@@ -33,6 +30,9 @@ import {
   WithMeta,
   WithVersion,
 } from "../../utils/codecs.js";
+import {getExecutionForkTypes, toForkName} from "../../utils/fork.js";
+import {fromHeaders} from "../../utils/headers.js";
+import {Endpoint, RouteDefinitions, Schema} from "../../utils/index.js";
 import {
   ExecutionOptimisticAndDependentRootCodec,
   ExecutionOptimisticAndDependentRootMeta,
@@ -43,7 +43,7 @@ import {
   VersionMeta,
   VersionType,
 } from "../../utils/metadata.js";
-import {fromHeaders} from "../../utils/headers.js";
+import {fromGraffitiHex, toBoolean, toGraffitiHex} from "../../utils/serdes.js";
 
 // See /packages/api/src/routes/index.ts for reasoning and instructions to add new routes
 

packages/api/src/beacon/server/events.ts

@@ -1,6 +1,6 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {ApiError, ApplicationMethods, FastifyRoutes, createFastifyRoutes} from "../../utils/server/index.js";
-import {Endpoints, getDefinitions, eventTypes, getEventSerdes} from "../routes/events.js";
+import {Endpoints, eventTypes, getDefinitions, getEventSerdes} from "../routes/events.js";
 
 export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<Endpoints>): FastifyRoutes<Endpoints> {
   const eventSerdes = getEventSerdes(config);

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

@@ -1,5 +1,5 @@
-import type {FastifyInstance} from "fastify";
 import {ChainForkConfig} from "@lodestar/config";
+import type {FastifyInstance} from "fastify";
 import {ApplicationMethods, FastifyRoute} from "../../utils/server/index.js";
 import {Endpoints} from "../routes/index.js";
 

packages/api/src/builder/index.ts

@@ -1,7 +1,7 @@
 import {ChainForkConfig} from "@lodestar/config";
 import {HttpClient, HttpClientModules, HttpClientOptions, IHttpClient} from "../utils/client/httpClient.js";
-import {Endpoints} from "./routes.js";
 import type {ApiClient} from "./client.js";
+import {Endpoints} from "./routes.js";
 
 import * as builder from "./client.js";