RPC: use chain specific subnetworks

Author: ScottyPoi

packages/cli/src/rpc/modules/beacon.ts

@@ -7,6 +7,7 @@ import {
   ContentLookup,
   LightClientUpdatesByRangeKey,
   NetworkId,
+  NetworkIdByChain,
   type PortalNetwork,
   computeLightClientKeyFromPeriod,
   getBeaconContentKey,
@@ -31,7 +32,7 @@ export class beacon {
    * @param rpcManager RPC client to which the module binds
    */
   constructor(client: PortalNetwork, logger: Debugger) {
-    this._beacon = client.networks.get(NetworkId.BeaconChainNetwork) as BeaconNetwork
+    this._beacon = client.networks.get(NetworkIdByChain[client.chainId].BeaconChainNetwork) as BeaconNetwork
     this.logger = logger.extend('beacon')
 
     this.methods = middleware(this.methods.bind(this), 0, [])

packages/cli/src/rpc/modules/eth.ts

@@ -1,6 +1,6 @@
 import type { PrefixedHexString } from '@ethereumjs/util'
 import { bigIntToHex, hexToBytes, intToHex, toBytes } from '@ethereumjs/util'
-import { GET_LOGS_BLOCK_RANGE_LIMIT, NetworkId, getLogs } from 'portalnetwork'
+import { GET_LOGS_BLOCK_RANGE_LIMIT, NetworkId, NetworkIdByChain, getLogs } from 'portalnetwork'
 
 import { INTERNAL_ERROR, INVALID_PARAMS } from '../error-code.js'
 import { jsonRpcLog } from '../types.js'
@@ -26,7 +26,7 @@ export class eth {
    */
   constructor(client: PortalNetwork, logger: Debugger) {
     this._client = client
-    this._history = client.networks.get(NetworkId.HistoryNetwork) as HistoryNetwork
+    this._history = client.networks.get(NetworkIdByChain[client.chainId].HistoryNetwork) as HistoryNetwork
     this.logger = logger.extend('eth')
 
     this.getBlockByNumber = middleware(

packages/cli/src/rpc/modules/portal.ts

@@ -11,6 +11,7 @@ import {
   ContentLookup,
   FoundContent,
   NetworkId,
+  NetworkIdByChain,
   NodeLookup,
   decodeExtensionPayloadToJson,
   encodeExtensionPayloadFromJson,
@@ -98,9 +99,9 @@ export class portal {
 
   constructor(client: PortalNetwork, logger: Debugger) {
     this._client = client
-    this._history = this._client.networks.get(NetworkId.HistoryNetwork) as HistoryNetwork
-    this._beacon = this._client.networks.get(NetworkId.BeaconChainNetwork) as BeaconNetwork
-    this._state = this._client.networks.get(NetworkId.StateNetwork) as StateNetwork
+    this._history = this._client.networks.get(NetworkIdByChain[client.chainId].HistoryNetwork) as HistoryNetwork
+    this._beacon = this._client.networks.get(NetworkIdByChain[client.chainId].BeaconChainNetwork) as BeaconNetwork
+    this._state = this._client.networks.get(NetworkIdByChain[client.chainId].StateNetwork) as StateNetwork
     this.logger = logger
     this.methods = middleware(this.methods.bind(this), 0, [])
 

packages/cli/src/rpc/modules/ultralight.ts

@@ -1,5 +1,5 @@
 import { type PrefixedHexString, bytesToHex, hexToBytes } from '@ethereumjs/util'
-import { HistoryNetworkContentType, NetworkId } from 'portalnetwork'
+import { HistoryNetworkContentType, type NetworkId, NetworkIdByChain } from 'portalnetwork'
 
 import { INTERNAL_ERROR } from '../error-code.js'
 import { middleware, validators } from '../validators.js'
@@ -29,9 +29,9 @@ export class ultralight {
 
   constructor(client: PortalNetwork, logger: Debugger) {
     this._client = client
-    this._history = this._client.network()[NetworkId.HistoryNetwork] as HistoryNetwork | undefined
-    this._state = this._client.network()[NetworkId.StateNetwork] as StateNetwork | undefined
-    this._beacon = this._client.network()[NetworkId.BeaconChainNetwork] as BeaconNetwork | undefined
+    this._history = this._client.network()[NetworkIdByChain[client.chainId].HistoryNetwork] as HistoryNetwork | undefined
+    this._state = this._client.network()[NetworkIdByChain[client.chainId].StateNetwork] as StateNetwork | undefined
+    this._beacon = this._client.network()[NetworkIdByChain[client.chainId].BeaconChainNetwork] as BeaconNetwork | undefined
     this.logger = logger
     this.methods = middleware(this.methods.bind(this), 0, [])
     this.addContentToDB = middleware(this.addContentToDB.bind(this), 2, [
@@ -106,15 +106,15 @@ export class ultralight {
     const [networkId, radius] = params
     try {
       switch (networkId) {
-        case NetworkId.HistoryNetwork: {
+        case NetworkIdByChain[this._client.chainId].HistoryNetwork: {
           await this._history!.setRadius(2n ** BigInt(Number.parseInt(radius)) - 1n)
           return '0x' + this._history!.nodeRadius.toString(16)
         }
-        case NetworkId.StateNetwork: {
+        case NetworkIdByChain[this._client.chainId].StateNetwork: {
           await this._state!.setRadius(2n ** BigInt(Number.parseInt(radius)) - 1n)
           return '0x' + this._state!.nodeRadius.toString(16)
         }
-        case NetworkId.BeaconChainNetwork: {
+        case NetworkIdByChain[this._client.chainId].BeaconChainNetwork: {
           await this._beacon!.setRadius(2n ** BigInt(Number.parseInt(radius)) - 1n)
           return '0x' + this._beacon!.nodeRadius.toString(16)
         }