Rename finalized history network to history network

Author: kdeme

portal/network/finalized_history/content/content_keys.nim renamed to portal/network/history/content/content_keys.nim

@@ -7,16 +7,16 @@
 
 {.push raises: [].}
 
-import results, chronicles, chronos, ./finalized_history_network
+import results, chronicles, chronos, ./history_network
 
-export results, finalized_history_network
+export results, history_network
 
 proc getBlockBody*(
-    n: FinalizedHistoryNetwork, header: Header
+    n: HistoryNetwork, header: Header
 ): Future[Opt[BlockBody]] {.async: (raises: [CancelledError], raw: true).} =
   n.getContent(blockBodyContentKey(header.number), BlockBody, header)
 
 proc getReceipts*(
-    n: FinalizedHistoryNetwork, header: Header
+    n: HistoryNetwork, header: Header
 ): Future[Opt[BlockBody]] {.async: (raises: [CancelledError], raw: true).} =
   n.getContent(blockBodyContentKey(header.number), BlockBody, header)

portal/network/finalized_history/content/content_values.nim renamed to portal/network/history/content/content_values.nim

@@ -18,11 +18,11 @@ import
   ../../database/content_db,
   # ../network_metadata,
   ../wire/[portal_protocol, portal_stream, portal_protocol_config, ping_extensions],
-  "."/[finalized_history_content, finalized_history_validation]
+  "."/[history_content, history_validation]
 
 from eth/common/accounts import EMPTY_ROOT_HASH
 
-export finalized_history_content, headers
+export history_content, headers
 
 logScope:
   topics = "portal_fin_hist"
@@ -34,7 +34,7 @@ type
     async: (raises: [CancelledError]), gcsafe
   .}
 
-  FinalizedHistoryNetwork* = ref object
+  HistoryNetwork* = ref object
     portalProtocol*: PortalProtocol
     contentDB*: ContentDB
     contentQueue*: AsyncQueue[(Opt[NodeId], ContentKeysList, seq[seq[byte]])]
