@hyperledger/anoncreds-nodejs 0.1.0-dev.9 → 0.2.0-dev.1

package/README.md

@@ -4,8 +4,7 @@ Wrapper for Nodejs around anoncreds-rs
 
 ## Requirements
 
-This has been tested extensively with Nodejs version `16.11.0` and `16.15.0`.
-Older and newer versions might also work, but they have not been tested.
+This library requires (and has been tested extensively with) Node.js version 18.x. Newer versions might also work, but they have not been tested.
 
 ## Installation
 

package/build/NodeJSAnoncreds.d.ts

@@ -1,6 +1,50 @@
 import type { NativeCredentialEntry, NativeCredentialProve, Anoncreds, NativeCredentialRevocationConfig, NativeNonRevokedIntervalOverride } from '@hyperledger/anoncreds-shared';
 import { ObjectHandle } from '@hyperledger/anoncreds-shared';
 export declare class NodeJSAnoncreds implements Anoncreds {
+    private handleError;
+    get nativeAnoncreds(): {
+        anoncreds_buffer_free: (args_0: Buffer) => unknown;
+        anoncreds_create_credential: (args_0: number, args_1: number, args_2: number, args_3: number, args_4: Buffer, args_5: Buffer, args_6: Buffer, args_7: number, args_8: Buffer) => unknown;
+        anoncreds_create_credential_definition: (args_0: string, args_1: number, args_2: string, args_3: string, args_4: string, args_5: number, args_6: Buffer, args_7: Buffer, args_8: Buffer) => unknown;
+        anoncreds_create_credential_offer: (args_0: string, args_1: string, args_2: number, args_3: Buffer) => unknown;
+        anoncreds_create_credential_request: (args_0: string, args_1: string, args_2: number, args_3: string, args_4: string, args_5: number, args_6: Buffer, args_7: Buffer) => unknown;
+        anoncreds_create_link_secret: (args_0: Buffer) => unknown;
+        anoncreds_create_or_update_revocation_state: (args_0: number, args_1: number, args_2: number, args_3: string, args_4: number, args_5: number, args_6: Buffer) => unknown;
+        anoncreds_create_presentation: (args_0: number, args_1: Buffer, args_2: Buffer, args_3: Buffer, args_4: Buffer, args_5: string, args_6: Buffer, args_7: Buffer, args_8: Buffer, args_9: Buffer, args_10: Buffer) => unknown;
+        anoncreds_create_revocation_registry_def: (args_0: number, args_1: string, args_2: string, args_3: string, args_4: string, args_5: number, args_6: string, args_7: Buffer, args_8: Buffer) => unknown;
+        anoncreds_create_schema: (args_0: string, args_1: string, args_2: string, args_3: Buffer, args_4: Buffer) => unknown;
+        anoncreds_credential_get_attribute: (args_0: number, args_1: string, args_2: Buffer) => unknown;
+        anoncreds_encode_credential_attributes: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_generate_nonce: (args_0: Buffer) => unknown;
+        anoncreds_get_current_error: (args_0: Buffer) => unknown;
+        anoncreds_object_free: (args_0: number) => unknown;
+        anoncreds_string_free: (args_0: Buffer) => unknown;
+        anoncreds_object_get_json: (args_0: number, args_1: Buffer) => unknown;
+        anoncreds_object_get_type_name: (args_0: number, args_1: Buffer) => unknown;
+        anoncreds_presentation_request_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_process_credential: (args_0: number, args_1: number, args_2: string, args_3: number, args_4: number, args_5: Buffer) => unknown;
+        anoncreds_revocation_registry_definition_get_attribute: (args_0: number, args_1: string, args_2: Buffer) => unknown;
+        anoncreds_set_default_logger: () => unknown;
+        anoncreds_verify_presentation: (args_0: number, args_1: number, args_2: Buffer, args_3: Buffer, args_4: Buffer, args_5: Buffer, args_6: Buffer, args_7: Buffer, args_8: Buffer, args_9: Buffer, args_10: Buffer) => unknown;
+        anoncreds_create_revocation_status_list: (args_0: number, args_1: string, args_2: number, args_3: number, args_4: string, args_5: number, args_6: number, args_7: Buffer) => unknown;
+        anoncreds_update_revocation_status_list_timestamp_only: (args_0: number, args_1: number, args_2: Buffer) => unknown;
+        anoncreds_update_revocation_status_list: (args_0: number, args_1: number, args_2: number, args_3: number, args_4: Buffer, args_5: Buffer, args_6: number, args_7: Buffer) => unknown;
+        anoncreds_version: () => string;
+        anoncreds_credential_request_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_credential_request_metadata_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_presentation_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_credential_offer_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_revocation_registry_definition_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_revocation_registry_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_revocation_status_list_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_revocation_state_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_credential_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_credential_definition_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_credential_definition_private_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_revocation_registry_definition_private_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_key_correctness_proof_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+        anoncreds_schema_from_json: (args_0: Buffer, args_1: Buffer) => unknown;
+    };
     generateNonce(): string;
     createSchema(options: {
         name: string;
@@ -35,8 +79,6 @@ export declare class NodeJSAnoncreds implements Anoncreds {
         credentialRequest: ObjectHandle;
         attributeRawValues: Record<string, string>;
         attributeEncodedValues?: Record<string, string>;
-        revocationRegistryId?: string;
-        revocationStatusList?: ObjectHandle;
         revocationConfiguration?: NativeCredentialRevocationConfig;
     }): ObjectHandle;
     encodeCredentialAttributes(options: {
@@ -45,7 +87,7 @@ export declare class NodeJSAnoncreds implements Anoncreds {
     processCredential(options: {
         credential: ObjectHandle;
         credentialRequestMetadata: ObjectHandle;
-        masterSecret: ObjectHandle;
+        linkSecret: string;
         credentialDefinition: ObjectHandle;
         revocationRegistryDefinition?: ObjectHandle | undefined;
     }): ObjectHandle;
@@ -58,20 +100,20 @@ export declare class NodeJSAnoncreds implements Anoncreds {
         entropy?: string;
         proverDid?: string;
         credentialDefinition: ObjectHandle;
-        masterSecret: ObjectHandle;
-        masterSecretId: string;
+        linkSecret: string;
+        linkSecretId: string;
         credentialOffer: ObjectHandle;
     }): {
         credentialRequest: ObjectHandle;
         credentialRequestMetadata: ObjectHandle;
     };
-    createMasterSecret(): ObjectHandle;
+    createLinkSecret(): string;
     createPresentation(options: {
         presentationRequest: ObjectHandle;
         credentials: NativeCredentialEntry[];
         credentialsProve: NativeCredentialProve[];
         selfAttest: Record<string, string>;
-        masterSecret: ObjectHandle;
+        linkSecret: string;
         schemas: Record<string, ObjectHandle>;
         credentialDefinitions: Record<string, ObjectHandle>;
     }): ObjectHandle;
@@ -88,22 +130,26 @@ export declare class NodeJSAnoncreds implements Anoncreds {
         nonRevokedIntervalOverrides?: NativeNonRevokedIntervalOverride[];
     }): boolean;
     createRevocationStatusList(options: {
+        credentialDefinition: ObjectHandle;
         revocationRegistryDefinitionId: string;
         revocationRegistryDefinition: ObjectHandle;
+        revocationRegistryDefinitionPrivate: ObjectHandle;
         issuerId: string;
-        timestamp?: number;
         issuanceByDefault: boolean;
+        timestamp?: number;
     }): ObjectHandle;
     updateRevocationStatusListTimestampOnly(options: {
         timestamp: number;
         currentRevocationStatusList: ObjectHandle;
     }): ObjectHandle;
     updateRevocationStatusList(options: {
-        timestamp?: number;
-        issued?: number[];
-        revoked?: number[];
+        credentialDefinition: ObjectHandle;
         revocationRegistryDefinition: ObjectHandle;
+        revocationRegistryDefinitionPrivate: ObjectHandle;
         currentRevocationStatusList: ObjectHandle;
+        issued?: number[];
+        revoked?: number[];
+        timestamp?: number;
     }): ObjectHandle;
     createRevocationRegistryDefinition(options: {
         credentialDefinition: ObjectHandle;
@@ -122,18 +168,16 @@ export declare class NodeJSAnoncreds implements Anoncreds {
         revocationStatusList: ObjectHandle;
         revocationRegistryIndex: number;
         tailsPath: string;
-        previousRevocationStatusList?: ObjectHandle;
-        previousRevocationState?: ObjectHandle;
+        oldRevocationState?: ObjectHandle;
+        oldRevocationStatusList?: ObjectHandle;
     }): ObjectHandle;
     version(): string;
+    setDefaultLogger(): void;
     getCurrentError(): string;
     private objectFromJson;
     presentationRequestFromJson(options: {
         json: string;
     }): ObjectHandle;
-    masterSecretFromJson(options: {
-        json: string;
-    }): ObjectHandle;
     credentialRequestFromJson(options: {
         json: string;
     }): ObjectHandle;
@@ -146,6 +190,9 @@ export declare class NodeJSAnoncreds implements Anoncreds {
     revocationRegistryFromJson(options: {
         json: string;
     }): ObjectHandle;
+    revocationStatusListFromJson(options: {
+        json: string;
+    }): ObjectHandle;
     revocationStateFromJson(options: {
         json: string;
     }): ObjectHandle;
@@ -164,9 +211,6 @@ export declare class NodeJSAnoncreds implements Anoncreds {
     revocationRegistryDefinitionPrivateFromJson(options: {
         json: string;
     }): ObjectHandle;
-    revocationRegistryDeltaFromJson(options: {
-        json: string;
-    }): ObjectHandle;
     credentialDefinitionFromJson(options: {
         json: string;
     }): ObjectHandle;

package/build/NodeJSAnoncreds.js

@@ -3,53 +3,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeJSAnoncreds = void 0;
 const anoncreds_shared_1 = require("@hyperledger/anoncreds-shared");
 const util_1 = require("util");
-const error_1 = require("./error");
 const ffi_1 = require("./ffi");
 const library_1 = require("./library");
+function handleReturnPointer(returnValue, cleanupCallback) {
+    if (returnValue.address() === 0) {
+        throw anoncreds_shared_1.AnoncredsError.customError({ message: 'Unexpected null pointer' });
+    }
+    const ret = returnValue.deref();
+    if (cleanupCallback)
+        cleanupCallback(returnValue);
+    return ret;
+}
 class NodeJSAnoncreds {
+    handleError() {
+        const nativeError = (0, ffi_1.allocateStringBuffer)();
+        (0, library_1.getNativeAnoncreds)().anoncreds_get_current_error(nativeError);
+        const anoncredsErrorObject = JSON.parse(nativeError.deref());
+        if (anoncredsErrorObject.code === 0)
+            return;
+        throw new anoncreds_shared_1.AnoncredsError(anoncredsErrorObject);
+    }
+    get nativeAnoncreds() {
+        return (0, library_1.getNativeAnoncreds)();
+    }
     generateNonce() {
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_generate_nonce(ret);
-        (0, error_1.handleError)();
-        return ret.deref();
+        this.nativeAnoncreds.anoncreds_generate_nonce(ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     createSchema(options) {
         const { name, version, issuerId, attributeNames } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_schema(name, version, issuerId, attributeNames, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_create_schema(name, version, issuerId, attributeNames, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     revocationRegistryDefinitionGetAttribute(options) {
         const { objectHandle, name } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_revocation_registry_definition_get_attribute(objectHandle, name, ret);
-        (0, error_1.handleError)();
-        return ret.deref();
+        this.nativeAnoncreds.anoncreds_revocation_registry_definition_get_attribute(objectHandle, name, ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     credentialGetAttribute(options) {
         const { objectHandle, name } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_credential_get_attribute(objectHandle, name, ret);
-        (0, error_1.handleError)();
-        return ret.deref();
+        this.nativeAnoncreds.anoncreds_credential_get_attribute(objectHandle, name, ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     createCredentialDefinition(options) {
         const { schemaId, issuerId, schema, tag, signatureType, supportRevocation } = (0, ffi_1.serializeArguments)(options);
         const credentialDefinitionPtr = (0, ffi_1.allocatePointer)();
         const credentialDefinitionPrivatePtr = (0, ffi_1.allocatePointer)();
         const keyCorrectnessProofPtr = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_credential_definition(schemaId, schema, tag, issuerId, signatureType, supportRevocation, credentialDefinitionPtr, credentialDefinitionPrivatePtr, keyCorrectnessProofPtr);
-        (0, error_1.handleError)();
+        this.nativeAnoncreds.anoncreds_create_credential_definition(schemaId, schema, tag, issuerId, signatureType, supportRevocation, credentialDefinitionPtr, credentialDefinitionPrivatePtr, keyCorrectnessProofPtr);
+        this.handleError();
         return {
-            credentialDefinition: new anoncreds_shared_1.ObjectHandle(credentialDefinitionPtr.deref()),
-            credentialDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(credentialDefinitionPrivatePtr.deref()),
-            keyCorrectnessProof: new anoncreds_shared_1.ObjectHandle(keyCorrectnessProofPtr.deref()),
+            credentialDefinition: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialDefinitionPtr)),
+            credentialDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialDefinitionPrivatePtr)),
+            keyCorrectnessProof: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(keyCorrectnessProofPtr)),
         };
     }
     createCredential(options) {
-        var _a, _b, _c;
-        const { credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, revocationRegistryId, } = (0, ffi_1.serializeArguments)(options);
+        var _a;
+        const { credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest } = (0, ffi_1.serializeArguments)(options);
         const attributeNames = (0, ffi_1.StringListStruct)({
             count: Object.keys(options.attributeRawValues).length,
             data: Object.keys(options.attributeRawValues),
@@ -66,61 +85,61 @@ class NodeJSAnoncreds {
             : undefined;
         let revocationConfiguration;
         if (options.revocationConfiguration) {
-            const { revocationRegistryDefinition: registryDefinition, revocationRegistryDefinitionPrivate: registryDefinitionPrivate, registryIndex, tailsPath, } = (0, ffi_1.serializeArguments)(options.revocationConfiguration);
+            const { revocationRegistryDefinition, revocationRegistryDefinitionPrivate, revocationStatusList, registryIndex } = (0, ffi_1.serializeArguments)(options.revocationConfiguration);
             revocationConfiguration = (0, ffi_1.CredRevInfoStruct)({
-                reg_def: registryDefinition,
-                reg_def_private: registryDefinitionPrivate,
+                reg_def: revocationRegistryDefinition,
+                reg_def_private: revocationRegistryDefinitionPrivate,
+                status_list: revocationStatusList,
                 reg_idx: registryIndex,
-                tails_path: tailsPath,
             });
         }
         const credentialPtr = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_credential(credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, attributeNames, attributeRawValues, attributeEncodedValues, revocationRegistryId, (_b = (_a = options.revocationStatusList) === null || _a === void 0 ? void 0 : _a.handle) !== null && _b !== void 0 ? _b : 0, (_c = revocationConfiguration === null || revocationConfiguration === void 0 ? void 0 : revocationConfiguration.ref().address()) !== null && _c !== void 0 ? _c : 0, credentialPtr);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(credentialPtr.deref());
+        this.nativeAnoncreds.anoncreds_create_credential(credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, attributeNames, attributeRawValues, attributeEncodedValues, (_a = revocationConfiguration === null || revocationConfiguration === void 0 ? void 0 : revocationConfiguration.ref().address()) !== null && _a !== void 0 ? _a : 0, credentialPtr);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialPtr));
     }
     encodeCredentialAttributes(options) {
         const { attributeRawValues } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_encode_credential_attributes(attributeRawValues, ret);
-        (0, error_1.handleError)();
-        const result = ret.deref();
+        this.nativeAnoncreds.anoncreds_encode_credential_attributes(attributeRawValues, ret);
+        this.handleError();
+        const result = handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
         return result.split(',');
     }
     processCredential(options) {
         var _a, _b;
-        const { credential, credentialRequestMetadata, masterSecret, credentialDefinition } = (0, ffi_1.serializeArguments)(options);
+        const { credential, credentialRequestMetadata, linkSecret, credentialDefinition } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_process_credential(credential, credentialRequestMetadata, masterSecret, credentialDefinition, (_b = (_a = options.revocationRegistryDefinition) === null || _a === void 0 ? void 0 : _a.handle) !== null && _b !== void 0 ? _b : 0, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_process_credential(credential, credentialRequestMetadata, linkSecret, credentialDefinition, (_b = (_a = options.revocationRegistryDefinition) === null || _a === void 0 ? void 0 : _a.handle) !== null && _b !== void 0 ? _b : 0, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createCredentialOffer(options) {
         const { schemaId, credentialDefinitionId, keyCorrectnessProof } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_credential_offer(schemaId, credentialDefinitionId, keyCorrectnessProof, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_create_credential_offer(schemaId, credentialDefinitionId, keyCorrectnessProof, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createCredentialRequest(options) {
-        const { entropy, proverDid, credentialDefinition, masterSecret, masterSecretId, credentialOffer } = (0, ffi_1.serializeArguments)(options);
+        const { entropy, proverDid, credentialDefinition, linkSecret, linkSecretId, credentialOffer } = (0, ffi_1.serializeArguments)(options);
         const credentialRequestPtr = (0, ffi_1.allocatePointer)();
         const credentialRequestMetadataPtr = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_credential_request(entropy, proverDid, credentialDefinition, masterSecret, masterSecretId, credentialOffer, credentialRequestPtr, credentialRequestMetadataPtr);
-        (0, error_1.handleError)();
+        this.nativeAnoncreds.anoncreds_create_credential_request(entropy, proverDid, credentialDefinition, linkSecret, linkSecretId, credentialOffer, credentialRequestPtr, credentialRequestMetadataPtr);
+        this.handleError();
         return {
-            credentialRequest: new anoncreds_shared_1.ObjectHandle(credentialRequestPtr.deref()),
-            credentialRequestMetadata: new anoncreds_shared_1.ObjectHandle(credentialRequestMetadataPtr.deref()),
+            credentialRequest: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialRequestPtr)),
+            credentialRequestMetadata: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialRequestMetadataPtr)),
         };
     }
-    createMasterSecret() {
-        const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_master_secret(ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+    createLinkSecret() {
+        const ret = (0, ffi_1.allocateStringBuffer)();
+        this.nativeAnoncreds.anoncreds_create_link_secret(ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     createPresentation(options) {
-        const { presentationRequest, masterSecret } = (0, ffi_1.serializeArguments)(options);
+        const { presentationRequest, linkSecret } = (0, ffi_1.serializeArguments)(options);
         const credentialEntries = options.credentials.map((value) => {
             var _a, _b, _c;
             return (0, ffi_1.CredentialEntryStruct)({
@@ -170,14 +189,14 @@ class NodeJSAnoncreds {
             data: (0, ffi_1.ObjectHandleArray)(credentialDefinitionValues.map((o) => o.handle)),
         });
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_presentation(presentationRequest, credentialEntryList, credentialProveList, selfAttestNames, selfAttestValues, masterSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_create_presentation(presentationRequest, credentialEntryList, credentialProveList, selfAttestNames, selfAttestValues, linkSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     verifyPresentation(options) {
         var _a, _b, _c;
         const { presentation, presentationRequest, schemas, credentialDefinitions, revocationRegistryDefinitions, revocationStatusLists, revocationRegistryDefinitionIds, schemaIds, credentialDefinitionIds, } = (0, ffi_1.serializeArguments)(options);
-        const nativeNonRevokedIntervalOverride = (_a = options.nonRevokedIntervalOverrides) === null || _a === void 0 ? void 0 : _a.map((value) => {
+        const nativeNonRevokedIntervalOverrides = (_a = options.nonRevokedIntervalOverrides) === null || _a === void 0 ? void 0 : _a.map((value) => {
             const { requestedFromTimestamp, revocationRegistryDefinitionId, overrideRevocationStatusListTimestamp } = (0, ffi_1.serializeArguments)(value);
             return (0, ffi_1.NonRevokedIntervalOverrideStruct)({
                 rev_reg_def_id: revocationRegistryDefinitionId,
@@ -187,138 +206,142 @@ class NodeJSAnoncreds {
         });
         const nonRevokedIntervalOverrideList = (0, ffi_1.NonRevokedIntervalOverrideListStruct)({
             count: (_c = (_b = options.nonRevokedIntervalOverrides) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
-            data: nativeNonRevokedIntervalOverride,
+            data: nativeNonRevokedIntervalOverrides,
         });
         const ret = (0, ffi_1.allocateInt8Buffer)();
-        library_1.nativeAnoncreds.anoncreds_verify_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions, revocationRegistryDefinitionIds, revocationStatusLists, nonRevokedIntervalOverrideList, ret);
-        (0, error_1.handleError)();
-        return Boolean(ret.deref());
+        this.nativeAnoncreds.anoncreds_verify_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions, revocationRegistryDefinitionIds, revocationStatusLists, nonRevokedIntervalOverrideList, ret);
+        this.handleError();
+        return Boolean(handleReturnPointer(ret));
     }
     createRevocationStatusList(options) {
-        const { timestamp, issuanceByDefault, revocationRegistryDefinition, revocationRegistryDefinitionId, issuerId } = (0, ffi_1.serializeArguments)(options);
+        const { credentialDefinition, revocationRegistryDefinitionId, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, issuerId, issuanceByDefault, timestamp, } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_revocation_status_list(revocationRegistryDefinitionId, revocationRegistryDefinition, issuerId, timestamp, issuanceByDefault, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_create_revocation_status_list(credentialDefinition, revocationRegistryDefinitionId, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, issuerId, issuanceByDefault, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     updateRevocationStatusListTimestampOnly(options) {
         const { currentRevocationStatusList, timestamp } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_update_revocation_status_list_timestamp_only(timestamp, currentRevocationStatusList, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_update_revocation_status_list_timestamp_only(timestamp, currentRevocationStatusList, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     updateRevocationStatusList(options) {
-        const { currentRevocationStatusList, timestamp, revocationRegistryDefinition, revoked, issued } = (0, ffi_1.serializeArguments)(options);
+        const { credentialDefinition, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, currentRevocationStatusList, issued, revoked, timestamp, } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_update_revocation_status_list(timestamp, issued, revoked, revocationRegistryDefinition, currentRevocationStatusList, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_update_revocation_status_list(credentialDefinition, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, currentRevocationStatusList, issued, revoked, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createRevocationRegistryDefinition(options) {
         const { credentialDefinition, credentialDefinitionId, tag, revocationRegistryType, issuerId, maximumCredentialNumber, tailsDirectoryPath, } = (0, ffi_1.serializeArguments)(options);
         const revocationRegistryDefinitionPtr = (0, ffi_1.allocatePointer)();
         const revocationRegistryDefinitionPrivate = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_revocation_registry_def(credentialDefinition, credentialDefinitionId, issuerId, tag, revocationRegistryType, maximumCredentialNumber, tailsDirectoryPath, revocationRegistryDefinitionPtr, revocationRegistryDefinitionPrivate);
-        (0, error_1.handleError)();
+        this.nativeAnoncreds.anoncreds_create_revocation_registry_def(credentialDefinition, credentialDefinitionId, issuerId, tag, revocationRegistryType, maximumCredentialNumber, tailsDirectoryPath, revocationRegistryDefinitionPtr, revocationRegistryDefinitionPrivate);
+        this.handleError();
         return {
-            revocationRegistryDefinition: new anoncreds_shared_1.ObjectHandle(revocationRegistryDefinitionPtr.deref()),
-            revocationRegistryDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(revocationRegistryDefinitionPrivate.deref()),
+            revocationRegistryDefinition: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(revocationRegistryDefinitionPtr)),
+            revocationRegistryDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(revocationRegistryDefinitionPrivate)),
         };
     }
     createOrUpdateRevocationState(options) {
         var _a, _b;
         const { revocationRegistryDefinition, revocationStatusList, revocationRegistryIndex, tailsPath } = (0, ffi_1.serializeArguments)(options);
-        const previousRevocationState = (_a = options.previousRevocationState) !== null && _a !== void 0 ? _a : new anoncreds_shared_1.ObjectHandle(0);
-        const previousRevocationStatusList = (_b = options.previousRevocationStatusList) !== null && _b !== void 0 ? _b : new anoncreds_shared_1.ObjectHandle(0);
+        const oldRevocationState = (_a = options.oldRevocationState) !== null && _a !== void 0 ? _a : new anoncreds_shared_1.ObjectHandle(0);
+        const oldRevocationStatusList = (_b = options.oldRevocationStatusList) !== null && _b !== void 0 ? _b : new anoncreds_shared_1.ObjectHandle(0);
         const ret = (0, ffi_1.allocatePointer)();
-        library_1.nativeAnoncreds.anoncreds_create_or_update_revocation_state(revocationRegistryDefinition, revocationStatusList, revocationRegistryIndex, tailsPath, previousRevocationStatusList.handle, previousRevocationState.handle, ret);
-        (0, error_1.handleError)();
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        this.nativeAnoncreds.anoncreds_create_or_update_revocation_state(revocationRegistryDefinition, revocationStatusList, revocationRegistryIndex, tailsPath, oldRevocationState.handle, oldRevocationStatusList.handle, ret);
+        this.handleError();
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     version() {
-        return library_1.nativeAnoncreds.anoncreds_version();
+        return this.nativeAnoncreds.anoncreds_version();
+    }
+    setDefaultLogger() {
+        this.nativeAnoncreds.anoncreds_set_default_logger();
+        this.handleError();
     }
     // This should be called when a function returns a non-zero code
     getCurrentError() {
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_get_current_error(ret);
-        (0, error_1.handleError)();
-        return ret.deref();
+        this.nativeAnoncreds.anoncreds_get_current_error(ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     objectFromJson(method, options) {
         const ret = (0, ffi_1.allocatePointer)();
         const byteBuffer = anoncreds_shared_1.ByteBuffer.fromUint8Array(new util_1.TextEncoder().encode(options.json));
-        (0, error_1.handleError)();
+        this.handleError();
         method(byteBuffer, ret);
-        return new anoncreds_shared_1.ObjectHandle(ret.deref());
+        return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     presentationRequestFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_presentation_request_from_json, options);
-    }
-    masterSecretFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_master_secret_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_presentation_request_from_json, options);
     }
     credentialRequestFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_request_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_request_from_json, options);
     }
     credentialRequestMetadataFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_request_metadata_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_request_metadata_from_json, options);
     }
     revocationRegistryDefinitionFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_revocation_registry_definition_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_revocation_registry_definition_from_json, options);
     }
     revocationRegistryFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_revocation_registry_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_revocation_registry_from_json, options);
+    }
+    revocationStatusListFromJson(options) {
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_revocation_status_list_from_json, options);
     }
     revocationStateFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_revocation_state_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_revocation_state_from_json, options);
     }
     presentationFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_presentation_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_presentation_from_json, options);
     }
     credentialOfferFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_offer_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_offer_from_json, options);
     }
     schemaFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_schema_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_schema_from_json, options);
     }
     credentialFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_from_json, options);
     }
     revocationRegistryDefinitionPrivateFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_revocation_registry_definition_private_from_json, options);
-    }
-    revocationRegistryDeltaFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_revocation_registry_delta_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_revocation_registry_definition_private_from_json, options);
     }
     credentialDefinitionFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_definition_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_definition_from_json, options);
     }
     credentialDefinitionPrivateFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_credential_definition_private_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_credential_definition_private_from_json, options);
     }
     keyCorrectnessProofFromJson(options) {
-        return this.objectFromJson(library_1.nativeAnoncreds.anoncreds_key_correctness_proof_from_json, options);
+        return this.objectFromJson(this.nativeAnoncreds.anoncreds_key_correctness_proof_from_json, options);
     }
     getJson(options) {
         const ret = (0, ffi_1.allocateByteBuffer)();
         const { objectHandle } = (0, ffi_1.serializeArguments)(options);
-        library_1.nativeAnoncreds.anoncreds_object_get_json(objectHandle, ret);
-        (0, error_1.handleError)();
-        const output = new Uint8Array((0, ffi_1.byteBufferToBuffer)(ret.deref()));
-        return new util_1.TextDecoder().decode(output);
+        this.nativeAnoncreds.anoncreds_object_get_json(objectHandle, ret);
+        this.handleError();
+        const returnValue = handleReturnPointer(ret);
+        const jsonAsArray = new Uint8Array((0, ffi_1.byteBufferToBuffer)(returnValue));
+        const output = new util_1.TextDecoder().decode(jsonAsArray);
+        this.nativeAnoncreds.anoncreds_buffer_free(returnValue.data);
+        return output;
     }
     getTypeName(options) {
         const { objectHandle } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        library_1.nativeAnoncreds.anoncreds_object_get_type_name(objectHandle, ret);
-        (0, error_1.handleError)();
-        return ret.deref();
+        this.nativeAnoncreds.anoncreds_object_get_type_name(objectHandle, ret);
+        this.handleError();
+        return handleReturnPointer(ret, this.nativeAnoncreds.anoncreds_string_free);
     }
     objectFree(options) {
-        library_1.nativeAnoncreds.anoncreds_object_free(options.objectHandle.handle);
-        (0, error_1.handleError)();
+        this.nativeAnoncreds.anoncreds_object_free(options.objectHandle.handle);
+        this.handleError();
     }
 }
 exports.NodeJSAnoncreds = NodeJSAnoncreds;