add back nodelistFromStates to handle network restart and variable na…

…me fix
shardeum · Aug 21, 2024 · c15da3e · c15da3e
1 parent 8ffe854
commit c15da3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/p2p/Join/index.ts b/src/p2p/Join/index.ts
@@ -1629,6 +1629,7 @@ function decideNodeSelection(joinRequest: P2P.JoinTypes.JoinRequest): JoinReques
 }
 
 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[] } = {
     [NodeStatus.ACTIVE]: NodeList.activeByIdOrder,

diff --git a/src/p2p/Join/routes.ts b/src/p2p/Join/routes.ts
@@ -225,7 +225,7 @@ const unjoinRoute: P2P.P2PTypes.Route<Handler> = {
 
     Comms.sendGossip(
       'gossip-unjoin',
-      joinRequest,
+      unjoinRequest,
       '',
       null,
       nodelistFromStates([