Feat/identity rebased

.gitignore

@@ -30,3 +30,7 @@ index.html
 !/bindings/wasm/static/index.html
 
 docs
+# ignore IOTA build artifacts & package locks
+build
+identity_iota_core/packages/*/Move.lock
+

Cargo.toml

@@ -1,3 +1,11 @@
+[workspace.package]
+authors = ["IOTA Stiftung"]
+edition = "2021"
+homepage = "https://www.iota.org"
+license = "Apache-2.0"
+repository = "https://github.com/iotaledger/identity.rs"
+rust-version = "1.65"
+
 [workspace]
 resolver = "2"
 members = [
@@ -22,19 +30,11 @@ exclude = ["bindings/wasm", "bindings/grpc"]
 [workspace.dependencies]
 bls12_381_plus = { version = "0.8.17" }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
-thiserror = { version = "1.0", default-features = false }
-strum = { version = "0.25", default-features = false, features = ["std", "derive"] }
 serde_json = { version = "1.0", default-features = false }
+strum = { version = "0.25", default-features = false, features = ["std", "derive"] }
+thiserror = { version = "1.0", default-features = false }
 json-proof-token = { version = "0.3.5" }
 zkryptium = { version = "0.2.2", default-features = false, features = ["bbsplus"] }
 
-[workspace.package]
-authors = ["IOTA Stiftung"]
-edition = "2021"
-homepage = "https://www.iota.org"
-license = "Apache-2.0"
-repository = "https://github.com/iotaledger/identity.rs"
-rust-version = "1.65"
-
 [workspace.lints.clippy]
 result_large_err = "allow"

bindings/grpc/Cargo.toml

@@ -17,27 +17,32 @@ name = "identity-grpc"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = "1.0"
 futures = { version = "0.3" }
 identity_eddsa_verifier = { path = "../../identity_eddsa_verifier" }
 identity_iota = { path = "../../identity_iota", features = ["resolver", "sd-jwt", "domain-linkage", "domain-linkage-fetch", "status-list-2021"] }
+identity_jose = { path = "../../identity_jose" }
+identity_storage = { path = "../../identity_storage", features = ["memstore"] }
 identity_stronghold = { path = "../../identity_stronghold", features = ["send-sync-storage"] }
-iota-sdk = { version = "1.1.5", features = ["stronghold"] }
-openssl = { version = "0.10", features = ["vendored"] }
-prost = "0.12"
+identity_sui_name_tbd = { path = "../../identity_sui_name_tbd" }
+iota-sdk = { version = "1.1.2", features = ["stronghold"] }
+iota-sdk-move = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk" }
+prost = "0.13"
 rand = "0.8.5"
-serde = { version = "1.0.193", features = ["derive", "alloc"] }
-serde_json = { version = "1.0.108", features = ["alloc"] }
-thiserror = "1.0.50"
+serde = { version = "1.0", features = ["derive", "alloc"] }
+serde_json = { version = "1.0", features = ["alloc"] }
+thiserror = "1.0"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.14", features = ["net"] }
-tonic = "0.10"
+tonic = "0.12"
 tracing = { version = "0.1.40", features = ["async-await"] }
 tracing-subscriber = "0.3.18"
 url = { version = "2.5", default-features = false }
 
 [dev-dependencies]
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", package = "fastcrypto" }
 identity_storage = { path = "../../identity_storage", features = ["memstore"] }
+jsonpath-rust = "0.7"
 
 [build-dependencies]
-tonic-build = "0.10"
+tonic-build = "0.12"

bindings/grpc/proto/document.proto

@@ -5,8 +5,8 @@ syntax = "proto3";
 package document;
 
 message CreateDIDRequest {
-    // An IOTA's bech32 encoded address.
-    string bech32_address = 1;
+    // KeyID for getting the public key from stronghold.
+    string key_id = 1;
 }
 
 message CreateDIDResponse {

bindings/grpc/src/main.rs

@@ -1,11 +1,15 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+use std::str::FromStr;
+
 use anyhow::Context;
 use identity_grpc::server::GRpcServer;
 use identity_stronghold::StrongholdStorage;
 use iota_sdk::client::stronghold::StrongholdAdapter;
-use iota_sdk::client::Client;
+
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
+use iota_sdk_move::types::base_types::ObjectID;
 
 #[tokio::main]
 #[tracing::instrument(err)]
@@ -15,15 +19,19 @@ async fn main() -> anyhow::Result<()> {
 
   let api_endpoint = std::env::var("API_ENDPOINT")?;
 
-  let client: Client = Client::builder()
-    .with_primary_node(&api_endpoint, None)?
-    .finish()
-    .await?;
+  let identity_iota_pkg_id = std::env::var("IDENTITY_IOTA_PKG_ID")?;
+
+  let identity_pkg_id = ObjectID::from_str(&identity_iota_pkg_id)?;
+
+  let iota_client = iota_sdk_move::IotaClientBuilder::default().build(api_endpoint).await?;
+
+  let read_only_client = IdentityClientReadOnly::new(iota_client, identity_pkg_id).await?;
+
   let stronghold = init_stronghold()?;
 
   let addr = "0.0.0.0:50051".parse()?;
   tracing::info!("gRPC server listening on {}", addr);
-  GRpcServer::new(client, stronghold).serve(addr).await?;
+  GRpcServer::new(read_only_client, stronghold).serve(addr).await?;
 
   Ok(())
 }

bindings/grpc/src/server.rs

@@ -4,7 +4,7 @@
 use std::net::SocketAddr;
 
 use identity_stronghold::StrongholdStorage;
-use iota_sdk::client::Client;
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
 use tonic::transport::server::Router;
 use tonic::transport::server::Server;
 
@@ -17,7 +17,7 @@ pub struct GRpcServer {
 }
 
 impl GRpcServer {
-  pub fn new(client: Client, stronghold: StrongholdStorage) -> Self {
+  pub fn new(client: IdentityClientReadOnly, stronghold: StrongholdStorage) -> Self {
     let router = Server::builder().add_routes(services::routes(&client, &stronghold));
     Self { router, stronghold }
   }

bindings/grpc/src/services/credential/jwt.rs

@@ -12,7 +12,7 @@ use identity_iota::storage::JwkDocumentExt;
 use identity_iota::storage::JwsSignatureOptions;
 use identity_iota::storage::Storage;
 use identity_stronghold::StrongholdStorage;
-use iota_sdk::client::Client;
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
 use tonic::Request;
 use tonic::Response;
 use tonic::Status;
@@ -31,9 +31,9 @@ pub struct JwtService {
 }
 
 impl JwtService {
-  pub fn new(client: &Client, stronghold: &StrongholdStorage) -> Self {
+  pub fn new(client: &IdentityClientReadOnly, stronghold: &StrongholdStorage) -> Self {
     let mut resolver = Resolver::new();
-    resolver.attach_iota_handler(client.clone());
+    resolver.attach_kinesis_iota_handler(client.clone());
     Self {
       resolver,
       storage: Storage::new(stronghold.clone(), stronghold.clone()),
@@ -80,6 +80,6 @@ impl JwtSvc for JwtService {
   }
 }
 
-pub fn service(client: &Client, stronghold: &StrongholdStorage) -> JwtServer<JwtService> {
+pub fn service(client: &IdentityClientReadOnly, stronghold: &StrongholdStorage) -> JwtServer<JwtService> {
   JwtServer::new(JwtService::new(client, stronghold))
 }

bindings/grpc/src/services/credential/mod.rs

@@ -6,10 +6,10 @@ pub mod revocation;
 pub mod validation;
 
 use identity_stronghold::StrongholdStorage;
-use iota_sdk::client::Client;
-use tonic::transport::server::RoutesBuilder;
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
+use tonic::service::RoutesBuilder;
 
-pub fn init_services(routes: &mut RoutesBuilder, client: &Client, stronghold: &StrongholdStorage) {
+pub fn init_services(routes: &mut RoutesBuilder, client: &IdentityClientReadOnly, stronghold: &StrongholdStorage) {
   routes.add_service(revocation::service(client));
   routes.add_service(jwt::service(client, stronghold));
   routes.add_service(validation::service(client));

bindings/grpc/src/services/credential/revocation.rs

@@ -12,7 +12,7 @@ use identity_iota::credential::RevocationBitmapStatus;
 use identity_iota::credential::{self};
 use identity_iota::prelude::IotaDocument;
 use identity_iota::prelude::Resolver;
-use iota_sdk::client::Client;
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
 use prost::bytes::Bytes;
 use serde::Deserialize;
 use serde::Serialize;
@@ -107,9 +107,9 @@ pub struct CredentialVerifier {
 }
 
 impl CredentialVerifier {
-  pub fn new(client: &Client) -> Self {
+  pub fn new(client: &IdentityClientReadOnly) -> Self {
     let mut resolver = Resolver::new();
-    resolver.attach_iota_handler(client.clone());
+    resolver.attach_kinesis_iota_handler(client.clone());
     Self { resolver }
   }
 }
@@ -156,6 +156,6 @@ impl CredentialRevocation for CredentialVerifier {
   }
 }
 
-pub fn service(client: &Client) -> CredentialRevocationServer<CredentialVerifier> {
+pub fn service(client: &IdentityClientReadOnly) -> CredentialRevocationServer<CredentialVerifier> {
   CredentialRevocationServer::new(CredentialVerifier::new(client))
 }

bindings/grpc/src/services/credential/validation.rs

@@ -16,7 +16,7 @@ use identity_iota::credential::StatusCheck;
 use identity_iota::iota::IotaDID;
 use identity_iota::resolver;
 use identity_iota::resolver::Resolver;
-use iota_sdk::client::Client;
+use identity_sui_name_tbd::client::IdentityClientReadOnly;
 
 use _credentials::vc_validation_server::VcValidation;
 use _credentials::vc_validation_server::VcValidationServer;
@@ -63,9 +63,9 @@ pub struct VcValidator {
 }
 
 impl VcValidator {
-  pub fn new(client: &Client) -> Self {
+  pub fn new(client: &IdentityClientReadOnly) -> Self {
     let mut resolver = Resolver::new();
-    resolver.attach_iota_handler(client.clone());
+    resolver.attach_kinesis_iota_handler(client.clone());
     Self { resolver }
   }
 }
@@ -130,6 +130,6 @@ impl VcValidation for VcValidator {
   }
 }
 
-pub fn service(client: &Client) -> VcValidationServer<VcValidator> {
+pub fn service(client: &IdentityClientReadOnly) -> VcValidationServer<VcValidator> {
   VcValidationServer::new(VcValidator::new(client))
 }