Merge pull request #1 from genaris/fix/js-wrapper-rev-reg-id

fix(js): update create credential parameters

Author: andrewwhitehead

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);
 

wrappers/javascript/anoncreds-nodejs/src/NodeJSAnoncreds.ts

@@ -147,17 +147,10 @@ export class NodeJSAnoncreds implements Anoncreds {
     credentialRequest: ObjectHandle
     attributeRawValues: Record<string, string>
     attributeEncodedValues?: Record<string, string>
-    revocationRegistryId?: string
-    revocationStatusList?: ObjectHandle
     revocationConfiguration?: NativeCredentialRevocationConfig
   }): ObjectHandle {
-    const {
-      credentialDefinition,
-      credentialDefinitionPrivate,
-      credentialOffer,
-      credentialRequest,
-      revocationRegistryId,
-    } = serializeArguments(options)
+    const { credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest } =
+      serializeArguments(options)
 
     const attributeNames = StringListStruct({
       count: Object.keys(options.attributeRawValues).length,
@@ -178,15 +171,13 @@ export class NodeJSAnoncreds implements Anoncreds {
 
     let revocationConfiguration
     if (options.revocationConfiguration) {
-      const {
-        revocationRegistryDefinition: registryDefinition,
-        revocationRegistryDefinitionPrivate: registryDefinitionPrivate,
-        registryIndex,
-      } = serializeArguments(options.revocationConfiguration)
+      const { revocationRegistryDefinition, revocationRegistryDefinitionPrivate, revocationStatusList, registryIndex } =
+        serializeArguments(options.revocationConfiguration)
 
       revocationConfiguration = CredRevInfoStruct({
-        reg_def: registryDefinition,
-        reg_def_private: registryDefinitionPrivate,
+        reg_def: revocationRegistryDefinition,
+        reg_def_private: revocationRegistryDefinitionPrivate,
+        status_list: revocationStatusList,
         reg_idx: registryIndex,
       })
     }
@@ -200,8 +191,6 @@ export class NodeJSAnoncreds implements Anoncreds {
       attributeNames as unknown as Buffer,
       attributeRawValues as unknown as Buffer,
       attributeEncodedValues as unknown as Buffer,
-      revocationRegistryId,
-      options.revocationStatusList?.handle ?? 0,
       revocationConfiguration?.ref().address() ?? 0,
       credentialPtr
     )

wrappers/javascript/anoncreds-nodejs/src/ffi/structures.ts

@@ -50,6 +50,7 @@ export const I32ListStruct = CStruct({
 export const CredRevInfoStruct = CStruct({
   reg_def: FFI_OBJECT_HANDLE,
   reg_def_private: FFI_OBJECT_HANDLE,
+  status_list: FFI_OBJECT_HANDLE,
   reg_idx: FFI_INT64,
 })
 

wrappers/javascript/anoncreds-nodejs/src/library/bindings.ts

@@ -31,8 +31,6 @@ export const nativeBindings = {
       StringListStruct,
       StringListStruct,
       StringListStruct,
-      FFI_STRING,
-      FFI_OBJECT_HANDLE,
       FFI_OBJECT_HANDLE,
       FFI_OBJECT_HANDLE_PTR,
     ],

wrappers/javascript/anoncreds-nodejs/test/api.test.ts

@@ -108,11 +108,10 @@ describe('API', () => {
       credentialOffer,
       credentialRequest,
       attributeRawValues: { name: 'Alex', height: '175', age: '28', sex: 'male' },
-      revocationRegistryId: 'mock:uri',
-      revocationStatusList,
       revocationConfiguration: new CredentialRevocationConfig({
         registryDefinition: revocationRegistryDefinition,
         registryDefinitionPrivate: revocationRegistryDefinitionPrivate,
+        statusList: revocationStatusList,
         registryIndex: 9,
       }),
     })
@@ -431,11 +430,10 @@ test('create and verify presentation passing only JSON objects as parameters', (
     credentialOffer: credentialOffer.toJson(),
     credentialRequest: credentialRequest.toJson(),
     attributeRawValues: { name: 'Alex', height: '175', age: '28', sex: 'male' },
-    revocationRegistryId: 'mock:uri',
-    revocationStatusList: revocationStatusList.toJson(),
     revocationConfiguration: new CredentialRevocationConfig({
       registryDefinition: revocationRegistryDefinition,
       registryDefinitionPrivate: revocationRegistryDefinitionPrivate,
+      statusList: revocationStatusList,
       registryIndex: 9,
     }),
   })

wrappers/javascript/anoncreds-nodejs/test/bindings.test.ts

@@ -292,11 +292,10 @@ describe('bindings', () => {
       credentialOffer,
       credentialRequest,
       attributeRawValues: { 'attr-1': 'test' },
-      revocationRegistryId: 'mock:uri',
-      revocationStatusList,
       revocationConfiguration: {
         revocationRegistryDefinition,
         revocationRegistryDefinitionPrivate,
+        revocationStatusList,
         registryIndex: 9,
       },
     })
@@ -428,11 +427,10 @@ describe('bindings', () => {
       credentialOffer,
       credentialRequest,
       attributeRawValues: { name: 'Alex', height: '175', age: '28', sex: 'male' },
-      revocationRegistryId: 'mock:uri',
-      revocationStatusList,
       revocationConfiguration: {
         revocationRegistryDefinition,
         revocationRegistryDefinitionPrivate,
+        revocationStatusList,
         registryIndex: 9,
       },
     })

wrappers/javascript/anoncreds-react-native/cpp/anoncreds.cpp

@@ -465,10 +465,6 @@ jsi::Value createCredential(jsi::Runtime &rt, jsi::Object options) {
       jsiToValue<FfiStrList>(rt, options, "attributeRawValues");
   auto attributeEncodedValues =
       jsiToValue<FfiStrList>(rt, options, "attributeEncodedValues", true);
-  auto revocationRegistryId =
-      jsiToValue<std::string>(rt, options, "revocationRegistryId", true);
-  auto revocationStatusList =
-      jsiToValue<ObjectHandle>(rt, options, "revocationStatusList", true);
   auto revocation =
       jsiToValue<FfiCredRevInfo>(rt, options, "revocationConfiguration", true);
 
@@ -477,10 +473,7 @@ jsi::Value createCredential(jsi::Runtime &rt, jsi::Object options) {
   ErrorCode code = anoncreds_create_credential(
       credentialDefinition, credentialDefinitionPrivate, credentialOffer,
       credentialRequest, attributeNames, attributeRawValues,
-      attributeEncodedValues,
-      revocationRegistryId.length() > 0 ? revocationRegistryId.c_str()
-                                        : nullptr,
-      revocationStatusList, revocation.reg_def ? &revocation : 0, &out);
+      attributeEncodedValues, revocation.reg_def ? &revocation : 0, &out);
 
   return createReturnValue(rt, code, &out);
 };

wrappers/javascript/anoncreds-react-native/cpp/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);
 

wrappers/javascript/anoncreds-react-native/src/NativeBindings.ts

@@ -59,12 +59,11 @@ export interface NativeBindings {
     attributeNames: string[]
     attributeRawValues: string[]
     attributeEncodedValues?: string[]
-    revocationRegistryId?: string
-    revocationStatusList?: number
     revocationConfiguration?: {
       registryIndex: number
       revocationRegistryDefinition: number
       revocationRegistryDefinitionPrivate: number
+      revocationStatusList?: number
     }
   }): ReturnObject<Handle>
   encodeCredentialAttributes(options: { attributeRawValues: Array<string> }): ReturnObject<string>

wrappers/javascript/anoncreds-react-native/src/ReactNativeAnoncreds.ts

@@ -120,8 +120,6 @@ export class ReactNativeAnoncreds implements Anoncreds {
     credentialRequest: ObjectHandle
     attributeRawValues: Record<string, string>
     attributeEncodedValues?: Record<string, string>
-    revocationRegistryId?: string
-    revocationStatusList?: ObjectHandle
     revocationConfiguration?: NativeCredentialRevocationConfig
   }): ObjectHandle {
     const attributeNames = Object.keys(options.attributeRawValues)
@@ -142,6 +140,7 @@ export class ReactNativeAnoncreds implements Anoncreds {
               revocationRegistryDefinition: options.revocationConfiguration.revocationRegistryDefinition.handle,
               revocationRegistryDefinitionPrivate:
                 options.revocationConfiguration.revocationRegistryDefinitionPrivate.handle,
+              revocationStatusList: options.revocationConfiguration.revocationStatusList.handle,
             }
           : undefined,
       })

wrappers/javascript/anoncreds-shared/src/Anoncreds.ts

@@ -31,6 +31,7 @@ export type NativeRevocationEntry = {
 export type NativeCredentialRevocationConfig = {
   revocationRegistryDefinition: ObjectHandle
   revocationRegistryDefinitionPrivate: ObjectHandle
+  revocationStatusList: ObjectHandle
   registryIndex: number
 }
 
@@ -64,8 +65,6 @@ export interface Anoncreds {
     credentialRequest: ObjectHandle
     attributeRawValues: Record<string, string>
     attributeEncodedValues?: Record<string, string>
-    revocationRegistryId?: string
-    revocationStatusList?: ObjectHandle
     revocationConfiguration?: NativeCredentialRevocationConfig
   }): ObjectHandle
 

wrappers/javascript/anoncreds-shared/src/api/Credential.ts

@@ -1,6 +1,7 @@
 import type { ObjectHandle } from '../ObjectHandle'
 import type { JsonObject } from '../types'
 import type { CredentialRevocationConfig } from './CredentialRevocationConfig'
+import type { RevocationStatusList } from './RevocationStatusList'
 
 import { AnoncredsObject } from '../AnoncredsObject'
 import { anoncreds } from '../register'
@@ -11,7 +12,6 @@ import { CredentialOffer } from './CredentialOffer'
 import { CredentialRequest } from './CredentialRequest'
 import { CredentialRequestMetadata } from './CredentialRequestMetadata'
 import { RevocationRegistryDefinition } from './RevocationRegistryDefinition'
-import { RevocationStatusList } from './RevocationStatusList'
 import { pushToArray } from './utils'
 
 export type CreateCredentialOptions = {
@@ -59,23 +59,14 @@ export class Credential extends AnoncredsObject {
           ? options.credentialRequest.handle
           : pushToArray(CredentialRequest.fromJson(options.credentialRequest).handle, objectHandles)
 
-      const revocationStatusList =
-        options.revocationStatusList instanceof RevocationStatusList
-          ? options.revocationStatusList.handle
-          : options.revocationStatusList !== undefined
-          ? pushToArray(RevocationStatusList.fromJson(options.revocationStatusList).handle, objectHandles)
-          : undefined
-
       credential = anoncreds.createCredential({
         credentialDefinition,
         credentialDefinitionPrivate,
         credentialOffer,
         credentialRequest,
         attributeRawValues: options.attributeRawValues,
         attributeEncodedValues: options.attributeEncodedValues,
-        revocationRegistryId: options.revocationRegistryId,
         revocationConfiguration: options.revocationConfiguration?.native,
-        revocationStatusList,
       })
     } finally {
       objectHandles.forEach((handle) => handle.clear())

wrappers/javascript/anoncreds-shared/src/api/CredentialRevocationConfig.ts

@@ -1,21 +1,25 @@
 import type { NativeCredentialRevocationConfig } from '../Anoncreds'
 import type { RevocationRegistryDefinition } from './RevocationRegistryDefinition'
 import type { RevocationRegistryDefinitionPrivate } from './RevocationRegistryDefinitionPrivate'
+import type { RevocationStatusList } from './RevocationStatusList'
 
 export type CredentialRevocationConfigOptions = {
   registryDefinition: RevocationRegistryDefinition
   registryDefinitionPrivate: RevocationRegistryDefinitionPrivate
+  statusList: RevocationStatusList
   registryIndex: number
 }
 
 export class CredentialRevocationConfig {
   private registryDefinition: RevocationRegistryDefinition
   private registryDefinitionPrivate: RevocationRegistryDefinitionPrivate
+  private statusList: RevocationStatusList
   private registryIndex: number
 
   public constructor(options: CredentialRevocationConfigOptions) {
     this.registryDefinition = options.registryDefinition
     this.registryDefinitionPrivate = options.registryDefinitionPrivate
+    this.statusList = options.statusList
     this.registryIndex = options.registryIndex
   }
 
@@ -28,6 +32,7 @@ export class CredentialRevocationConfig {
     return {
       revocationRegistryDefinition: this.registryDefinition.handle,
       revocationRegistryDefinitionPrivate: this.registryDefinitionPrivate.handle,
+      revocationStatusList: this.statusList.handle,
       registryIndex: this.registryIndex,
     }
   }