RED-103: use nodelistFromStates function in all cycle tx sendGossip calls

src/p2p/Active.ts

@@ -16,7 +16,7 @@ import { getSortedStandbyJoinRequests } from './Join/v2'
 import { selectNodesFromReadyList } from './Join/v2/syncFinished'
 import { isDebugModeMiddleware } from '../network/debugMiddleware'
 import { Utils } from '@shardus/types'
-import { nodeListFromStates } from "./Join";
+import { nodelistFromStates } from "./Join"
 import { checkGossipPayload } from '../utils/GossipValidation'
 
 let syncTimes = []
@@ -46,7 +46,7 @@ const gossipActiveRoute: P2P.P2PTypes.GossipHandler<P2P.ActiveTypes.SignedActive
         payload,
         tracker,
         sender,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -269,7 +269,7 @@ export function sendRequests() {
       activeTx,
       '',
       null,
-      nodeListFromStates([
+      nodelistFromStates([
         P2P.P2PTypes.NodeStatus.ACTIVE,
         P2P.P2PTypes.NodeStatus.READY,
         P2P.P2PTypes.NodeStatus.SYNCING,

src/p2p/Apoptosis.ts

@@ -41,7 +41,7 @@ import { VectorBufferStream } from '../utils/serialization/VectorBufferStream'
 import * as Comms from './Comms'
 import { crypto, logger, network } from './Context'
 import { currentCycle, currentQuarter } from './CycleCreator'
-import { activeByIdOrder, byIdOrder, byPubKey, nodes } from './NodeList'
+import { activeByIdOrder, byPubKey, nodes } from './NodeList'
 import * as Self from './Self'
 import { robustQuery } from './Utils'
 import { TypeIdentifierEnum } from '../types/enum/TypeIdentifierEnum'
@@ -52,6 +52,7 @@ import { BadRequest, serializeResponseError } from '../types/ResponseError'
 import { RequestErrorEnum } from '../types/enum/RequestErrorEnum'
 import { getStreamWithTypeCheck, requestErrorHandler } from '../types/Helpers'
 
+import { nodelistFromStates } from './Join'
 
 /** STATE */
 
@@ -195,7 +196,18 @@ const apoptosisGossipRoute: P2P.P2PTypes.GossipHandler<P2P.ApoptosisTypes.Signed
     }
     if ([1, 2].includes(currentQuarter)) {
       if (addProposal(payload)) {
-        Comms.sendGossip(gossipRouteName, payload, tracker, Self.id, byIdOrder, false) // use Self.id so we don't gossip to ourself
+        Comms.sendGossip(
+          gossipRouteName,
+          payload,
+          tracker,
+          Self.id,
+          nodelistFromStates([
+            P2P.P2PTypes.NodeStatus.ACTIVE,
+            P2P.P2PTypes.NodeStatus.READY,
+            P2P.P2PTypes.NodeStatus.SYNCING,
+          ]),
+          false
+        ) // use Self.id so we don't gossip to ourself
       }
     }
   } finally {
@@ -306,7 +318,18 @@ export function sendRequests() {
     // make sure node is still in the network, since it might
     //   have already been removed
     if (nodes.get(id)) {
-      Comms.sendGossip(gossipRouteName, proposals[id], '', null, byIdOrder, true)
+      Comms.sendGossip(
+        gossipRouteName,
+        proposals[id],
+        '',
+        null,
+        nodelistFromStates([
+          P2P.P2PTypes.NodeStatus.ACTIVE,
+          P2P.P2PTypes.NodeStatus.READY,
+          P2P.P2PTypes.NodeStatus.SYNCING,
+        ]),
+        true
+      )
     }
   }
 }

src/p2p/Archivers.ts

@@ -35,6 +35,7 @@ import { Result, ResultAsync } from 'neverthrow'
 import { Utils } from '@shardus/types'
 import { arch } from 'os'
 import { checkGossipPayload } from '../utils/GossipValidation'
+import { nodelistFromStates } from './Join'
 
 const clone = rfdc()
 
@@ -319,7 +320,18 @@ export function addArchiverJoinRequest(joinRequest: P2P.ArchiversTypes.Request,
       joinRequest
     )
   if (gossip === true) {
-    Comms.sendGossip('joinarchiver', joinRequest, tracker, null, NodeList.byIdOrder, true)
+    Comms.sendGossip(
+      'joinarchiver',
+      joinRequest,
+      tracker,
+      null,
+      nodelistFromStates([
+        P2P.P2PTypes.NodeStatus.ACTIVE,
+        P2P.P2PTypes.NodeStatus.READY,
+        P2P.P2PTypes.NodeStatus.SYNCING,
+      ]),
+      true
+    )
   }
   return { success: true }
 }
@@ -428,7 +440,18 @@ export function addLeaveRequest(leaveRequest: P2P.ArchiversTypes.Request, tracke
   leaveRequests.push(leaveRequest)
   if (logFlags.console) console.log('adding leave requests', leaveRequests)
   if (gossip === true) {
-    Comms.sendGossip('leavingarchiver', leaveRequest, tracker, null, NodeList.byIdOrder, true)
+    Comms.sendGossip(
+      'leavingarchiver',
+      leaveRequest,
+      tracker,
+      null,
+      nodelistFromStates([
+        P2P.P2PTypes.NodeStatus.ACTIVE,
+        P2P.P2PTypes.NodeStatus.READY,
+        P2P.P2PTypes.NodeStatus.SYNCING,
+      ]),
+      true
+    )
   }
   return { success: true }
 }
@@ -939,7 +962,18 @@ export function registerRoutes() {
       }
       if (!accepted.success) return warn('Archiver join request not accepted.')
       if (logFlags.p2pNonFatal) info('Archiver join request accepted!')
-      Comms.sendGossip('joinarchiver', payload, tracker, sender, NodeList.byIdOrder, false)
+      Comms.sendGossip(
+        'joinarchiver',
+        payload,
+        tracker,
+        sender,
+        nodelistFromStates([
+          P2P.P2PTypes.NodeStatus.ACTIVE,
+          P2P.P2PTypes.NodeStatus.READY,
+          P2P.P2PTypes.NodeStatus.SYNCING,
+        ]),
+        false
+      )
     } finally {
       profilerInstance.scopedProfileSectionEnd('joinarchiver')
     }
@@ -958,7 +992,18 @@ export function registerRoutes() {
       const accepted = await addLeaveRequest(payload, tracker, false)
       if (!accepted.success) return warn('Archiver leave request not accepted.')
       /* prettier-ignore */ if (logFlags.p2pNonFatal) info('Archiver leave request accepted!')
-      Comms.sendGossip('leavingarchiver', payload, tracker, sender, NodeList.byIdOrder, false)
+      Comms.sendGossip(
+        'leavingarchiver',
+        payload,
+        tracker,
+        sender,
+        nodelistFromStates([
+          P2P.P2PTypes.NodeStatus.ACTIVE,
+          P2P.P2PTypes.NodeStatus.READY,
+          P2P.P2PTypes.NodeStatus.SYNCING,
+        ]),
+        false
+      )
     } finally {
       profilerInstance.scopedProfileSectionEnd('leavingarchiver')
     }

src/p2p/Comms.ts

@@ -26,7 +26,6 @@ import { getStreamWithTypeCheck, requestErrorHandler } from '../types/Helpers'
 import { TypeIdentifierEnum } from '../types/enum/TypeIdentifierEnum'
 import { InternalError, ResponseError, serializeResponseError } from '../types/ResponseError'
 import { Utils } from '@shardus/types'
-import { nodeListFromStates } from './Join'
 
 /** ROUTES */
 

src/p2p/CycleAutoScale.ts

@@ -15,6 +15,7 @@ import { enterRecovery, enterSafety } from './Modes'
 import { getOurNodeIndex } from './Utils'
 import { shardusGetTime } from '../network'
 import { Utils } from '@shardus/types'
+import { nodelistFromStates } from './Join'
 
 /** STATE */
 
@@ -54,7 +55,17 @@ const gossipScaleRoute: P2P.P2PTypes.GossipHandler<P2P.CycleAutoScaleTypes.Signe
 
     const added = addExtScalingRequest(payload)
     if (!added) return
-    Comms.sendGossip('scaling', payload, tracker, sender, NodeList.byIdOrder, false, 2)
+    Comms.sendGossip(
+      'scaling',
+      payload,
+      tracker,
+      sender,
+      nodelistFromStates([
+        P2P.P2PTypes.NodeStatus.ACTIVE
+      ]),
+      false,
+      2
+    )
   } finally {
     profilerInstance.scopedProfileSectionEnd('gossip-scaling')
   }
