mark agent id aspect as held durin initialization

crates/core/src/dht/actions/hold_aspect.rs

@@ -29,6 +29,26 @@ pub fn ack_single(context: Arc<Context>, aspect: EntryAspect) {
     dispatch_action(context.action_channel(), ActionWrapper::new(action));
 }
 
+pub async fn hold_aspect_no_ack(
+    pending_id: &ProcessUniqueId,
+    aspect: EntryAspect,
+    context: Arc<Context>,
+) -> Result<(), HolochainError> {
+    let id = (*pending_id, ProcessUniqueId::new());
+    let action_wrapper = ActionWrapper::new(Action::HoldAspect((aspect.clone(), id)));
+    dispatch_action(context.action_channel(), action_wrapper.clone());
+    let r = HoldAspectFuture {
+        context: context.clone(),
+        //        aspect,
+        id,
+    }
+    .await;
+    if r.is_err() {
+        error!("HoldAspect action completed with error: {:?}", r);
+    }
+    r
+}
+
 pub async fn hold_aspect(
     pending_id: &ProcessUniqueId,
     aspect: EntryAspect,

crates/core/src/nucleus/actions/initialize.rs

@@ -1,7 +1,9 @@
 use crate::{
     action::{Action, ActionWrapper},
-    agent::actions::commit::commit_entry,
+    agent::{actions::commit::commit_entry, find_chain_header},
     context::Context,
+    dht::actions::hold_aspect::hold_aspect_no_ack,
+    network::entry_aspect::EntryAspect,
     nucleus::state::NucleusStatus,
 };
 use futures::{future::Future, task::Poll};
@@ -98,7 +100,7 @@ pub async fn initialize_chain(
 
     // Commit AgentId to chain
     let agent_id_entry = Entry::AgentId(context_clone.agent_id.clone());
-    let agent_id_commit = commit_entry(agent_id_entry, None, &context_clone).await;
+    let agent_id_commit = commit_entry(agent_id_entry.clone(), None, &context_clone).await;
 
     // Let initialization fail if AgentId could not be committed.
     // Currently this cannot happen since ToEntry for Agent always creates
@@ -109,6 +111,14 @@ pub async fn initialize_chain(
         return Err(HolochainError::InitializationFailed(
             "error committing Agent".to_string(),
         ));
+    } else {
+        let agent_id_header = find_chain_header(&agent_id_entry, &context.state().unwrap())
+            .ok_or_else(|| HolochainError::from("No header found for agent id entry"))?;
+
+        // mark the entry as held in the dht store because we always hold ourselves.
+        let entry_aspect = EntryAspect::Content(agent_id_entry, agent_id_header);
+
+        hold_aspect_no_ack(&ProcessUniqueId::new(), entry_aspect, context.clone()).await?;
     }
 
     let mut cap_functions = CapFunctions::new();

crates/holochain/src/main.rs

@@ -181,7 +181,7 @@ fn main() {
                                 if held_list_aspect_map != actually_held_aspect_map {
                                     let actually_held_aspects : HashSet<(AspectHash, EntryAspect)> = aspects.into_iter().map(|aspect| (AspectHash::from(aspect.address()), aspect)).collect();
 
-                                    writeln!(io, "mismatch: held aspects for {:?} is:\n{:?}\n but actual aspects held are:\n{:?}", entry_hash, held_list_aspect_map, actually_held_aspects)?;
+                                    writeln!(io, "mismatch: held aspects for {:?} is:\n{:?}\n but actual aspects held are:\n{:?}\n\n\n", entry_hash, held_list_aspect_map, actually_held_aspects)?;
                                 }
                             }
                         }