Merge pull request #239 from andrewwhitehead/upd/rev-reg-id

Simplify create_credential parameters and remove RevocationRegistryId

include/libanoncreds.h

@@ -176,6 +176,7 @@ typedef struct FfiList_FfiStr FfiStrList;
 typedef struct FfiCredRevInfo {
   ObjectHandle reg_def;
   ObjectHandle reg_def_private;
+  ObjectHandle status_list;
   int64_t reg_idx;
 } FfiCredRevInfo;
 
@@ -263,8 +264,6 @@ ErrorCode anoncreds_create_credential(ObjectHandle cred_def,
                                       FfiStrList attr_names,
                                       FfiStrList attr_raw_values,
                                       FfiStrList attr_enc_values,
-                                      FfiStr rev_reg_id,
-                                      ObjectHandle rev_status_list,
                                       const struct FfiCredRevInfo *revocation,
                                       ObjectHandle *cred_p);
 

src/data_types/credential.rs

@@ -7,13 +7,14 @@ use crate::cl::{CredentialSignature, RevocationRegistry, SignatureCorrectnessPro
 use crate::error::{ConversionError, ValidationError};
 use crate::utils::validation::Validatable;
 
-use super::{cred_def::CredentialDefinitionId, rev_reg::RevocationRegistryId, schema::SchemaId};
+use super::rev_reg_def::RevocationRegistryDefinitionId;
+use super::{cred_def::CredentialDefinitionId, schema::SchemaId};
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Credential {
     pub schema_id: SchemaId,
     pub cred_def_id: CredentialDefinitionId,
-    pub rev_reg_id: Option<RevocationRegistryId>,
+    pub rev_reg_id: Option<RevocationRegistryDefinitionId>,
     pub values: CredentialValues,
     pub signature: CredentialSignature,
     pub signature_correctness_proof: SignatureCorrectnessProof,
@@ -75,7 +76,7 @@ pub struct CredentialInfo {
     pub attrs: ShortCredentialValues,
     pub schema_id: SchemaId,
     pub cred_def_id: CredentialDefinitionId,
-    pub rev_reg_id: Option<RevocationRegistryId>,
+    pub rev_reg_id: Option<RevocationRegistryDefinitionId>,
     pub cred_rev_id: Option<String>,
 }
 

src/data_types/macros.rs

@@ -44,8 +44,7 @@ macro_rules! impl_anoncreds_object_identifier {
                     "IssuerId" => &LEGACY_DID_IDENTIFIER,
                     "CredentialDefinitionId" => &LEGACY_CRED_DEF_IDENTIFIER,
                     "SchemaId" => &LEGACY_SCHEMA_IDENTIFIER,
-                    // TODO: we do not have correct validation for a revocation registry and definition id
-                    "RevocationRegistryId" => &LEGACY_DID_IDENTIFIER,
+                    // TODO: we do not have correct validation for a revocation registry definition id
                     "RevocationRegistryDefinitionId" => &LEGACY_DID_IDENTIFIER,
                     invalid_name => {
                         return Err($crate::invalid!(

src/data_types/pres_request.rs

@@ -118,9 +118,6 @@ impl Serialize for PresentationRequest {
     }
 }
 
-#[allow(unused)]
-pub type PresentationRequestExtraQuery = HashMap<String, Query>;
-
 #[derive(Clone, Default, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct NonRevokedInterval {
     pub from: Option<u64>,

src/data_types/presentation.rs

@@ -4,7 +4,9 @@ use crate::cl::Proof;
 use crate::error::ValidationError;
 use crate::utils::validation::Validatable;
 
-use super::{cred_def::CredentialDefinitionId, rev_reg::RevocationRegistryId, schema::SchemaId};
+use super::{
+    cred_def::CredentialDefinitionId, rev_reg_def::RevocationRegistryDefinitionId, schema::SchemaId,
+};
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Presentation {
@@ -55,7 +57,7 @@ pub struct AttributeValue {
 pub struct Identifier {
     pub schema_id: SchemaId,
     pub cred_def_id: CredentialDefinitionId,
-    pub rev_reg_id: Option<RevocationRegistryId>,
+    pub rev_reg_id: Option<RevocationRegistryDefinitionId>,
     pub timestamp: Option<u64>,
 }
 

src/data_types/rev_reg.rs

@@ -1,7 +1,4 @@
 use crate::cl::RevocationRegistry as CryptoRevocationRegistry;
-use crate::impl_anoncreds_object_identifier;
-
-impl_anoncreds_object_identifier!(RevocationRegistryId);
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RevocationRegistry {

src/ffi/credential.rs

@@ -7,35 +7,56 @@ use super::error::{catch_error, ErrorCode};
 use super::object::{AnoncredsObject, ObjectHandle};
 use super::util::FfiStrList;
 use crate::data_types::link_secret::LinkSecret;
-use crate::data_types::rev_reg::RevocationRegistryId;
 use crate::error::Result;
 use crate::services::{
     issuer::create_credential,
     prover::process_credential,
     types::{Credential, CredentialRevocationConfig, MakeCredentialValues},
     utils::encode_credential_attribute,
 };
+use crate::Error;
 
 #[derive(Debug)]
 #[repr(C)]
 pub struct FfiCredRevInfo {
     reg_def: ObjectHandle,
     reg_def_private: ObjectHandle,
+    status_list: ObjectHandle,
     reg_idx: i64,
 }
 
 struct RevocationConfig {
     reg_def: AnoncredsObject,
     reg_def_private: AnoncredsObject,
+    status_list: AnoncredsObject,
     reg_idx: u32,
 }
 
-impl RevocationConfig {
-    pub fn as_ref_config(&self) -> Result<CredentialRevocationConfig> {
+impl TryFrom<&FfiCredRevInfo> for RevocationConfig {
+    type Error = Error;
+
+    fn try_from(value: &FfiCredRevInfo) -> Result<Self> {
+        Ok(Self {
+            reg_def: value.reg_def.load()?,
+            reg_def_private: value.reg_def_private.load()?,
+            reg_idx: value
+                .reg_idx
+                .try_into()
+                .map_err(|_| err_msg!("Invalid revocation index"))?,
+            status_list: value.status_list.load()?,
+        })
+    }
+}
+
+impl<'a> TryFrom<&'a RevocationConfig> for CredentialRevocationConfig<'a> {
+    type Error = Error;
+
+    fn try_from(value: &'a RevocationConfig) -> Result<Self> {
         Ok(CredentialRevocationConfig {
-            reg_def: self.reg_def.cast_ref()?,
-            reg_def_private: self.reg_def_private.cast_ref()?,
-            registry_idx: self.reg_idx,
+            reg_def: value.reg_def.cast_ref()?,
+            reg_def_private: value.reg_def_private.cast_ref()?,
+            registry_idx: value.reg_idx,
+            status_list: value.status_list.cast_ref()?,
         })
     }
 }
@@ -49,8 +70,6 @@ pub extern "C" fn anoncreds_create_credential(
     attr_names: FfiStrList,
     attr_raw_values: FfiStrList,
     attr_enc_values: FfiStrList,
-    rev_reg_id: FfiStr,
-    rev_status_list: ObjectHandle,
     revocation: *const FfiCredRevInfo,
     cred_p: *mut ObjectHandle,
 ) -> ErrorCode {
@@ -64,10 +83,6 @@ pub extern "C" fn anoncreds_create_credential(
                 "Mismatch between length of attribute names and raw values"
             ));
         }
-        let rev_reg_id = rev_reg_id
-            .as_opt_str()
-            .map(RevocationRegistryId::new)
-            .transpose()?;
         let enc_values = attr_enc_values.as_slice();
         let mut cred_values = MakeCredentialValues::default();
         for (attr_idx, (name, raw)) in attr_names
@@ -99,14 +114,7 @@ pub extern "C" fn anoncreds_create_credential(
             None
         } else {
             let revocation = unsafe { &*revocation };
-            Some(RevocationConfig {
-                reg_def: revocation.reg_def.load()?,
-                reg_def_private: revocation.reg_def_private.load()?,
-                reg_idx: revocation
-                    .reg_idx
-                    .try_into()
-                    .map_err(|_| err_msg!("Invalid revocation index"))?,
-            })
+            Some(RevocationConfig::try_from(revocation)?)
         };
 
         let cred = create_credential(
@@ -115,15 +123,9 @@ pub extern "C" fn anoncreds_create_credential(
             cred_offer.load()?.cast_ref()?,
             cred_request.load()?.cast_ref()?,
             cred_values.into(),
-            rev_reg_id,
-            rev_status_list
-                .opt_load()?
-                .as_ref()
-                .map(AnoncredsObject::cast_ref)
-                .transpose()?,
             revocation_config
                 .as_ref()
-                .map(RevocationConfig::as_ref_config)
+                .map(TryInto::try_into)
                 .transpose()?,
         )?;
         let cred = ObjectHandle::create(cred)?;

src/ffi/object.rs

@@ -202,7 +202,6 @@ impl AnoncredsObjectList {
         Ok(Self(loaded))
     }
 
-    #[allow(unused)]
     pub fn refs<T>(&self) -> Result<Vec<&T>>
     where
         T: AnyAnoncredsObject + 'static,

src/services/issuer.rs

@@ -1,7 +1,6 @@
 use crate::cl::{Issuer, RevocationRegistry as CryptoRevocationRegistry};
 use crate::data_types::cred_def::CredentialDefinitionId;
 use crate::data_types::issuer_id::IssuerId;
-use crate::data_types::rev_reg::RevocationRegistryId;
 use crate::data_types::rev_reg_def::RevocationRegistryDefinitionId;
 use crate::data_types::schema::SchemaId;
 use crate::data_types::{
@@ -696,8 +695,6 @@ pub fn create_credential_offer(
 ///                               &credential_offer,
 ///                               &credential_request,
 ///                               credential_values.into(),
-///                               None,
-///                               None,
 ///                               None
 ///                               ).expect("Unable to create credential");
 /// ```
@@ -708,8 +705,6 @@ pub fn create_credential(
     cred_offer: &CredentialOffer,
     cred_request: &CredentialRequest,
     cred_values: CredentialValues,
-    rev_reg_id: Option<RevocationRegistryId>,
-    rev_status_list: Option<&RevocationStatusList>,
     revocation_config: Option<CredentialRevocationConfig>,
 ) -> Result<Credential> {
     trace!("create_credential >>> cred_def: {:?}, cred_def_private: {:?}, cred_offer.nonce: {:?}, cred_request: {:?},\
@@ -724,25 +719,24 @@ pub fn create_credential(
         ))?;
     let credential_values = build_credential_values(&cred_values.0, None)?;
 
-    let (credential_signature, signature_correctness_proof, rev_reg, witness) =
-        if let (Some(revocation_config), Some(rev_status_list)) =
-            (revocation_config, rev_status_list)
-        {
-            let rev_reg_def = &revocation_config.reg_def.value;
-            let rev_reg: Option<CryptoRevocationRegistry> = rev_status_list.into();
+    let (credential_signature, signature_correctness_proof, rev_reg_id, rev_reg, witness) =
+        if let Some(rev_config) = revocation_config {
+            let rev_reg_def: &RevocationRegistryDefinitionValue = &rev_config.reg_def.value;
+            let rev_reg: Option<CryptoRevocationRegistry> = rev_config.status_list.into();
             let mut rev_reg = rev_reg.ok_or_else(|| {
                 err_msg!(
                     Unexpected,
                     "RevocationStatusList should have accumulator value"
                 )
             })?;
 
-            let status = rev_status_list
-                .get(revocation_config.registry_idx as usize)
+            let status = rev_config
+                .status_list
+                .get(rev_config.registry_idx as usize)
                 .ok_or_else(|| {
                     err_msg!(
                         "Revocation status list does not have the index {}",
-                        revocation_config.registry_idx
+                        rev_config.registry_idx
                     )
                 })?;
 
@@ -770,15 +764,16 @@ pub fn create_credential(
                     &credential_values,
                     &cred_public_key,
                     &cred_def_private.value,
-                    revocation_config.registry_idx,
+                    rev_config.registry_idx,
                     rev_reg_def.max_cred_num,
                     issuance_by_default,
                     &mut rev_reg,
-                    &revocation_config.reg_def_private.value,
+                    &rev_config.reg_def_private.value,
                 )?;
             (
                 credential_signature,
                 signature_correctness_proof,
+                rev_config.status_list.id(),
                 Some(rev_reg),
                 Some(witness),
             )
@@ -793,7 +788,7 @@ pub fn create_credential(
                 &cred_public_key,
                 &cred_def_private.value,
             )?;
-            (signature, correctness_proof, None, None)
+            (signature, correctness_proof, None, None, None)
         };
 
     let credential = Credential {

src/services/prover.rs

@@ -228,8 +228,6 @@ pub fn create_credential_request(
 ///                               &credential_offer,
 ///                               &credential_request,
 ///                               credential_values.into(),
-///                               None,
-///                               None,
 ///                               None
 ///                               ).expect("Unable to create credential");
 ///
@@ -340,8 +338,6 @@ pub fn process_credential(
 ///                               &credential_offer,
 ///                               &credential_request,
 ///                               credential_values.into(),
-///                               None,
-///                               None,
 ///                               None
 ///                               ).expect("Unable to create credential");
 ///

src/services/types.rs

@@ -217,16 +217,18 @@ impl Validatable for CredentialRevocationState {
 pub struct CredentialRevocationConfig<'a> {
     pub reg_def: &'a RevocationRegistryDefinition,
     pub reg_def_private: &'a RevocationRegistryDefinitionPrivate,
+    pub status_list: &'a RevocationStatusList,
     pub registry_idx: u32,
 }
 
 impl<'a> std::fmt::Debug for CredentialRevocationConfig<'a> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "CredentialRevocationConfig {{ reg_def: {:?}, private: {:?}, idx: {} }}",
+            "CredentialRevocationConfig {{ reg_def: {:?}, private: {:?}, status_list: {:?}, idx: {} }}",
             self.reg_def,
             secret!(self.reg_def_private),
+            self.status_list,
             secret!(self.registry_idx),
         )
     }

src/services/verifier.rs

@@ -863,7 +863,6 @@ fn is_attr_operator(key: &str) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::data_types::rev_reg::RevocationRegistryId;
 
     pub const SCHEMA_ID: &str = "123";
     pub const SCHEMA_NAME: &str = "Schema Name";
@@ -1180,7 +1179,7 @@ mod tests {
                 timestamp: Some(1234),
                 schema_id: SchemaId::default(),
                 cred_def_id: CredentialDefinitionId::default(),
-                rev_reg_id: Some(RevocationRegistryId::default()),
+                rev_reg_id: Some(RevocationRegistryDefinitionId::default()),
             },
         );
         res.insert(
@@ -1189,7 +1188,7 @@ mod tests {
                 timestamp: None,
                 schema_id: SchemaId::default(),
                 cred_def_id: CredentialDefinitionId::default(),
-                rev_reg_id: Some(RevocationRegistryId::default()),
+                rev_reg_id: Some(RevocationRegistryDefinitionId::default()),
             },
         );
         res