Use consistent type-guards in blinded block checks

packages/state-transition/src/block/processBlockHeader.ts

@@ -1,5 +1,5 @@
 import {toHexString, byteArrayEquals} from "@chainsafe/ssz";
-import {allForks, ssz, bellatrix} from "@lodestar/types";
+import {allForks, ssz, isBlindedBeaconBlock} from "@lodestar/types";
 import {CachedBeaconStateAllForks} from "../types.js";
 import {ZERO_HASH} from "../constants/index.js";
 
@@ -37,10 +37,9 @@ export function processBlockHeader(state: CachedBeaconStateAllForks, block: allF
     );
   }
 
-  const bodyRoot =
-    (block.body as bellatrix.BlindedBeaconBlockBody).executionPayloadHeader !== undefined
-      ? ssz.bellatrix.BlindedBeaconBlockBody.hashTreeRoot(block.body as bellatrix.BlindedBeaconBlockBody)
-      : types.BeaconBlockBody.hashTreeRoot(block.body as bellatrix.BeaconBlockBody);
+  const bodyRoot = isBlindedBeaconBlock(block)
+    ? ssz.bellatrix.BlindedBeaconBlockBody.hashTreeRoot(block.body)
+    : types.BeaconBlockBody.hashTreeRoot(block.body);
 
   // cache current block as the new latest block
   state.latestBlockHeader = ssz.phase0.BeaconBlockHeader.toViewDU({

packages/state-transition/src/signatureSets/proposer.ts

@@ -1,6 +1,6 @@
 import {DOMAIN_BEACON_PROPOSER} from "@lodestar/params";
-import {allForks, ssz} from "@lodestar/types";
-import {computeSigningRoot, isBlindedBeaconBlock} from "../util/index.js";
+import {allForks, ssz, isBlindedBeaconBlock} from "@lodestar/types";
+import {computeSigningRoot} from "../util/index.js";
 import {ISignatureSet, SignatureSetType, verifySignatureSet} from "../util/signatureSets.js";
 import {CachedBeaconStateAllForks} from "../types.js";
 

packages/state-transition/src/util/bellatrix.ts

@@ -1,4 +1,4 @@
-import {allForks, bellatrix, ssz} from "@lodestar/types";
+import {allForks, bellatrix, isBlindedBeaconBlock, ssz} from "@lodestar/types";
 import {
   BeaconStateBellatrix,
   BeaconStateAllForks,
@@ -73,8 +73,8 @@ export function isBellatrixBlockBodyType(blockBody: allForks.BeaconBlockBody): b
 export function getFullOrBlindedPayload(
   block: allForks.FullOrBlindedBeaconBlock
 ): allForks.FullOrBlindedExecutionPayload {
-  if ((block as bellatrix.BlindedBeaconBlock).body.executionPayloadHeader !== undefined) {
-    return (block as bellatrix.BlindedBeaconBlock).body.executionPayloadHeader;
+  if (isBlindedBeaconBlock(block)) {
+    return block.body.executionPayloadHeader;
   } else if ((block as bellatrix.BeaconBlock).body.executionPayload !== undefined) {
     return (block as bellatrix.BeaconBlock).body.executionPayload;
   } else {
@@ -87,7 +87,3 @@ export function isExecutionPayload(
 ): payload is bellatrix.ExecutionPayload {
   return (payload as bellatrix.ExecutionPayload).transactions !== undefined;
 }
-
-export function isBlindedBeaconBlock(block: allForks.FullOrBlindedBeaconBlock): block is bellatrix.BlindedBeaconBlock {
-  return (block as bellatrix.BlindedBeaconBlock).body.executionPayloadHeader !== undefined;
-}

packages/types/src/index.ts

@@ -1,4 +1,6 @@
 export * from "./types.js";
 export * as ssz from "./sszTypes.js";
+// Typeguards
+export * from "./utils/typeguards.js";
 // String type
 export {StringType} from "./utils/StringType.js";

packages/types/src/utils/typeguards.ts

@@ -0,0 +1,12 @@
+import {FullOrBlindedBeaconBlock, FullOrBlindedSignedBeaconBlock} from "../allForks/types.js";
+import {ts as bellatrix} from "../bellatrix/index.js";
+
+export function isBlindedBeaconBlock(block: FullOrBlindedBeaconBlock): block is bellatrix.BlindedBeaconBlock {
+  return (block as bellatrix.BlindedBeaconBlock).body.executionPayloadHeader !== undefined;
+}
+
+export function isBlindedSignedBeaconBlock(
+  signedBlock: FullOrBlindedSignedBeaconBlock
+): signedBlock is bellatrix.SignedBlindedBeaconBlock {
+  return (signedBlock as bellatrix.SignedBlindedBeaconBlock).message.body.executionPayloadHeader !== undefined;
+}

packages/validator/src/services/block.ts

@@ -1,4 +1,4 @@
-import {BLSPubkey, Slot, BLSSignature, allForks, bellatrix} from "@lodestar/types";
+import {BLSPubkey, Slot, BLSSignature, allForks, bellatrix, isBlindedBeaconBlock} from "@lodestar/types";
 import {IChainForkConfig} from "@lodestar/config";
 import {ForkName} from "@lodestar/params";
 import {extendError, prettyBytes} from "@lodestar/utils";
@@ -104,7 +104,7 @@ export class BlockProposingService {
   }
 
   private publishBlockWrapper = async (signedBlock: allForks.FullOrBlindedSignedBeaconBlock): Promise<void> => {
-    return (signedBlock.message.body as bellatrix.BlindedBeaconBlockBody).executionPayloadHeader !== undefined
+    return isBlindedBeaconBlock(signedBlock.message)
       ? this.api.beacon.publishBlindedBlock(signedBlock as bellatrix.SignedBlindedBeaconBlock)
       : this.api.beacon.publishBlock(signedBlock as allForks.SignedBeaconBlock);
   };

packages/validator/src/util/blindedBlock.ts

@@ -1,11 +1,11 @@
 import {IChainForkConfig} from "@lodestar/config";
-import {allForks, bellatrix, phase0, Root, ssz} from "@lodestar/types";
+import {allForks, phase0, Root, ssz, isBlindedBeaconBlock} from "@lodestar/types";
 
 export function blindedOrFullBlockHashTreeRoot(
   config: IChainForkConfig,
   blindedOrFull: allForks.FullOrBlindedBeaconBlock
 ): Root {
-  return isBlindedBlock(blindedOrFull)
+  return isBlindedBeaconBlock(blindedOrFull)
     ? // Blinded
       ssz.bellatrix.BlindedBeaconBlock.hashTreeRoot(blindedOrFull)
     : // Full
@@ -16,7 +16,7 @@ export function blindedOrFullBlockToHeader(
   config: IChainForkConfig,
   blindedOrFull: allForks.FullOrBlindedBeaconBlock
 ): phase0.BeaconBlockHeader {
-  const bodyRoot = isBlindedBlock(blindedOrFull)
+  const bodyRoot = isBlindedBeaconBlock(blindedOrFull)
     ? // Blinded
       ssz.bellatrix.BlindedBeaconBlockBody.hashTreeRoot(blindedOrFull.body)
     : // Full
@@ -30,10 +30,3 @@ export function blindedOrFullBlockToHeader(
     bodyRoot,
   };
 }
-
-/** Typeguard for ternary operators */
-function isBlindedBlock(
-  blindedOrFull: allForks.FullOrBlindedBeaconBlock
-): blindedOrFull is bellatrix.BlindedBeaconBlock {
-  return (blindedOrFull.body as bellatrix.BlindedBeaconBlockBody).executionPayloadHeader !== undefined;
-}