multiple endpoints in config

Author: chirag-parmar

nimbus_verified_proxy/json_lc_backend.nim

@@ -41,15 +41,16 @@ func new*(
 ): LCRestClient =
   LCRestClient(cfg: cfg, forkDigests: forkDigests, peers: @[])
 
-proc addEndpoint*(client: LCRestClient, endpoint: string) {.raises: [ValueError].} =
-  if endpoint in client.urls:
-    raise newException(ValueError, "Endpoint already added")
+proc addEndpoints*(client: LCRestClient, urlList: UrlList) {.raises: [ValueError].} =
+  for endpoint in urlList.urls:
+    if endpoint in client.urls:
+      continue
 
-  let restClient = RestClientRef.new(endpoint).valueOr:
-    raise newException(ValueError, $error)
+    let restClient = RestClientRef.new(endpoint).valueOr:
+      raise newException(ValueError, $error)
 
-  client.peers.add(LCRestPeer(score: 0, restClient: restClient))
-  client.urls.add(endpoint)
+    client.peers.add(LCRestPeer(score: 0, restClient: restClient))
+    client.urls.add(endpoint)
 
 proc closeAll*(client: LCRestClient) {.async: (raises: []).} =
   for peer in client.peers:

nimbus_verified_proxy/nimbus_verified_proxy.nim

@@ -160,10 +160,8 @@ proc run*(
     # REST client for json LC updates
     lcRestClient = LCRestClient.new(cfg, forkDigests)
 
-  debugEcho config.lcEndpoint
-
   # add endpoints to the client
-  lcRestClient.addEndpoint(config.lcEndpoint)
+  lcRestClient.addEndpoints(config.lcEndpoints)
   lightClient.setBackend(lcRestClient.getEthLCBackend())
 
   # verify chain id that the proxy is connected to

nimbus_verified_proxy/nimbus_verified_proxy_conf.nim

@@ -12,7 +12,8 @@ import
   json_rpc/rpcproxy, # must be early (compilation annoyance)
   json_serialization/std/net,
   beacon_chain/conf_light_client,
-  beacon_chain/nimbus_binary_common
+  beacon_chain/nimbus_binary_common,
+  std/strutils
 
 export net
 
@@ -25,37 +26,45 @@ type
     kind*: Web3UrlKind
     web3Url*: string
 
+  UrlList* = object
+    urls*: seq[string]
+
 #!fmt: off
 type VerifiedProxyConf* = object
   # Config
   configFile* {.
-    desc: "Loads the configuration from a TOML file"
-    name: "config-file" .}: Option[InputFile]
+    desc: "Loads the configuration from a TOML file",
+    name: "config-file"
+  .}: Option[InputFile]
 
   # Logging
   logLevel* {.
-    desc: "Sets the log level"
-    defaultValue: "INFO"
-    name: "log-level" .}: string
+    desc: "Sets the log level",
+    defaultValue: "INFO",
+    name: "log-level"
+  .}: string
 
   logStdout* {.
-    hidden
-    desc: "Specifies what kind of logs should be written to stdout (auto, colors, nocolors, json)"
-    defaultValueDesc: "auto"
-    defaultValue: StdoutLogKind.Auto
-    name: "log-format" .}: StdoutLogKind
+    hidden,
+    desc: "Specifies what kind of logs should be written to stdout (auto, colors, nocolors, json)",
+    defaultValueDesc: "auto",
+    defaultValue: StdoutLogKind.Auto,
+    name: "log-format"
+  .}: StdoutLogKind
 
   # Storage
   dataDirFlag* {.
-    desc: "The directory where nimbus will store all blockchain data"
-    abbr: "d"
-    name: "data-dir" .}: Option[OutDir]
+    desc: "The directory where nimbus will store all blockchain data",
+    abbr: "d",
+    name: "data-dir"
+  .}: Option[OutDir]
 
   # Network
   eth2Network* {.
-    desc: "The Eth2 network to join"
-    defaultValueDesc: "mainnet"
-    name: "network" .}: Option[string]
+    desc: "The Eth2 network to join",
+    defaultValueDesc: "mainnet",
+    name: "network"
+  .}: Option[string]
 
   accountCacheLen* {.
     hidden,
@@ -95,8 +104,9 @@ type VerifiedProxyConf* = object
   # Consensus light sync
   # No default - Needs to be provided by the user
   trustedBlockRoot* {.
-    desc: "Recent trusted finalized block root to initialize light client from"
-    name: "trusted-block-root" .}: Eth2Digest
+    desc: "Recent trusted finalized block root to initialize light client from",
+    name: "trusted-block-root"
+  .}: Eth2Digest
 
   # (Untrusted) web3 provider
   # No default - Needs to be provided by the user
@@ -116,10 +126,10 @@ type VerifiedProxyConf* = object
 
   # (Untrusted) web3 provider
   # No default - Needs to be provided by the user
-  lcEndpoint* {.
+  lcEndpoints* {.
     desc: "command seperated URLs of the light client data provider",
-    name: "lc-endpoint"
-  .}: string
+    name: "lc-endpoints"
+  .}: UrlList
 
 #!fmt: on
 
@@ -137,9 +147,25 @@ proc parseCmdArg*(T: type Web3Url, p: string): T {.raises: [ValueError].} =
       ValueError, "Web3 url should have defined scheme (http/https/ws/wss)"
     )
 
+proc parseCmdArg*(T: type UrlList, p: string): T {.raises: [ValueError].} =
+  let urls = p.split(',')
+
+  for u in urls:
+    let
+      parsed = parseUri(u)
+      normalizedScheme = parsed.scheme.toLowerAscii()
+
+    if not (normalizedScheme == "http" or normalizedScheme == "https"):
+      raise newException(ValueError, "Light Client Endpoint should be a http(s) url")
+
+  UrlList(urls: urls)
+
 proc completeCmdArg*(T: type Web3Url, val: string): seq[string] =
   return @[]
 
+proc completeCmdArg*(T: type UrlList, val: string): seq[string] =
+  return @[]
+
 # TODO: Cannot use ClientConfig in VerifiedProxyConf due to the fact that
 # it contain `set[TLSFlags]` which does not have proper toml serialization
 func asClientConfig*(url: Web3Url): ClientConfig =