upgrade the blocktype on lightclient server import block

ChainSafe · Jan 20, 2023 · 74af4da · 74af4da
1 parent 4319343
commit 74af4da
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/packages/beacon-node/src/chain/blocks/importBlock.ts b/packages/beacon-node/src/chain/blocks/importBlock.ts
@@ -1,4 +1,4 @@
-import {altair, capella, ssz} from "@lodestar/types";
+import {capella, ssz, allForks} from "@lodestar/types";
 import {MAX_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {toHexString} from "@chainsafe/ssz";
 import {
@@ -275,7 +275,7 @@ export async function importBlock(
     if (blockEpoch >= this.config.ALTAIR_FORK_EPOCH) {
       try {
         this.lightClientServer.onImportBlockHead(
-          block.message as altair.BeaconBlock,
+          block.message as allForks.AllForksLightClient["BeaconBlock"],
           postState as CachedBeaconStateAltair,
           parentBlockSlot
         );

diff --git a/packages/beacon-node/src/chain/lightClient/index.ts b/packages/beacon-node/src/chain/lightClient/index.ts
@@ -1,4 +1,4 @@
-import {altair, phase0, Root, RootHex, Slot, ssz, SyncPeriod} from "@lodestar/types";
+import {altair, phase0, Root, RootHex, Slot, ssz, SyncPeriod, allForks} from "@lodestar/types";
 import {IChainForkConfig} from "@lodestar/config";
 import {
   CachedBeaconStateAltair,
@@ -212,7 +212,11 @@ export class LightClientServer {
    * - Persist state witness
    * - Use block's syncAggregate
    */
-  onImportBlockHead(block: altair.BeaconBlock, postState: CachedBeaconStateAltair, parentBlockSlot: Slot): void {
+  onImportBlockHead(
+    block: allForks.AllForksLightClient["BeaconBlock"],
+    postState: CachedBeaconStateAltair,
+    parentBlockSlot: Slot
+  ): void {
     // TEMP: To disable this functionality for fork_choice spec tests.
     // Since the tests have deep-reorgs attested data is not available often printing lots of error logs.
     // While this function is only called for head blocks, best to disable.

diff --git a/packages/types/src/allForks/sszTypes.ts b/packages/types/src/allForks/sszTypes.ts
@@ -108,6 +108,7 @@ export const allForksBlinded = {
 
 export const allForksLightClient = {
   altair: {
+    BeaconBlock: altair.BeaconBlock,
     LightClientHeader: altair.LightClientHeader,
     LightClientBootstrap: altair.LightClientBootstrap,
     LightClientUpdate: altair.LightClientUpdate,
@@ -116,6 +117,7 @@ export const allForksLightClient = {
     LightClientStore: altair.LightClientStore,
   },
   bellatrix: {
+    BeaconBlock: bellatrix.BeaconBlock,
     LightClientHeader: altair.LightClientHeader,
     LightClientBootstrap: altair.LightClientBootstrap,
     LightClientUpdate: altair.LightClientUpdate,
@@ -124,6 +126,7 @@ export const allForksLightClient = {
     LightClientStore: altair.LightClientStore,
   },
   capella: {
+    BeaconBlock: capella.BeaconBlock,
     LightClientHeader: capella.LightClientHeader,
     LightClientBootstrap: capella.LightClientBootstrap,
     LightClientUpdate: capella.LightClientUpdate,
@@ -132,6 +135,7 @@ export const allForksLightClient = {
     LightClientStore: capella.LightClientStore,
   },
   eip4844: {
+    BeaconBlock: eip4844.BeaconBlock,
     LightClientHeader: eip4844.LightClientHeader,
     LightClientBootstrap: eip4844.LightClientBootstrap,
     LightClientUpdate: eip4844.LightClientUpdate,

diff --git a/packages/types/src/allForks/types.ts b/packages/types/src/allForks/types.ts
@@ -112,7 +112,13 @@ export type AllForksBlindedTypes = {
 };
 
 export type AllForksLightClient = {
+  BeaconBlock: altair.BeaconBlock | bellatrix.BeaconBlock | capella.BeaconBlock | eip4844.BeaconBlock;
   LightClientHeader: LightClientHeader;
+  LightClientBootstrap: LightClientBootstrap;
+  LightClientUpdate: LightClientUpdate;
+  LightClientFinalityUpdate: LightClientFinalityUpdate;
+  LightClientOptimisticUpdate: LightClientOptimisticUpdate;
+  LightClientStore: LightClientStore;
 };
 
 /**
@@ -222,6 +228,9 @@ export type AllForksBlindedSSZTypes = {
 };
 
 export type AllForksLightClientSSZTypes = {
+  BeaconBlock: AllForksTypeOf<
+    typeof altairSsz.BeaconBlock | typeof capellaSsz.BeaconBlock | typeof eip4844Ssz.BeaconBlock
+  >;
   LightClientHeader: AllForksTypeOf<
     typeof altairSsz.LightClientHeader | typeof capellaSsz.LightClientHeader | typeof eip4844Ssz.LightClientHeader
   >;