Update HistoryNetwork types to match specs

packages/portalnetwork/package.json

@@ -68,7 +68,6 @@
     "@types/ws": "^7.4.7",
     "@vitest/coverage-v8": "^3.0.2",
     "@vitest/ui": "^3.0.2",
-    "eslint": "^8.6.0",
     "js-yaml": "^4.1.0",
     "tslib": "^2.3.1",
     "typedoc": "^0.28.0",
@@ -104,4 +103,4 @@
       "optional": true
     }
   }
-}
+}

packages/portalnetwork/src/networks/history/history.ts

@@ -3,21 +3,20 @@
 import { bytesToHex, bytesToInt, concatBytes, equalsBytes, hexToBytes } from '@ethereumjs/util'
 import debug from 'debug'
 
-import type {
-  BaseNetworkConfig,
-  ContentLookupResponse,
-  EphemeralHeaderKeyValues,
-  FindContentMessage,
-  INodeAddress,
-} from '../../index.js'
 import {
+  type BaseNetworkConfig,
   BasicRadius,
   BiMap,
   ClientInfoAndCapabilities,
+  type ContentLookupResponse,
   ContentMessageType,
+  type EphemeralHeaderKeyValues,
+  type FindContentMessage,
   FoundContent,
-  HistoricalSummariesBlockProof,
+  HistoricalSummariesBlockProofCapella,
+  HistoricalSummariesBlockProofDeneb,
   HistoryRadius,
+  type INodeAddress,
   MAX_UDP_PACKET_SIZE,
   MessageCodes,
   PortalWireMessageType,
@@ -39,6 +38,7 @@
   AccumulatorProofType,
   BlockHeaderWithProof,
   BlockNumberKey,
+  CANCUN_BLOCK,
   EphemeralHeaderPayload,
   HistoricalRootsBlockProof,
   HistoryNetworkContentType,
@@ -187,7 +187,7 @@
     }
     const proof = headerProof.proof
 
-    if (header.number < MERGE_BLOCK) {
+    if (header.number <= MERGE_BLOCK) {
       let deserializedProof: Uint8Array[]
       try {
         deserializedProof = AccumulatorProofType.deserialize(proof)
@@ -231,17 +231,23 @@
         throw new Error(msg)
       }
       if (!validated) {
         throw new Error('Unable to validate proof for post-merge header')
       }
     } else {
       // TODO: Check proof slot to ensure header is from previous sync period and handle ephemeral headers separately
-
-      let deserializedProof: ReturnType<typeof HistoricalSummariesBlockProof.deserialize>
+      let deserializedProof: ReturnType<
+        | typeof HistoricalSummariesBlockProofCapella.deserialize
+        | typeof HistoricalSummariesBlockProofDeneb.deserialize
+      >
       try {
-        deserializedProof = HistoricalSummariesBlockProof.deserialize(proof)
+        if (header.number < CANCUN_BLOCK) {
+          deserializedProof = HistoricalSummariesBlockProofCapella.deserialize(proof)
+        } else {
+          deserializedProof = HistoricalSummariesBlockProofDeneb.deserialize(proof)
+        }
       } catch (err: any) {
         this.logger(`invalid proof for block ${bytesToHex(header.hash())}`)
         throw new Error(`invalid proof for block ${bytesToHex(header.hash())}`)
       }
       const beacon = this.portal.network()['0x500c']
       if (beacon !== undefined && beacon.lightClient?.status === RunStatusCode.started) {

packages/portalnetwork/src/networks/history/types.ts

@@ -27,6 +27,7 @@ export const MAX_ENCODED_UNCLES_LENGTH = 131072 // MAX_HEADER_LENGTH * 2 ** 4
 export const MAX_HEADER_PROOF_LENGTH = 1024
 export const MERGE_BLOCK = 15537393n
 export const SHANGHAI_BLOCK = 17034871n
+export const CANCUN_BLOCK = 19426587n
 
 export const CAPELLA_ERA = 758 // The era/period in which the Capella fork happened on CL
 
@@ -190,22 +191,30 @@ export const BlockNumberKey = new ContainerType({
 /** Post-merge pre-Capella block header proof types */
 export const SlotType = new UintBigintType(8)
 export const BeaconBlockProofHistoricalRoots = new VectorCompositeType(Bytes32Type, 14)
-export const PostMergeExecutionBlockProof = new VectorCompositeType(Bytes32Type, 11)
-
+export const ExecutionBlockProofBellatrix = new VectorCompositeType(Bytes32Type, 11)
 export const HistoricalRootsBlockProof = new ContainerType({
-  historicalRootsProof: BeaconBlockProofHistoricalRoots,
+  beaconBlockProof: BeaconBlockProofHistoricalRoots,
   beaconBlockRoot: Bytes32Type,
-  beaconBlockProof: PostMergeExecutionBlockProof,
+  executionBlockProof: ExecutionBlockProofBellatrix,
   slot: SlotType,
 })
 
 /** Post-Capella block header proof types */
-export const PostCapellaExecutionBlockProof = new ListCompositeType(Bytes32Type, 12)
 export const BeaconBlockProofHistoricalSummaries = new VectorCompositeType(Bytes32Type, 13)
-export const HistoricalSummariesBlockProof = new ContainerType({
-  historicalSummariesProof: BeaconBlockProofHistoricalSummaries,
+
+export const HistoricalSummariesBlockProofCapella = new ContainerType({
+  beaconBlockProof: BeaconBlockProofHistoricalSummaries,
+  beaconBlockRoot: Bytes32Type,
+  executionBlockProof: ExecutionBlockProofBellatrix,
+  slot: SlotType,
+})
+
+/** Post-Deneb block header proof types */
+export const PostDenebExecutionBlockProof = new VectorCompositeType(Bytes32Type, 12)
+export const HistoricalSummariesBlockProofDeneb = new ContainerType({
+  beaconBlockProof: BeaconBlockProofHistoricalSummaries,
   beaconBlockRoot: Bytes32Type,
-  beaconBlockProof: PostCapellaExecutionBlockProof,
+  executionBlockProof: PostDenebExecutionBlockProof,
   slot: SlotType,
 })