Put data insert log behind verbose flag, nodelist api improvement, ad…

…ded npm run start command
shardeum · May 8, 2024 · bff4eba · bff4eba
1 parent 406b012
commit bff4eba
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "archive-server": "./build/server.js"
   },
   "scripts": {
+    "start": "npm run prepare && node build/server.js",
     "release": "npm run prepare && np --no-cleanup --no-tests --no-yarn --any-branch",
     "test": "echo \"Error: no test specified\" && exit 1",
     "check": "gts check",
@@ -94,4 +95,4 @@
   "overrides": {
     "axios": "1.6.1"
   }
-}
+}
diff --git a/src/API.ts b/src/API.ts
@@ -77,10 +77,18 @@ export function registerRoutes(server: FastifyInstance<Server, IncomingMessage,
         const isSignatureValid = Crypto.verify(signedFirstNodeInfo)
         if (!isSignatureValid) {
           Logger.mainLogger.error('Invalid signature', signedFirstNodeInfo)
+          reply.send({ success: false, error: 'Invalid signature' })
           return
         }
       } catch (e) {
         Logger.mainLogger.error(e)
+        reply.send({ success: false, error: 'Signature verification failed' })
+        return
+      }
+      if (NodeList.foundFirstNode) {
+        const res = NodeList.getCachedNodeList()
+        reply.send(res)
+        return
       }
       NodeList.toggleFirstNode()
       const ip = signedFirstNodeInfo.nodeInfo.externalIp
@@ -97,7 +105,9 @@ export function registerRoutes(server: FastifyInstance<Server, IncomingMessage,
 
       // Add first node to NodeList
       NodeList.addNodes(NodeList.NodeStatus.SYNCING, [firstNode])
-
+      // Setting current time for realUpdatedTimes to refresh the nodelist and full-nodelist cache
+      NodeList.realUpdatedTimes.set('/nodelist', Date.now())
+      NodeList.realUpdatedTimes.set('/full-nodelist', Date.now())
       // Set first node as dataSender
       const firstDataSender: Data.DataSender = {
         nodeInfo: firstNode,
@@ -123,7 +133,6 @@ export function registerRoutes(server: FastifyInstance<Server, IncomingMessage,
           data['joinRequest'] = P2P.createArchiverJoinRequest()
           data['dataRequestCycle'] = Cycles.getCurrentCycleCounter()
         }
-
         res = Crypto.sign<P2P.FirstNodeResponse>(data)
       } else {
         res = Crypto.sign<P2P.FirstNodeResponse>({

diff --git a/src/NodeList.ts b/src/NodeList.ts
@@ -449,4 +449,5 @@ export function clearNodeListCache(): void {
 
 export function toggleFirstNode(): void {
   foundFirstNode = !foundFirstNode
+  Logger.mainLogger.debug('foundFirstNode', foundFirstNode)
 }
diff --git a/src/dbstore/accounts.ts b/src/dbstore/accounts.ts
@@ -47,7 +47,7 @@ export async function bulkInsertAccounts(accounts: AccountCopy[]): Promise<void>
       sql = sql + ', (' + placeholders + ')'
     }
     await db.run(sql, values)
-    Logger.mainLogger.debug('Successfully inserted Accounts', accounts.length)
+    if (config.VERBOSE) Logger.mainLogger.debug('Successfully inserted Accounts', accounts.length)
   } catch (e) {
     Logger.mainLogger.error(e)
     Logger.mainLogger.error('Unable to bulk insert Accounts', accounts.length)

diff --git a/src/dbstore/cycles.ts b/src/dbstore/cycles.ts
@@ -43,7 +43,7 @@ export async function bulkInsertCycles(cycles: Cycle[]): Promise<void> {
       sql = sql + ', (' + placeholders + ')'
     }
     await db.run(sql, values)
-    Logger.mainLogger.debug('Successfully inserted Cycles', cycles.length)
+    if (config.VERBOSE) Logger.mainLogger.debug('Successfully inserted Cycles', cycles.length)
   } catch (e) {
     Logger.mainLogger.error(e)
     Logger.mainLogger.error('Unable to bulk insert Cycles', cycles.length)

diff --git a/src/dbstore/originalTxsData.ts b/src/dbstore/originalTxsData.ts
@@ -56,7 +56,8 @@ export async function bulkInsertOriginalTxsData(originalTxsData: OriginalTxData[
       sql = sql + ', (' + placeholders + ')'
     }
     await db.run(sql, values)
-    Logger.mainLogger.debug('Successfully inserted OriginalTxsData', originalTxsData.length)
+    if (config.VERBOSE)
+      Logger.mainLogger.debug('Successfully inserted OriginalTxsData', originalTxsData.length)
   } catch (e) {
     Logger.mainLogger.error(e)
     Logger.mainLogger.error('Unable to bulk insert OriginalTxsData', originalTxsData.length)

diff --git a/src/dbstore/receipts.ts b/src/dbstore/receipts.ts
@@ -115,7 +115,7 @@ export async function bulkInsertReceipts(receipts: Receipt[]): Promise<void> {
       sql = sql + ', (' + placeholders + ')'
     }
     await db.run(sql, values)
-    Logger.mainLogger.debug('Successfully inserted Receipts', receipts.length)
+    if (config.VERBOSE) Logger.mainLogger.debug('Successfully inserted Receipts', receipts.length)
   } catch (e) {
     Logger.mainLogger.error(e)
     Logger.mainLogger.error('Unable to bulk insert Receipts', receipts.length)

diff --git a/src/dbstore/transactions.ts b/src/dbstore/transactions.ts
@@ -53,7 +53,7 @@ export async function bulkInsertTransactions(transactions: Transaction[]): Promi
       sql = sql + ', (' + placeholders + ')'
     }
     await db.run(sql, values)
-    Logger.mainLogger.debug('Successfully inserted Transactions', transactions.length)
+    if (config.VERBOSE) Logger.mainLogger.debug('Successfully inserted Transactions', transactions.length)
   } catch (e) {
     Logger.mainLogger.error(e)
     Logger.mainLogger.error('Unable to bulk insert Transactions', transactions.length)