@@ -131,7 +142,17 @@ function _requestNetworkScaling(upOrDown) {
         signedRequest
       )}`
     )
-    Comms.sendGossip('scaling', signedRequest, '', null, NodeList.byIdOrder, true, 2)
+    Comms.sendGossip(
+      'scaling',
+      signedRequest,
+      '',
+      null,
+      nodelistFromStates([
+        P2P.P2PTypes.NodeStatus.ACTIVE
+      ]),
+      true,
+      2
+    )
     scalingRequested = true
     requestedScalingType = signedRequest.scale //only set this when our node requests scaling
     nestedCountersInstance.countEvent('p2p', 'initiate gossip: scaling: ' + (upOrDown ? 'up' : 'down'))

src/p2p/CycleCreator.ts

@@ -48,7 +48,7 @@ import { getStreamWithTypeCheck, requestErrorHandler } from '../types/Helpers'
 import { RequestErrorEnum } from '../types/enum/RequestErrorEnum'
 import { BadRequest, InternalError, NotFound, serializeResponseError } from '../types/ResponseError'
 import { Utils } from '@shardus/types'
-import { nodeListFromStates } from './Join'
+import { nodelistFromStates } from './Join'
 import { AJVSchemaEnum } from '../types/enum/AJVSchemaEnum'
 
 /** CONSTANTS */
@@ -1302,7 +1302,7 @@ async function gossipCycleCert(sender: P2P.NodeListTypes.Node['id'], tracker?: s
     signedCertGossip,
     tracker,
     sender,
-    Join.nodeListFromStates([
+    nodelistFromStates([
       P2P.P2PTypes.NodeStatus.ACTIVE,
       P2P.P2PTypes.NodeStatus.READY,
       P2P.P2PTypes.NodeStatus.SYNCING,

src/p2p/Join/index.ts

@@ -1,4 +1,4 @@
 import deepmerge from 'deepmerge'
 import { version } from '../../../package.json'
 import * as http from '../../http'
 import { logFlags } from '../../logger'
@@ -11,7 +11,7 @@
 import * as CycleCreator from '../CycleCreator'
 import * as NodeList from '../NodeList'
 import * as Self from '../Self'
 import { getOurNodeIndex, robustQuery } from '../Utils'
 import { isBogonIP, isInvalidIP, isIPv6 } from '../../utils/functions/checkIP'
 import { nestedCountersInstance } from '../../utils/nestedCounters'
 import { Logger } from 'log4js'
@@ -29,8 +29,8 @@
 import { drainSelectedPublicKeys, forceSelectSelf } from './v2/select'
 import { deleteStandbyNode, drainNewUnjoinRequests, processNewUnjoinRequest } from './v2/unjoin'
 import { JoinRequest } from '@shardus/types/build/src/p2p/JoinTypes'
 import { updateNodeState } from '../Self'
 import { HTTPError } from 'got'
 import {
   drainLostAfterSelectionNodes,
   drainSyncStarted,
@@ -47,8 +47,8 @@
 /** STATE */
 
 let p2pLogger: Logger
 let mainLogger: Logger
 const clone = rfdc()
 
 let requests: P2P.JoinTypes.JoinRequest[]
 let seen: Set<P2P.P2PTypes.Node['publicKey']>
@@ -444,7 +444,7 @@
 
           // Select the most recent nodes for removal
           for (let i = standbyList.length - 1; i >= 0 && removeCount < nodesToRemoveCount; i--) {
             const node = standbyList[i]
 
             // check if the node is not already marked for removal
             if (!standbyRemoveSet.has(node.nodeInfo.publicKey)) {
@@ -660,7 +660,7 @@
         syncStartedTx,
         '',
         null,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -688,7 +688,7 @@
         syncFinishedTx,
         '',
         null,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -720,7 +720,7 @@
           standbyRefreshTx,
           '',
           null,
-          nodeListFromStates([
+          nodelistFromStates([
             P2P.P2PTypes.NodeStatus.ACTIVE,
             P2P.P2PTypes.NodeStatus.READY,
             P2P.P2PTypes.NodeStatus.SYNCING,
@@ -770,7 +770,7 @@
         signedObjectWithJoinRequest,
         '',
         null,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -805,7 +805,7 @@
         unjoinRequest,
         '',
         null,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -1628,7 +1628,7 @@
   }
 }
 
-export function nodeListFromStates(states: P2P.P2PTypes.NodeStatus[]): P2P.NodeListTypes.Node[] {
+export function nodelistFromStates(states: P2P.P2PTypes.NodeStatus[]): P2P.NodeListTypes.Node[] {
   if (Self.isRestartNetwork) return NodeList.byIdOrder
   const { NodeStatus } = P2P.P2PTypes
   const stateMappings: { [key in P2P.P2PTypes.NodeStatus]?: P2P.NodeListTypes.Node[] } = {
@@ -1642,8 +1642,8 @@
   let result: P2P.NodeListTypes.Node[] = []
 
   for (const state of states) {
     if (stateMappings[state]) {
       result = result.concat(stateMappings[state])
     }
   }
   const self = NodeList.byJoinOrder.find((node) => node.id === Self.id)

src/p2p/Join/routes.ts

@@ -19,8 +19,8 @@
   queueStandbyRefreshRequest,
   queueJoinRequest,
   queueUnjoinRequest,
   verifyJoinRequestTypes,
-  nodeListFromStates
+  nodelistFromStates,
 } from '.'
 import { config } from '../Context'
 import { isBogonIP } from '../../utils/functions/checkIP'
@@ -214,7 +214,7 @@
             joinRequest,
             '',
             null,
-            nodeListFromStates([
+            nodelistFromStates([
               P2P.P2PTypes.NodeStatus.ACTIVE,
               P2P.P2PTypes.NodeStatus.READY,
               P2P.P2PTypes.NodeStatus.SYNCING,
@@ -269,7 +269,11 @@
     if (processResult.success === false) {
       return res.status(500).send(processResult.reason)
     }
-    Comms.sendGossip('gossip-sync-started', syncStarted, '', null, NodeList.byIdOrder, true)
+    Comms.sendGossip('gossip-sync-started', syncStarted, '', null, nodelistFromStates([
+          P2P.P2PTypes.NodeStatus.ACTIVE,
+          P2P.P2PTypes.NodeStatus.READY,
+          P2P.P2PTypes.NodeStatus.SYNCING,
+        ]), true)
     return res.status(200).send()
   },
 }
@@ -450,7 +454,7 @@
           payload,
           tracker,
           sender,
-          nodeListFromStates([
+          nodelistFromStates([
             P2P.P2PTypes.NodeStatus.ACTIVE,
             P2P.P2PTypes.NodeStatus.READY,
             P2P.P2PTypes.NodeStatus.SYNCING,
@@ -564,7 +568,7 @@
     payload,
     tracker,
     sender,
-    nodeListFromStates([
+    nodelistFromStates([
       P2P.P2PTypes.NodeStatus.ACTIVE,
       P2P.P2PTypes.NodeStatus.READY,
       P2P.P2PTypes.NodeStatus.SYNCING,
@@ -596,7 +600,7 @@
     payload,
     tracker,
     sender,
-    nodeListFromStates([
+    nodelistFromStates([
       P2P.P2PTypes.NodeStatus.ACTIVE,
       P2P.P2PTypes.NodeStatus.READY,
       P2P.P2PTypes.NodeStatus.SYNCING,
@@ -644,7 +648,7 @@
         payload,
         tracker,
         sender,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -699,7 +703,7 @@
         payload,
         tracker,
         sender,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,
@@ -748,7 +752,7 @@
         payload,
         tracker,
         sender,
-        nodeListFromStates([
+        nodelistFromStates([
           P2P.P2PTypes.NodeStatus.ACTIVE,
           P2P.P2PTypes.NodeStatus.READY,
           P2P.P2PTypes.NodeStatus.SYNCING,