@@ -57,7 +57,7 @@ func toContentIdHandler(contentKey: ContentKeyByteList): results.Opt[ContentId]
   toContentId(contentKey)
 
 proc new*(
-    T: type FinalizedHistoryNetwork,
+    T: type HistoryNetwork,
     portalNetwork: PortalNetwork,
     baseProtocol: protocol.Protocol,
     contentDB: ContentDB,
@@ -78,7 +78,7 @@ proc new*(
 
     portalProtocol = PortalProtocol.new(
       baseProtocol,
-      getProtocolId(portalNetwork, PortalSubnetwork.finalizedHistory),
+      getProtocolId(portalNetwork, PortalSubnetwork.history),
       toContentIdHandler,
       createGetHandler(contentDB),
       createStoreHandler(contentDB, portalConfig.radiusConfig),
@@ -90,7 +90,7 @@ proc new*(
       pingExtensionCapabilities = pingExtensionCapabilities,
     )
 
-  FinalizedHistoryNetwork(
+  HistoryNetwork(
     portalProtocol: portalProtocol,
     contentDB: contentDB,
     contentQueue: contentQueue,
@@ -101,10 +101,7 @@ proc new*(
   )
 
 proc getContent*(
-    n: FinalizedHistoryNetwork,
-    contentKey: ContentKey,
-    V: type ContentValueType,
-    header: Header,
+    n: HistoryNetwork, contentKey: ContentKey, V: type ContentValueType, header: Header
 ): Future[Opt[V]] {.async: (raises: [CancelledError]).} =
   ## Get the decoded content for the given content key.
   ##
@@ -161,11 +158,11 @@ proc getContent*(
   Opt.none(V)
 
 proc validateContent(
-    n: FinalizedHistoryNetwork, content: seq[byte], contentKeyBytes: ContentKeyByteList
+    n: HistoryNetwork, content: seq[byte], contentKeyBytes: ContentKeyByteList
 ): Future[Result[void, string]] {.async: (raises: [CancelledError]).} =
   # TODO: specs might turn out to just disable offers. Although I think for for getting initial data in the network
   # this might be an issue. Unless history expiry gets deployed together with Portal.
-  let contentKey = finalized_history_content.decode(contentKeyBytes).valueOr:
+  let contentKey = history_content.decode(contentKeyBytes).valueOr:
     return err("Error decoding content key")
 
   let header = ?(await n.getHeader(contentKey.blockNumber()))
@@ -189,7 +186,7 @@ proc validateContent(
     ok()
 
 proc validateContent(
-    n: FinalizedHistoryNetwork,
+    n: HistoryNetwork,
     srcNodeId: Opt[NodeId],
     contentKeys: ContentKeysList,
     contentItems: seq[seq[byte]],
@@ -218,7 +215,7 @@ proc validateContent(
 
   return true
 
-proc contentQueueWorker(n: FinalizedHistoryNetwork) {.async: (raises: []).} =
+proc contentQueueWorker(n: HistoryNetwork) {.async: (raises: []).} =
   try:
     while true:
       let (srcNodeId, contentKeys, contentItems) = await n.contentQueue.popFirst()
@@ -236,7 +233,7 @@ proc contentQueueWorker(n: FinalizedHistoryNetwork) {.async: (raises: []).} =
   except CancelledError:
     trace "contentQueueWorker canceled"
 
-proc statusLogLoop(n: FinalizedHistoryNetwork) {.async: (raises: []).} =
+proc statusLogLoop(n: HistoryNetwork) {.async: (raises: []).} =
   try:
     while true:
       await sleepAsync(60.seconds)
@@ -246,9 +243,8 @@ proc statusLogLoop(n: FinalizedHistoryNetwork) {.async: (raises: []).} =
   except CancelledError:
     trace "statusLogLoop canceled"
 
-proc start*(n: FinalizedHistoryNetwork) =
-  info "Starting Portal finalized chain history network",
-    protocolId = n.portalProtocol.protocolId
+proc start*(n: HistoryNetwork) =
+  info "Starting Portal chain history network", protocolId = n.portalProtocol.protocolId
 
   n.portalProtocol.start()
 
@@ -257,8 +253,8 @@ proc start*(n: FinalizedHistoryNetwork) =
 
   n.statusLogLoop = statusLogLoop(n)
 
-proc stop*(n: FinalizedHistoryNetwork) {.async: (raises: []).} =
-  info "Stopping Portal finalized chain history network"
+proc stop*(n: HistoryNetwork) {.async: (raises: []).} =
+  info "Stopping Portal chain history network"
 
   var futures: seq[Future[void]]
   futures.add(n.portalProtocol.stop())

portal/network/finalized_history/finalized_history_content.nim renamed to portal/network/history/history_content.nim

@@ -10,7 +10,7 @@
 import
   eth/trie/ordered_trie,
   eth/common/[headers_rlp, blocks_rlp, receipts, hashes],
-  ./finalized_history_content
+  ./history_content
 
 func validateBlockBody*(body: BlockBody, header: Header): Result[void, string] =
   ## Validate the block body against the txRoot, ommersHash and withdrawalsRoot

portal/network/finalized_history/finalized_history_endpoints.nim renamed to portal/network/history/history_endpoints.nim

@@ -17,7 +17,7 @@ import
   ../database/content_db,
   ./network_metadata,
   ./wire/[portal_stream, portal_protocol_config],
-  ./finalized_history/finalized_history_network,
+  ./history/history_network,
   ./beacon/[beacon_init_loader, beacon_light_client],
   ./legacy_history/[history_network, history_content],
   ./state/[state_network, state_content]
@@ -43,7 +43,7 @@ type
     discovery: protocol.Protocol
     contentDB: ContentDB
     streamManager: StreamManager
-    finalizedHistoryNetwork*: Opt[FinalizedHistoryNetwork]
+    historyNetwork*: Opt[HistoryNetwork]
     beaconNetwork*: Opt[BeaconNetwork]
     legacyHistoryNetwork*: Opt[LegacyHistoryNetwork]
     stateNetwork*: Opt[StateNetwork]
@@ -109,10 +109,10 @@ proc new*(
         # Get it from binary file containing SSZ encoded accumulator
         loadAccumulator()
 
-    finalizedHistoryNetwork =
-      if PortalSubnetwork.finalizedHistory in subnetworks:
+    historyNetwork =
+      if PortalSubnetwork.history in subnetworks:
         Opt.some(
-          FinalizedHistoryNetwork.new(
+          HistoryNetwork.new(
             network,
             discovery,
             contentDB,
@@ -125,7 +125,7 @@ proc new*(
           )
         )
       else:
-        Opt.none(FinalizedHistoryNetwork)
+        Opt.none(HistoryNetwork)
 
     beaconNetwork =
       if PortalSubnetwork.beacon in subnetworks:
@@ -216,7 +216,7 @@ proc new*(
     discovery: discovery,
     contentDB: contentDB,
     streamManager: streamManager,
-    finalizedHistoryNetwork: finalizedHistoryNetwork,
+    historyNetwork: historyNetwork,
     beaconNetwork: beaconNetwork,
     legacyHistoryNetwork: legacyHistoryNetwork,
     stateNetwork: stateNetwork,
@@ -250,8 +250,8 @@ proc start*(n: PortalNode) =
 
   n.discovery.start()
 
-  if n.finalizedHistoryNetwork.isSome():
-    n.finalizedHistoryNetwork.value.start()
+  if n.historyNetwork.isSome():
+    n.historyNetwork.value.start()
   if n.beaconNetwork.isSome():
     n.beaconNetwork.value.start()
   if n.legacyHistoryNetwork.isSome():
@@ -269,8 +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.historyNetwork.isSome():
+    futures.add(n.historyNetwork.value.stop())
   if n.beaconNetwork.isSome():
     futures.add(n.beaconNetwork.value.stop())
   if n.legacyHistoryNetwork.isSome():

portal/network/finalized_history/finalized_history_network.nim renamed to portal/network/history/history_network.nim

@@ -308,14 +308,12 @@ func getProtocolId*(
   case network
   of PortalNetwork.none, PortalNetwork.mainnet:
     case subnetwork
-    of PortalSubnetwork.finalizedHistory:
+    of PortalSubnetwork.history:
       [portalPrefix, 0x00]
     of PortalSubnetwork.state:
       [portalPrefix, 0x0A]
     of PortalSubnetwork.legacyHistory:
       [portalPrefix, 0x0B]
-    of PortalSubnetwork.history:
-      raiseAssert "Not yet supported"
     of PortalSubnetwork.beacon:
       [portalPrefix, 0x0C]
     of PortalSubnetwork.transactionIndex:
@@ -326,14 +324,12 @@ func getProtocolId*(
       [portalPrefix, 0x0F]
   of PortalNetwork.angelfood:
     case subnetwork
-    of PortalSubnetwork.finalizedHistory:
+    of PortalSubnetwork.history:
       [portalPrefix, 0x40]
     of PortalSubnetwork.state:
       [portalPrefix, 0x4A]
     of PortalSubnetwork.legacyHistory:
       [portalPrefix, 0x4B]
-    of PortalSubnetwork.history:
-      raiseAssert "Not yet supported"
     of PortalSubnetwork.beacon:
       [portalPrefix, 0x4C]
     of PortalSubnetwork.transactionIndex:

portal/network/finalized_history/finalized_history_validation.nim renamed to portal/network/history/history_validation.nim

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

portal/network/portal_node.nim

@@ -13,13 +13,13 @@ import
   stew/byteutils,
   ../common/common_types,
   ../network/wire/portal_protocol,
-  ../network/finalized_history/finalized_history_content,
-  ../network/finalized_history/finalized_history_validation,
+  ../network/history/history_content,
+  ../network/history/history_validation,
   ./rpc_types
 
 export tables
 
-# Portal Finalized History Network JSON-RPC API
+# Portal History Network JSON-RPC API
 # Note:
 # - This API is not part of the Portal Network specification yet.
 # - Lower level API calls are not implemented as they are typically only used for (Hive)
@@ -40,7 +40,7 @@ TraceResponse.useDefaultSerializationIn JrpcConv
 proc installPortalFinalizedHistoryApiHandlers*(
     rpcServer: RpcServer, p: PortalProtocol
 ) =
-  rpcServer.rpc("portal_finalizedHistoryGetContent") do(
+  rpcServer.rpc("portal_historyGetContent") do(
     contentKeyBytes: string, headerBytes: string
   ) -> ContentInfo:
     let
@@ -73,7 +73,7 @@ proc installPortalFinalizedHistoryApiHandlers*(
       utpTransfer: contentLookupResult.utpTransfer,
     )
 
-  rpcServer.rpc("portal_finalizedHistoryTraceGetContent") do(
+  rpcServer.rpc("portal_historyTraceGetContent") do(
     contentKeyBytes: string, headerBytes: string
   ) -> TraceContentLookupResult:
     let
@@ -114,7 +114,7 @@ proc installPortalFinalizedHistoryApiHandlers*(
 
     res
 
-  rpcServer.rpc("portal_finalizedHistoryPutContent") do(
+  rpcServer.rpc("portal_historyPutContent") do(
     contentKeyBytes: string, contentValueBytes: string
   ) -> PutContentResult:
     let