Skip to content

Improve node identity init device name handling #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scasino983 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Improve node identity init device name handling #830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions zhtp/src/runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2816,11 +2816,17 @@ pub async fn create_or_load_node_identity(
.join("keystore");

// Allow explicit device name override to keep NodeId deterministic across restarts
let device_name = std::env::var("ZHTP_DEVICE_NAME")
let requested_device_name = std::env::var("ZHTP_DEVICE_NAME")
.unwrap_or_else(|_| "zhtp-node".to_string());
let device_name = resolve_device_name(Some(&requested_device_name))
.context("Failed to resolve node device name")?;
info!("Using node device name: {}", device_name);

// Try to load an existing identity (with private key) from the keystore
if let Some(identity) = crate::runtime::did_startup::load_node_identity_from_keystore(&keystore_path).await? {
if let Some(identity) = crate::runtime::did_startup::load_node_identity_from_keystore(&keystore_path)
.await
.context("Failed to load node identity from keystore")?
{
info!("Loaded existing node identity from keystore: {}", identity.did);
return Ok(identity);
}
Expand All @@ -2833,9 +2839,12 @@ pub async fn create_or_load_node_identity(
None, // No jurisdiction for device
&device_name,
None, // Random seed
)?;
)
.context("Failed to create new unified node identity")?;

crate::runtime::did_startup::persist_node_identity_to_keystore(&keystore_path, &node_identity).await?;
crate::runtime::did_startup::persist_node_identity_to_keystore(&keystore_path, &node_identity)
.await
.context("Failed to persist node identity to keystore")?;
info!("Created and saved node identity to keystore at {:?}", keystore_path);
Ok(node_identity)
}
Loading