Enable finalized history network to portal client

Author: kdeme

portal/client/nimbus_portal_client_conf.nim

@@ -106,7 +106,7 @@ type
 
     portalSubnetworks* {.
       desc: "Select which networks (Portal sub-protocols) to enable",
-      defaultValue: {PortalSubnetwork.history, PortalSubnetwork.beacon},
+      defaultValue: {PortalSubnetwork.finalizedHistory, PortalSubnetwork.history, PortalSubnetwork.beacon},
       name: "portal-subnetworks"
     .}: set[PortalSubnetwork]
 

portal/network/finalized_history/finalized_history_network.nim

@@ -61,7 +61,7 @@ proc new*(
 
     portalProtocol = PortalProtocol.new(
       baseProtocol,
-      [byte(0x50), 0x00], # TODO: Adapt getProtocolId
+      getProtocolId(portalNetwork, PortalSubnetwork.finalizedHistory),
       toContentIdHandler,
       createGetHandler(contentDB),
       createStoreHandler(contentDB, portalConfig.radiusConfig),

portal/network/portal_node.nim

@@ -17,6 +17,7 @@ import
   ../database/content_db,
   ./network_metadata,
   ./wire/[portal_stream, portal_protocol_config],
+  ./finalized_history/finalized_history_network,
   ./beacon/[beacon_init_loader, beacon_light_client],
   ./history/[history_network, history_content],
   ./state/[state_network, state_content]
@@ -42,6 +43,7 @@ type
     discovery: protocol.Protocol
     contentDB: ContentDB
     streamManager: StreamManager
+    finalizedHistoryNetwork*: Opt[FinalizedHistoryNetwork]
     beaconNetwork*: Opt[BeaconNetwork]
     historyNetwork*: Opt[HistoryNetwork]
     stateNetwork*: Opt[StateNetwork]
@@ -107,6 +109,24 @@ proc new*(
         # Get it from binary file containing SSZ encoded accumulator
         loadAccumulator()
 
+    finalizedHistoryNetwork =
+      if PortalSubnetwork.finalizedHistory in subnetworks:
+        Opt.some(
+          FinalizedHistoryNetwork.new(
+            network,
+            discovery,
+            contentDB,
+            streamManager,
+            bootstrapRecords = bootstrapRecords,
+            portalConfig = config.portalConfig,
+            contentRequestRetries = config.contentRequestRetries,
+            contentQueueWorkers = config.contentQueueWorkers,
+            contentQueueSize = config.contentQueueSize,
+          )
+        )
+      else:
+        Opt.none(FinalizedHistoryNetwork)
+
     beaconNetwork =
       if PortalSubnetwork.beacon in subnetworks:
         let
@@ -196,6 +216,7 @@ proc new*(
     discovery: discovery,
     contentDB: contentDB,
     streamManager: streamManager,
+    finalizedHistoryNetwork: finalizedHistoryNetwork,
     beaconNetwork: beaconNetwork,
     historyNetwork: historyNetwork,
     stateNetwork: stateNetwork,
@@ -229,6 +250,8 @@ proc start*(n: PortalNode) =
 
   n.discovery.start()
 
+  if n.finalizedHistoryNetwork.isSome():
+    n.finalizedHistoryNetwork.value.start()
   if n.beaconNetwork.isSome():
     n.beaconNetwork.value.start()
   if n.historyNetwork.isSome():
@@ -246,6 +269,8 @@ proc stop*(n: PortalNode) {.async: (raises: []).} =
 
   var futures: seq[Future[void]]
 
+  if n.finalizedHistoryNetwork.isSome():
+    futures.add(n.finalizedHistoryNetwork.value.stop())
   if n.beaconNetwork.isSome():
     futures.add(n.beaconNetwork.value.stop())
   if n.historyNetwork.isSome():

portal/network/wire/portal_protocol.nim

@@ -308,6 +308,8 @@ func getProtocolId*(
   case network
   of PortalNetwork.none, PortalNetwork.mainnet:
     case subnetwork
+    of PortalSubnetwork.finalizedHistory:
+      [portalPrefix, 0x00]
     of PortalSubnetwork.state:
       [portalPrefix, 0x0A]
     of PortalSubnetwork.history:
@@ -322,6 +324,8 @@ func getProtocolId*(
       [portalPrefix, 0x0F]
   of PortalNetwork.angelfood:
     case subnetwork
+    of PortalSubnetwork.finalizedHistory:
+      [portalPrefix, 0x40]
     of PortalSubnetwork.state:
       [portalPrefix, 0x4A]
     of PortalSubnetwork.history:

portal/network/wire/portal_protocol_config.nim

@@ -17,6 +17,7 @@ type
 
   # The Portal sub-protocols
   PortalSubnetwork* = enum
+    finalizedHistory
     state
     history
     beacon