WIP filling in core aggregator match arms and various other tweaks

backend/common/src/internal_messages.rs

@@ -1,7 +1,7 @@
 use std::net::IpAddr;
 
 use crate::node::Payload;
-use crate::types::{NodeDetails};
+use crate::types::{NodeDetails, BlockHash};
 use crate::assign_id::Id;
 use serde::{Deserialize, Serialize};
 
@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 pub type LocalId = Id;
 
 /// A global ID assigned to messages from each different pair of ConnId+LocalId.
-pub type GlobalId = Id;
+pub type GlobalId = usize;
 
 /// Message sent from the shard to the backend core
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -20,6 +20,7 @@ pub enum FromShardAggregator {
     	ip: Option<IpAddr>,
     	node: NodeDetails,
     	local_id: LocalId,
+        genesis_hash: BlockHash
     },
     /// Send a message payload to update details for a node
     UpdateNode {