Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions blacklight-node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "blacklight-node"
version = "0.9.0"
version = "0.10.0"
edition = "2024"

[dependencies]
alloy = { version = "1.1", features = ["contract", "providers"] }
anyhow = "1.0"
async-trait = "0.1"
attestation-verification = { git = "https://github.com/NillionNetwork/nilcc", rev = "b9b73bfc12141c358920b7af3bb5275292c55cc7", package = "attestation-verification" }
attestation-verification = { git = "https://github.com/NillionNetwork/nilcc", rev = "6a40845fc21f46d2b167eb071aa14ead2647caa5", package = "attestation-verification" }
dcap-qvl = "0.3.4"
clap = { version = "4.5", features = ["derive", "env", "string"] }
futures-util = "0.3"
Expand Down
4 changes: 4 additions & 0 deletions blacklight-node/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ pub struct CliArgs {
/// The path where AMD certificates will be cached.
#[clap(short, long, default_value = default_cert_cache_path().into_os_string(), env = "CERT_CACHE")]
pub cert_cache: PathBuf,

/// The domain used to fetch processor VCEK certificates from.
#[clap(long, default_value = "certs.nilcc.nillion.network")]
pub cert_cache_domain: String,
}

/// Node configuration with all required values resolved
Expand Down
6 changes: 5 additions & 1 deletion blacklight-node/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ async fn main() -> Result<()> {

// Load configuration
let cli_args = CliArgs::parse();
let verifier = HtxVerifier::new(cli_args.artifact_cache.clone(), cli_args.cert_cache.clone())?;
let verifier = HtxVerifier::new(
cli_args.artifact_cache.clone(),
cli_args.cert_cache.clone(),
cli_args.cert_cache_domain.clone(),
)?;
let config = NodeConfig::load(cli_args).await?;

// Setup shutdown handler
Expand Down
4 changes: 0 additions & 4 deletions blacklight-node/src/supervisor/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,4 @@ mod tests {
VersionCompatibility::Equal
);
}
#[test]
fn test_package_version() {
assert_eq!("0.9.0", env!("CARGO_PKG_VERSION"));
}
}
11 changes: 8 additions & 3 deletions blacklight-node/src/verification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,19 @@ pub struct HtxVerifier {
}

impl HtxVerifier {
pub fn new(artifact_cache: PathBuf, cert_cache: PathBuf) -> anyhow::Result<Self> {
pub fn new(
artifact_cache: PathBuf,
cert_cache: PathBuf,
cert_cache_domain: String,
) -> anyhow::Result<Self> {
let report_fetcher = ReportFetcher::new(
artifact_cache.clone(),
ARTIFACTS_URL.to_string(),
Box::new(LockedDownloader::default()),
);
let fetcher =
DefaultCertificateFetcher::new(cert_cache).context("Creating certificate fetcher")?;
let fetcher = DefaultCertificateFetcher::new(cert_cache)
.context("Creating certificate fetcher")?
.with_processor_cert_domain(cert_cache_domain);
let report_verifier = ReportVerifier::new(Arc::new(fetcher));
Ok(Self {
report_fetcher: Arc::new(report_fetcher),
Expand Down
12 changes: 0 additions & 12 deletions niluv_node/docker-compose.yml

This file was deleted.