WIP

impierce · Jan 24, 2025 · 1a8bef6 · 1a8bef6
1 parent b155578
commit 1a8bef6
Show file tree

Hide file tree

Showing 18 changed files with 424 additions and 195 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,17 +19,18 @@ edition = "2021"
 rust-version = "1.76.0"
 
 [workspace.dependencies]
-did_manager = { git = "https://git@github.com/impierce/did-manager.git", rev = "7c31432" }
-siopv2 = { git = "https://git@github.com/impierce/openid4vc.git", rev = "2d89065" }
-oid4vci = { git = "https://git@github.com/impierce/openid4vc.git", rev = "2d89065" }
-oid4vc-core = { git = "https://git@github.com/impierce/openid4vc.git", rev = "2d89065" }
-oid4vc-manager = { git = "https://git@github.com/impierce/openid4vc.git", rev = "2d89065" }
-oid4vp = { git = "https://git@github.com/impierce/openid4vc.git", rev = "2d89065" }
+# did_manager = { git = "https://git@github.com/impierce/did-manager.git", rev = "7c31432" }
+# did_manager = { git = "https://git@github.com/impierce/did-manager.git", branch = "build/bump-iota-deps" }
+did_manager = { path = "../did-manager" }
+siopv2 = { git = "https://git@github.com/impierce/openid4vc.git", rev = "c2de2e7" }
+oid4vci = { git = "https://git@github.com/impierce/openid4vc.git", rev = "c2de2e7" }
+oid4vc-core = { git = "https://git@github.com/impierce/openid4vc.git", rev = "c2de2e7" }
+oid4vc-manager = { git = "https://git@github.com/impierce/openid4vc.git", rev = "c2de2e7" }
+oid4vp = { git = "https://git@github.com/impierce/openid4vc.git", rev = "c2de2e7" }
 
 async-trait = "0.1"
 axum = { version = "0.7", features = ["tracing"] }
 base64 = "0.22"
-bls12_381_plus = "0.8"
 chrono = { version = "0.4", features = ["serde"] }
 cqrs-es = "0.4.2"
 futures = "0.3"
@@ -43,7 +44,7 @@ identity_credential = { version = "1.5", default-features = false, features = [
 identity_did = { version = "1.5" }
 identity_document = { version = "1.5" }
 identity_iota = { version = "1.5" }
-identity_stronghold = { version = "1.5", default-features = false, features = ["bbs-plus"] }
+identity_stronghold = { version = "1.5", default-features = false }
 identity_verification = { version = "1.5", default-features = false }
 iota-sdk = { version = "1.0", default-features = false, features = ["tls", "client", "stronghold"] }
 jsonwebtoken = "9.3"

diff --git a/agent_api_rest/src/verification/relying_party/redirect.rs b/agent_api_rest/src/verification/relying_party/redirect.rs
@@ -64,7 +64,7 @@ pub mod tests {
         authorization_requests::tests::authorization_requests, relying_party::request::tests::request, router,
     };
     use agent_event_publisher_http::EventPublisherHttp;
-    use agent_secret_manager::{secret_manager, service::Service, subject::Subject};
+    use agent_secret_manager::{secret_manager, service::Service, stronghold_storage, subject::Subject};
     use agent_shared::config::{set_config, Events};
     use agent_store::{in_memory, EventPublisher};
     use axum::{
@@ -112,6 +112,7 @@ pub mod tests {
         let provider_manager = ProviderManager::new(
             Arc::new(Subject {
                 secret_manager: Arc::new(tokio::sync::Mutex::new(secret_manager().await)),
+                stronghold_storage: stronghold_storage().await,
             }),
             vec!["did:key"],
             vec![Algorithm::EdDSA],

diff --git a/agent_application/src/main.rs b/agent_application/src/main.rs
@@ -7,7 +7,7 @@ use agent_event_publisher_http::EventPublisherHttp;
 use agent_holder::services::HolderServices;
 use agent_identity::services::IdentityServices;
 use agent_issuance::{services::IssuanceServices, startup_commands::startup_commands};
-use agent_secret_manager::{secret_manager, service::Service as _, subject::Subject};
+use agent_secret_manager::{secret_manager, service::Service as _, stronghold_storage, subject::Subject};
 use agent_shared::config::{config, LogFormat};
 use agent_store::{in_memory, postgres, EventPublisher};
 use agent_verification::services::VerificationServices;
@@ -28,8 +28,15 @@ async fn main() -> io::Result<()> {
         LogFormat::Text => tracing_subscriber.with(tracing_subscriber::fmt::layer()).init(),
     }
 
+    agent_identity::state::test_function().await;
+
+    panic!();
+
+    let stronghold_storage = stronghold_storage().await;
+
     let subject = Arc::new(Subject {
         secret_manager: Arc::new(tokio::sync::Mutex::new(secret_manager().await)),
+        stronghold_storage,
     });
 
     let identity_services = Arc::new(IdentityServices::new(subject.clone()));

diff --git a/agent_identity/Cargo.toml b/agent_identity/Cargo.toml
@@ -21,16 +21,21 @@ identity_document.workspace = true
 identity_iota.workspace = true
 identity_stronghold.workspace = true
 iota-sdk.workspace = true
+iota_stronghold = { version = "2.1" }
 jsonwebtoken.workspace = true
 oid4vc-core.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
+rand = "0.8"
+reqwest.workspace = true
+anyhow = "1.0"
+serial_test = "3.0"
 
 # `test_utils` dependencies
 rstest = { workspace = true, optional = true }
-tokio = { workspace = true, optional = true }
+tokio = { workspace = true }
 
 [dev-dependencies]
 agent_api_rest = { path = "../agent_api_rest" }
@@ -57,5 +62,5 @@ async-std = { version = "1.5", features = ["attributes", "tokio1"] }
 [features]
 test_utils = [
     "dep:rstest",
-    "dep:tokio",
+    # "dep:tokio",
 ]