diff --git a/blacklight-node/Cargo.toml b/blacklight-node/Cargo.toml index c2303cd..281b7f1 100644 --- a/blacklight-node/Cargo.toml +++ b/blacklight-node/Cargo.toml @@ -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" diff --git a/blacklight-node/src/args.rs b/blacklight-node/src/args.rs index 86dc707..f112635 100644 --- a/blacklight-node/src/args.rs +++ b/blacklight-node/src/args.rs @@ -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 diff --git a/blacklight-node/src/main.rs b/blacklight-node/src/main.rs index 0565078..ab9d9fc 100644 --- a/blacklight-node/src/main.rs +++ b/blacklight-node/src/main.rs @@ -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 diff --git a/blacklight-node/src/supervisor/version.rs b/blacklight-node/src/supervisor/version.rs index 4862a03..92a3156 100644 --- a/blacklight-node/src/supervisor/version.rs +++ b/blacklight-node/src/supervisor/version.rs @@ -243,8 +243,4 @@ mod tests { VersionCompatibility::Equal ); } - #[test] - fn test_package_version() { - assert_eq!("0.9.0", env!("CARGO_PKG_VERSION")); - } } diff --git a/blacklight-node/src/verification.rs b/blacklight-node/src/verification.rs index aa1293b..c208f68 100644 --- a/blacklight-node/src/verification.rs +++ b/blacklight-node/src/verification.rs @@ -126,14 +126,19 @@ pub struct HtxVerifier { } impl HtxVerifier { - pub fn new(artifact_cache: PathBuf, cert_cache: PathBuf) -> anyhow::Result { + pub fn new( + artifact_cache: PathBuf, + cert_cache: PathBuf, + cert_cache_domain: String, + ) -> anyhow::Result { 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), diff --git a/niluv_node/docker-compose.yml b/niluv_node/docker-compose.yml deleted file mode 100644 index d204b5c..0000000 --- a/niluv_node/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -services: - niluv_node: - image: blacklight_node:latest - restart: unless-stopped - volumes: - - ./blacklight_node:/app - - ./cache:/tmp/niluv-cache - environment: - - RPC_URL=https://rpc-nilav-shzvox09l5.t.conduit.xyz - - TOKEN_CONTRACT_ADDRESS=0x69AD6D3E17C99A3f66b5Ae410a5D1D4E14C7da35 - - MANAGER_CONTRACT_ADDRESS=0x8d683fb2CC794E085E8366c4f28f8CC991107576 - - STAKING_CONTRACT_ADDRESS=0x595A112FA10ED66Bc518b28781035BA50C9f2216 \ No newline at end of file