Portal beacon: reset LC store on setting new trusted block root (#3331)

kdeme · web-flow · commit aff4b93a5067 · 2025-05-26T19:24:28.000+02:00
diff --git a/portal/client/nimbus_portal_client.nim b/portal/client/nimbus_portal_client.nim
@@ -328,7 +328,8 @@ proc run(portalClient: PortalClient, config: PortalConf) {.raises: [CatchableErr
           rpcServer.installPortalBeaconApiHandlers(
             node.beaconNetwork.value.portalProtocol
           )
-          rpcServer.installPortalNimbusBeaconApiHandlers(node.beaconNetwork.value)
+        if node.beaconLightClient.isSome():
+          rpcServer.installPortalNimbusBeaconApiHandlers(node.beaconLightClient.value)
         if node.stateNetwork.isSome():
           rpcServer.installPortalCommonApiHandlers(
             node.stateNetwork.value.portalProtocol, PortalSubnetwork.state
diff --git a/portal/network/beacon/beacon_light_client.nim b/portal/network/beacon/beacon_light_client.nim
@@ -1,5 +1,5 @@
 # Nimbus - Portal Network
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -193,6 +193,29 @@ proc stop*(lightClient: LightClient) {.async: (raises: []).} =
 proc resetToFinalizedHeader*(
     lightClient: LightClient,
     header: ForkedLightClientHeader,
-    current_sync_committee: altair.SyncCommittee,
+    current_sync_committee: SyncCommittee,
 ) =
   lightClient.processor[].resetToFinalizedHeader(header, current_sync_committee)
+
+proc resetToTrustedBlockRoot*(
+    lightClient: LightClient, trustedBlockRoot: Digest
+) {.async: (raises: [CancelledError]).} =
+  lightClient.network.trustedBlockRoot = Opt.some(trustedBlockRoot)
+
+  let bootstrap = (await lightClient.network.getLightClientBootstrap(trustedBlockRoot)).valueOr:
+    warn "Could not get bootstrap, wait for offer"
+    # Empty, this will reset the LC store.
+    # Then it will continue requesting or can receive through an offer
+    lightClient.processor[].resetToFinalizedHeader(
+      ForkedLightClientHeader(), SyncCommittee()
+    )
+    return
+
+  withForkyBootstrap(bootstrap):
+    when lcDataFork > LightClientDataFork.None:
+      let forkedHeader = ForkedLightClientHeader.init(forkyBootstrap.header)
+      lightClient.resetToFinalizedHeader(
+        forkedHeader, forkyBootstrap.current_sync_committee
+      )
+    else:
+      warn "Could not reset to trusted block root: no light client header pre Altair"
diff --git a/portal/rpc/rpc_portal_nimbus_beacon_api.nim b/portal/rpc/rpc_portal_nimbus_beacon_api.nim
@@ -7,13 +7,13 @@
 
 {.push raises: [].}
 
-import json_rpc/rpcserver, ../network/beacon/beacon_network
+import json_rpc/rpcserver, ../network/beacon/beacon_light_client
 
 export rpcserver
 
 # nimbus portal specific RPC methods for the Portal beacon network.
-proc installPortalNimbusBeaconApiHandlers*(rpcServer: RpcServer, n: BeaconNetwork) =
+proc installPortalNimbusBeaconApiHandlers*(rpcServer: RpcServer, lc: LightClient) =
   rpcServer.rpc("portal_nimbus_beaconSetTrustedBlockRoot") do(blockRoot: string) -> bool:
     let root = Digest.fromHex(blockRoot)
-    n.trustedBlockRoot = Opt.some(root)
+    await lc.resetToTrustedBlockRoot(root)
     true
