Add tests for no headers and subset of headers

Author: acolytec3

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

@@ -411,6 +411,7 @@ export class HistoryNetwork extends BaseNetwork {
       // Retrieve the starting header from the FINDCONTENT request
       const headerKey = getEphemeralHeaderDbKey(contentKey.keyOpt.blockHash)
       const firstHeader = await this.findContentLocally(headerKey)
+
       if (firstHeader === undefined) {
         // If we don't have the requested header, send an empty payload
         // We never send an ENRs response for ephemeral headers
@@ -423,7 +424,12 @@ export class HistoryNetwork extends BaseNetwork {
         this.logger.extend('FOUNDCONTENT')(
           `Header not found for ${bytesToHex(contentKey.keyOpt.blockHash)}, sending empty ephemeral headers response to ${shortId(src.nodeId)}`,
         )
-        await this.sendResponse(src, requestId, messagePayload)
+        await this.sendResponse(
+          src,
+          requestId,
+          concatBytes(Uint8Array.from([MessageCodes.CONTENT]), messagePayload),
+        )
+        return
       } else {
         this.logger.extend('FOUNDCONTENT')(
           `Header found for ${bytesToHex(contentKey.keyOpt.blockHash)}, assembling ephemeral headers response to ${shortId(src.nodeId)}`,
@@ -433,7 +439,7 @@ export class HistoryNetwork extends BaseNetwork {
         const firstHeaderNumber = this.ephemeralHeaderIndex.getByValue(
           bytesToHex(contentKey.keyOpt.blockHash),
         )
-        for (let x = 1; x <= contentKey.keyOpt.ancestorCount; x++) {
+        for (let x = 1; x < contentKey.keyOpt.ancestorCount; x++) {
           // Determine if we have the ancestor header at block number `firstHeaderNumber - x`
           const ancestorNumber = firstHeaderNumber! - BigInt(x)
           const ancestorHash = this.ephemeralHeaderIndex.getByKey(ancestorNumber)

packages/portalnetwork/test/integration/ephemeralHeaders.spec.ts

@@ -1,7 +1,7 @@
 import { SignableENR } from '@chainsafe/enr'
 import type { BlockHeader, JsonRpcBlock } from '@ethereumjs/block'
 import { Block } from '@ethereumjs/block'
-import { hexToBytes } from '@ethereumjs/util'
+import { hexToBytes, randomBytes } from '@ethereumjs/util'
 import { keys } from '@libp2p/crypto'
 import { multiaddr } from '@multiformats/multiaddr'
 import { assert, beforeAll, describe, it } from 'vitest'
@@ -86,5 +86,35 @@ describe('should be able to retrieve ephemeral headers from a peer', () => {
     } else {
       assert.fail('Expected content in response')
     }
-  })
+
+    const contentKeyForOneAncestor = getContentKey(HistoryNetworkContentType.EphemeralHeader, {
+      blockHash: headers[0].hash(),
+      ancestorCount: 1,
+    })
+
+    const res2 = await network2!.sendFindContent(node1.discv5.enr.toENR(), contentKeyForOneAncestor)
+    assert.exists(res2)
+    if ('content' in res2!) {
+      const payload = EphemeralHeaderPayload.deserialize(res2.content)
+      assert.equal(payload.length, 1, 'should only get a single ancestor')
+    } else {
+      assert.fail('Expected content in response')
+    }
+
+    // Verify that we get an empty ephemeral headers payload for a random blockhash
+    const res3 = await network2!.sendFindContent(
+      node1.discv5.enr.toENR(),
+      getContentKey(HistoryNetworkContentType.EphemeralHeader, {
+        blockHash: randomBytes(32),
+        ancestorCount: 255,
+      }),
+    )
+    assert.exists(res3)
+    if ('content' in res3!) {
+      const payload = EphemeralHeaderPayload.deserialize(res3.content)
+      assert.equal(payload.length, 0, 'should not get any headers for a random blockhash')
+    } else {
+      assert.fail('Expected content in response')
+    }
+  }, 10000)
 })