client: fix config object issue (#694)

* client: fix config issue * CLI: log discv5 config on startup * Fix shouldRefresh opt --------- Co-authored-by: acolytec3 <[email protected]>
ethereumjs · Dec 18, 2024 · 5e475e2 · 5e475e2
1 parent b1e7850
commit 5e475e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -28,6 +28,8 @@ const main = async () => {
 
   const portal = await PortalNetwork.create(portalConfig)
 
+  log(`discv5Config: ${JSON.stringify(portal.discv5['config'], null, 2)}`)
+
   const rpcAddr = args.rpcAddr ?? ip // Set RPC address (used by metrics server and rpc server)
   let metricsServer: http.Server | undefined
 

diff --git a/packages/portalnetwork/src/client/client.ts b/packages/portalnetwork/src/client/client.ts
@@ -61,6 +61,7 @@ export class PortalNetwork extends (EventEmitter as { new (): PortalNetworkEvent
       },
     }
     const config = { ...defaultConfig, ...opts.config }
+    config.config = { ...defaultConfig.config, ...opts.config?.config }
     let bootnodes = opts.bootnodes
     if (opts.rebuildFromMemory === true && opts.db) {
       const prevEnrString = await opts.db.get('enr')
@@ -142,6 +143,7 @@ export class PortalNetwork extends (EventEmitter as { new (): PortalNetworkEvent
       eventLog: opts.eventLog,
       utpTimeout: opts.utpTimeout,
       gossipCount: opts.gossipCount,
+      shouldRefresh: opts.shouldRefresh,
     })
     for (const network of portal.networks.values()) {
       try {