Client: More UI Improvements / Fix TxPool not being started along FCU (…

…#3100) * Client: expand super msgs to also take in multiline output * Client: adjust CL disconnect thresholds to avoid reconnect messages * Client: add note to explain subchains on subchain creation * Client: fix synchronized setting on FCU * Client: make tx pool started a super msg * fix switching client to syncronized state and start txpool --------- Co-authored-by: harkamal <[email protected]>
ethereumjs · Oct 11, 2023 · 02a7abb · 02a7abb
1 parent f4a4a92
commit 02a7abb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts
@@ -651,10 +651,18 @@ export class Config {
     return key
   }
 
-  superMsg(msg: string, meta?: any) {
-    const len = msg.length
+  superMsg(msgs: string | string[], meta?: any) {
+    if (typeof msgs === 'string') {
+      msgs = [msgs]
+    }
+    let len = 0
+    for (const msg of msgs) {
+      len = msg.length > len ? msg.length : len
+    }
     this.logger.info('-'.repeat(len), meta)
-    this.logger.info(msg, meta)
+    for (const msg of msgs) {
+      this.logger.info(msg, meta)
+    }
     this.logger.info('-'.repeat(len), meta)
   }
 

diff --git a/packages/client/src/rpc/modules/engine.ts b/packages/client/src/rpc/modules/engine.ts
@@ -1225,12 +1225,6 @@ export class Engine {
         }
       }
       this.service.txPool.removeNewBlockTxs(blocks)
-
-      const isPrevSynced = this.chain.config.synchronized
-      this.config.updateSynchronizedState(headBlock.header)
-      if (!isPrevSynced && this.chain.config.synchronized) {
-        this.service.txPool.checkRunState()
-      }
     } else {
       // even if the vmHead is same still validations need to be done regarding the correctness
       // of the sequence and canonical-ity
@@ -1244,6 +1238,17 @@ export class Engine {
       }
     }
 
+    if (
+      this.config.syncTargetHeight === undefined ||
+      this.config.syncTargetHeight < headBlock.header.number
+    ) {
+      this.config.syncTargetHeight = headBlock.header.number
+    }
+    this.config.updateSynchronizedState(headBlock.header)
+    if (this.chain.config.synchronized) {
+      this.service.txPool.checkRunState()
+    }
+
     // prepare valid response
     let validResponse
     // If payloadAttributes is present, start building block and return payloadId

diff --git a/packages/client/src/rpc/util/CLConnectionManager.ts b/packages/client/src/rpc/util/CLConnectionManager.ts
@@ -72,13 +72,13 @@ export class CLConnectionManager {
   private DEFAULT_FORKCHOICE_LOG_INTERVAL = 60000
 
   /** Threshold for a disconnected status decision */
-  private DISCONNECTED_THRESHOLD = 30000
+  private DISCONNECTED_THRESHOLD = 45000
   /** Wait for a minute to log disconnected again*/
   private LOG_DISCONNECTED_EVERY_N_CHECKS = 6
   private disconnectedCheckIndex = 0
 
   /** Threshold for an uncertain status decision */
-  private UNCERTAIN_THRESHOLD = 15000
+  private UNCERTAIN_THRESHOLD = 30000
 
   /** Track ethereumjs client shutdown status */
   private _clientShutdown = false

diff --git a/packages/client/src/service/skeleton.ts b/packages/client/src/service/skeleton.ts
@@ -395,9 +395,11 @@ export class Skeleton extends MetaDBManager {
             next: head.header.parentHash,
           }
           this.status.progress.subchains.unshift(s)
-          this.config.superMsg(
-            `Created new subchain tail=${s.tail} head=${s.head} next=${short(s.next)}`
-          )
+          const msgs = [
+            `Created new subchain tail=${s.tail} head=${s.head} next=${short(s.next)}`,
+            'Note: Subchain will be backfilled and merged with the canonical chain on success.',
+          ]
+          this.config.superMsg(msgs)
           // Reset the filling of canonical head from tail only on tail reorg and exit any ongoing fill
           this.status.canonicalHeadReset = s.tail > BIGINT_0
         } else {

diff --git a/packages/client/src/service/txpool.ts b/packages/client/src/service/txpool.ts
@@ -211,7 +211,7 @@ export class TxPool {
       this._logInterval = setInterval(this._logPoolStats.bind(this), this.LOG_STATISTICS_INTERVAL)
     }
     this.running = true
-    this.config.logger.info('TxPool started.')
+    this.config.superMsg('TxPool started.')
     return true
   }