Simplify bootstrap finding

ethereumjs · Oct 24, 2024 · b9e2ef2 · b9e2ef2
1 parent 5bcaa75
commit b9e2ef2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 51 deletions.
diff --git a/packages/cli/src/rpc/modules/portal.ts b/packages/cli/src/rpc/modules/portal.ts
@@ -1194,19 +1194,8 @@ export class portal {
     const [bootstrapHash] = params
     this.logger(`portal_beaconStartLightClient request received for ${bootstrapHash}`)
     try {
-      const lookup = new ContentLookup(
-        this._beacon,
-        getBeaconContentKey(
-          BeaconLightClientNetworkContentType.LightClientBootstrap,
-          fromHexString(bootstrapHash),
-        ),
-      )
-      const res = await lookup.startLookup()
-      if (res !== undefined && 'content' in res) {
-        await this._beacon.initializeLightClient(bootstrapHash)
-        return true
-      }
-      return false
+      await this._beacon.initializeLightClient(bootstrapHash)
+      return true
     } catch (err: any) {
       return err.message
     }

diff --git a/packages/portalnetwork/src/networks/beacon/ultralightTransport.ts b/packages/portalnetwork/src/networks/beacon/ultralightTransport.ts
@@ -3,9 +3,10 @@ import { genesisData } from '@lodestar/config/networks'
 import { getCurrentSlot } from '@lodestar/light-client/utils'
 import { ssz } from '@lodestar/types'
 
+import { ContentLookup } from '../contentLookup.js'
+
 import {
   BeaconLightClientNetworkContentType,
-  LightClientBootstrapKey,
   LightClientFinalityUpdateKey,
   LightClientOptimisticUpdateKey,
   LightClientUpdatesByRange,
@@ -200,47 +201,21 @@ export class UltralightTransport implements LightClientTransport {
     blockRoot: string,
   ): Promise<{ version: ForkName; data: LightClientBootstrap }> {
     let forkname, bootstrap
-    const localBootstrap = await this.network.findContentLocally(
+
+    this.logger(`requesting lightClientBootstrap for trusted block root ${blockRoot}`)
+    // Try to get bootstrap from Portal Network
+    const lookup = new ContentLookup(
+      this.network,
       getBeaconContentKey(
         BeaconLightClientNetworkContentType.LightClientBootstrap,
-        LightClientBootstrapKey.serialize({ blockHash: hexToBytes(blockRoot) }),
+        hexToBytes(blockRoot),
       ),
     )
-    if (localBootstrap !== undefined && localBootstrap.length !== 0) {
-      this.logger('Found LightClientBootstrap locally.  Initializing light client...')
-      try {
-        forkname = this.network.beaconConfig.forkDigest2ForkName(
-          localBootstrap.slice(0, 4),
-        ) as LightClientForkName
-        bootstrap = ssz[forkname].LightClientBootstrap.deserialize(localBootstrap.slice(4))
-      } catch (err) {
-        this.logger('Error loading local bootstrap error')
-        this.logger(err)
-      }
-    } else {
-      const peers = this.network.routingTable.nearest(this.network.enr.nodeId, 5)
-
-      let forkname
-
-      this.logger(`requesting lightClientBootstrap for trusted block root ${blockRoot}`)
-      // Try to get bootstrap from Portal Network
-      for (const peer of peers) {
-        const decoded = await this.network.sendFindContent(
-          peer.nodeId,
-          concatBytes(
-            new Uint8Array([BeaconLightClientNetworkContentType.LightClientBootstrap]),
-            LightClientBootstrapKey.serialize({ blockHash: hexToBytes(blockRoot) }),
-          ),
-        )
-        if (decoded !== undefined && 'content' in decoded) {
-          const forkhash = decoded.content.slice(0, 4) as Uint8Array
-          forkname = this.network.beaconConfig.forkDigest2ForkName(forkhash) as LightClientForkName
-          bootstrap = ssz[forkname].LightClientBootstrap.deserialize(
-            (decoded.content as Uint8Array).slice(4),
-          )
-          break
-        }
-      }
+    const res = await lookup.startLookup()
+    if (res !== undefined && 'content' in res) {
+      const forkhash = res.content.slice(0, 4) as Uint8Array
+      forkname = this.network.beaconConfig.forkDigest2ForkName(forkhash) as LightClientForkName
+      bootstrap = ssz[forkname].LightClientBootstrap.deserialize(res.content.slice(4))
     }
 
     if (bootstrap === undefined) {