rebase fixes

Author: chirag-parmar

nimbus_verified_proxy/lc/lc.nim

@@ -21,8 +21,8 @@ type
   ) {.gcsafe, raises: [].}
 
   LightClient* = ref object
-    cfg: RuntimeConfig
-    forkDigests: ref ForkDigests
+    cfg*: RuntimeConfig
+    forkDigests*: ref ForkDigests
     getBeaconTime*: GetBeaconTimeFn
     store*: ref ForkedLightClientStore
     processor*: ref LightClientProcessor
@@ -133,9 +133,9 @@ proc new*(
         GENESIS_SLOT
 
   lightClient.manager = LightClientManager.init(
-    rng, getTrustedBlockRoot, bootstrapVerifier, updateVerifier, finalityVerifier,
-    optimisticVerifier, isLightClientStoreInitialized, isNextSyncCommitteeKnown,
-    getFinalizedSlot, getOptimisticSlot, getBeaconTime,
+    rng, cfg.timeParams, getTrustedBlockRoot, bootstrapVerifier, updateVerifier,
+    finalityVerifier, optimisticVerifier, isLightClientStoreInitialized,
+    isNextSyncCommitteeKnown, getFinalizedSlot, getOptimisticSlot, getBeaconTime,
   )
 
   lightClient
@@ -167,7 +167,7 @@ proc new*(
     # getStateField reads seeks info directly from a byte array
     # get genesis time and instantiate the beacon clock
     genesisTime = getStateField(genesisState[], genesis_time)
-    beaconClock = BeaconClock.init(genesisTime).valueOr:
+    beaconClock = BeaconClock.init(cfg.timeParams, genesisTime).valueOr:
       error "Invalid genesis time in state", genesisTime
       quit QuitFailure
 

nimbus_verified_proxy/lc/lc_manager.nim

@@ -71,6 +71,7 @@ type
 
   LightClientManager* = object
     rng: ref HmacDrbgContext
+    timeParams: TimeParams
     backend*: EthLCBackend
     getTrustedBlockRoot: GetTrustedBlockRootCallback
     bootstrapVerifier: BootstrapVerifier
@@ -86,6 +87,7 @@ type
 func init*(
     T: type LightClientManager,
     rng: ref HmacDrbgContext,
+    timeParams: TimeParams,
     getTrustedBlockRoot: GetTrustedBlockRootCallback,
     bootstrapVerifier: BootstrapVerifier,
     updateVerifier: UpdateVerifier,
@@ -100,6 +102,7 @@ func init*(
   ## Initialize light client manager.
   LightClientManager(
     rng: rng,
+    timeParams: timeParams,
     getTrustedBlockRoot: getTrustedBlockRoot,
     bootstrapVerifier: bootstrapVerifier,
     updateVerifier: updateVerifier,
@@ -308,7 +311,7 @@ proc loop(self: LightClientManager) {.async: (raises: [CancelledError]).} =
   while true:
     let
       wallTime = self.getBeaconTime()
-      currentSlot = wallTime.slotOrZero()
+      currentSlot = wallTime.slotOrZero(self.timeParams)
       currentEpoch = (currentSlot mod SLOTS_PER_EPOCH)
       currentPeriod = currentSlot.sync_committee_period
       finalizedSlot = self.getFinalizedSlot()

nimbus_verified_proxy/libverifproxy/verifproxy.nim

@@ -164,7 +164,6 @@ proc load(
     accountCacheLen = jsonNode.getOrDefault("accountCacheLen").getInt(128)
 
   return VerifiedProxyConf(
-    listenAddress: none(IpAddress),
     eth2Network: eth2Network,
     trustedBlockRoot: trustedBlockRoot,
     backendUrl: backendUrl,

nimbus_verified_proxy/nimbus_verified_proxy.nim

@@ -48,19 +48,13 @@ proc verifyChainId(
       expectedChain = engine.chainId, providerChain = providerId
     quit 1
 
-func getConfiguredChainId(networkMetadata: Eth2NetworkMetadata): UInt256 =
-  if networkMetadata.eth1Network.isSome():
-    let
-      net = networkMetadata.eth1Network.get()
-      chainId =
-        case net
-        of mainnet: 1.u256
-        of sepolia: 11155111.u256
-        of holesky: 17000.u256
-        of hoodi: 560048.u256
-    return chainId
-  else:
-    return networkMetadata.cfg.DEPOSIT_CHAIN_ID.u256
+func getConfiguredChainId*(chain: Option[string]): UInt256 =
+  let net = chain.get("mainnet").toLowerAscii()
+  case net
+  of "mainnet": 1.u256
+  of "sepolia": 11155111.u256
+  of "hoodi": 560048.u256
+  else: 1.u256
 
 proc connectLCToEngine*(lightClient: LightClient, engine: RpcVerificationEngine) =
   proc onFinalizedHeader(
@@ -91,7 +85,6 @@ proc connectLCToEngine*(lightClient: LightClient, engine: RpcVerificationEngine)
 
   lightClient.onFinalizedHeader = onFinalizedHeader
   lightClient.onOptimisticHeader = onOptimisticHeader
-  lightClient.trustedBlockRoot = some config.trustedBlockRoot
 
 proc run(
     config: VerifiedProxyConf
@@ -127,6 +120,7 @@ proc run(
   # connect light client to LC by registering on header methods 
   # to use engine header store
   connectLCToEngine(lc, engine)
+  lc.trustedBlockRoot = some config.trustedBlockRoot
 
   # add light client backend
   lc.setBackend(lcRestClient.getEthLCBackend())