@hyperledger/anoncreds-nodejs 0.3.5-alpha-20260107085331 → 0.4.0-alpha-20260212142546

package/build/NodeJSAnoncreds.js

@@ -1,56 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeJSAnoncreds = void 0;
-const util_1 = require("util");
+const node_util_1 = require("node:util");
 const anoncreds_shared_1 = require("@hyperledger/anoncreds-shared");
 const ffi_1 = require("./ffi");
 const library_1 = require("./library");
-function handleReturnPointer(returnValue, cleanupCallback) {
-    if (returnValue.address() === 0) {
+function handleReturnPointer(returnValue) {
+    const value = Array.isArray(returnValue) ? returnValue[0] : returnValue;
+    if (value === null || value === undefined) {
         throw anoncreds_shared_1.AnoncredsError.customError({ message: 'Unexpected null pointer' });
     }
-    const ret = returnValue.deref();
-    if (cleanupCallback)
-        cleanupCallback(returnValue);
-    return ret;
+    return value;
 }
 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)();
+        return (0, library_1.getNativeAnonCreds)();
+    }
+    /**
+     * Fetch the error from the native library and throw it as a JS error
+     *
+     * NOTE:
+     * Checks whether the error code of the returned error matches the error code that was passed to the function.
+     * If it doesn't, we throw an error with the original errorCode, and a custom message explaining we weren't able
+     * to retrieve the error message from the native library. This should however not break functionality as long as
+     * error codes are used rather than error messages for error handling.
+     *
+     */
+    getAnoncredsError(errorCode) {
+        const error = this.getCurrentError();
+        if (error.code !== errorCode) {
+            return new anoncreds_shared_1.AnoncredsError({
+                code: errorCode,
+                message: 'Error details have already been overwritten on the native side, unable to retrieve error message for the error',
+            });
+        }
+        return new anoncreds_shared_1.AnoncredsError(error);
+    }
+    getCurrentError() {
+        const error = (0, ffi_1.allocateStringBuffer)();
+        this.nativeAnoncreds.anoncreds_get_current_error(error);
+        const serializedError = handleReturnPointer(error);
+        return JSON.parse(serializedError);
+    }
+    handleError(errorCode) {
+        if (errorCode === 0)
+            return;
+        throw this.getAnoncredsError(errorCode);
     }
     generateNonce() {
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_generate_nonce(ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_generate_nonce(ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     createSchema(options) {
         const { name, version, issuerId, attributeNames } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_schema(name, version, issuerId, attributeNames, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_schema(name, version, issuerId, attributeNames, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     revocationRegistryDefinitionGetAttribute(options) {
         const { objectHandle, name } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_revocation_registry_definition_get_attribute(objectHandle, name, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_revocation_registry_definition_get_attribute(objectHandle, name, ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     credentialGetAttribute(options) {
         const { objectHandle, name } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_credential_get_attribute(objectHandle, name, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_credential_get_attribute(objectHandle, name, ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     createCredentialDefinition(options) {
@@ -58,8 +79,8 @@ class NodeJSAnoncreds {
         const credentialDefinitionPtr = (0, ffi_1.allocatePointer)();
         const credentialDefinitionPrivatePtr = (0, ffi_1.allocatePointer)();
         const keyCorrectnessProofPtr = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_credential_definition(schemaId, schema, tag, issuerId, signatureType, supportRevocation, credentialDefinitionPtr, credentialDefinitionPrivatePtr, keyCorrectnessProofPtr);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_credential_definition(schemaId, schema, tag, issuerId, signatureType, supportRevocation, credentialDefinitionPtr, credentialDefinitionPrivatePtr, keyCorrectnessProofPtr);
+        this.handleError(errorCode);
         return {
             credentialDefinition: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialDefinitionPtr)),
             credentialDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialDefinitionPrivatePtr)),
@@ -67,22 +88,41 @@ class NodeJSAnoncreds {
         };
     }
     createCredential(options) {
-        var _a;
         const { credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest } = (0, ffi_1.serializeArguments)(options);
-        const attributeNames = this.convertAttributeNames(options.attributeRawValues);
-        const attributeRawValues = this.convertAttributeRawValues(options.attributeRawValues);
-        const attributeEncodedValues = this.convertAttributeEncodedValues(options.attributeEncodedValues);
-        const revocationConfiguration = this.convertRevocationConfiguration(options.revocationConfiguration);
+        const attributeNames = {
+            count: Object.keys(options.attributeRawValues).length,
+            data: Object.keys(options.attributeRawValues),
+        };
+        const attributeRawValues = {
+            count: Object.keys(options.attributeRawValues).length,
+            data: Object.values(options.attributeRawValues),
+        };
+        const attributeEncodedValues = options.attributeEncodedValues
+            ? {
+                count: Object.keys(options.attributeEncodedValues).length,
+                data: Object.values(options.attributeEncodedValues),
+            }
+            : {};
+        let revocationConfiguration = null;
+        if (options.revocationConfiguration) {
+            const { revocationStatusList, revocationRegistryDefinitionPrivate, revocationRegistryDefinition, registryIndex } = (0, ffi_1.serializeArguments)(options.revocationConfiguration);
+            revocationConfiguration = {
+                reg_def: revocationRegistryDefinition,
+                reg_def_private: revocationRegistryDefinitionPrivate,
+                status_list: revocationStatusList,
+                reg_idx: registryIndex,
+            };
+        }
         const credentialPtr = (0, ffi_1.allocatePointer)();
-        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();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_credential(credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, attributeNames, attributeRawValues, attributeEncodedValues, revocationConfiguration, credentialPtr);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialPtr));
     }
     encodeCredentialAttributes(options) {
         const { attributeRawValues } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_encode_credential_attributes(attributeRawValues, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_encode_credential_attributes(attributeRawValues, ret);
+        this.handleError(errorCode);
         const result = handleReturnPointer(ret);
         return result.split(',');
     }
@@ -90,23 +130,23 @@ class NodeJSAnoncreds {
         var _a, _b;
         const { credential, credentialRequestMetadata, linkSecret, credentialDefinition } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        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();
+        const errorCode = 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(errorCode);
         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)();
-        this.nativeAnoncreds.anoncreds_create_credential_offer(schemaId, credentialDefinitionId, keyCorrectnessProof, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_credential_offer(schemaId, credentialDefinitionId, keyCorrectnessProof, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createCredentialRequest(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)();
-        this.nativeAnoncreds.anoncreds_create_credential_request(entropy, proverDid, credentialDefinition, linkSecret, linkSecretId, credentialOffer, credentialRequestPtr, credentialRequestMetadataPtr);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_credential_request(entropy, proverDid, credentialDefinition, linkSecret, linkSecretId, credentialOffer, credentialRequestPtr, credentialRequestMetadataPtr);
+        this.handleError(errorCode);
         return {
             credentialRequest: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialRequestPtr)),
             credentialRequestMetadata: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialRequestMetadataPtr)),
@@ -114,64 +154,64 @@ class NodeJSAnoncreds {
     }
     createLinkSecret() {
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_create_link_secret(ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_link_secret(ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     createPresentation(options) {
         const { presentationRequest, linkSecret } = (0, ffi_1.serializeArguments)(options);
-        const selfAttestNames = (0, ffi_1.StringListStruct)({
+        const selfAttestNames = {
             count: Object.keys(options.selfAttest).length,
             data: Object.keys(options.selfAttest),
-        });
-        const selfAttestValues = (0, ffi_1.StringListStruct)({
+        };
+        const selfAttestValues = {
             count: Object.values(options.selfAttest).length,
             data: Object.values(options.selfAttest),
-        });
+        };
         const credentialEntryList = this.convertCredentialList(options.credentials);
         const credentialProveList = this.convertCredentialProves(options.credentialsProve);
         const { schemaIds, schemas } = this.convertSchemas(options.schemas);
         const { credentialDefinitionIds, credentialDefinitions } = this.convertCredDefs(options.credentialDefinitions);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_presentation(presentationRequest, credentialEntryList, credentialProveList, selfAttestNames, selfAttestValues, linkSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_presentation(presentationRequest, credentialEntryList, credentialProveList, selfAttestNames, selfAttestValues, linkSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     verifyPresentation(options) {
         const { presentation, presentationRequest, schemas, credentialDefinitions, revocationRegistryDefinitions, revocationStatusLists, revocationRegistryDefinitionIds, schemaIds, credentialDefinitionIds, } = (0, ffi_1.serializeArguments)(options);
         const nonRevokedIntervalOverrideList = this.convertNonRevokedIntervalOverrides(options.nonRevokedIntervalOverrides);
         const ret = (0, ffi_1.allocateInt8Buffer)();
-        this.nativeAnoncreds.anoncreds_verify_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions, revocationRegistryDefinitionIds, revocationStatusLists, nonRevokedIntervalOverrideList, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_verify_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions !== null && revocationRegistryDefinitions !== void 0 ? revocationRegistryDefinitions : {}, revocationRegistryDefinitionIds !== null && revocationRegistryDefinitionIds !== void 0 ? revocationRegistryDefinitionIds : {}, revocationStatusLists !== null && revocationStatusLists !== void 0 ? revocationStatusLists : {}, nonRevokedIntervalOverrideList, ret);
+        this.handleError(errorCode);
         return Boolean(handleReturnPointer(ret));
     }
     createRevocationStatusList(options) {
         const { credentialDefinition, revocationRegistryDefinitionId, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, issuerId, issuanceByDefault, timestamp, } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_revocation_status_list(credentialDefinition, revocationRegistryDefinitionId, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, issuerId, issuanceByDefault, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_revocation_status_list(credentialDefinition, revocationRegistryDefinitionId, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, issuerId, issuanceByDefault, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     updateRevocationStatusListTimestampOnly(options) {
         const { currentRevocationStatusList, timestamp } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_update_revocation_status_list_timestamp_only(timestamp, currentRevocationStatusList, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_update_revocation_status_list_timestamp_only(timestamp, currentRevocationStatusList, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     updateRevocationStatusList(options) {
         const { credentialDefinition, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, currentRevocationStatusList, issued, revoked, timestamp, } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_update_revocation_status_list(credentialDefinition, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, currentRevocationStatusList, issued, revoked, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_update_revocation_status_list(credentialDefinition, revocationRegistryDefinition, revocationRegistryDefinitionPrivate, currentRevocationStatusList, issued !== null && issued !== void 0 ? issued : {}, revoked !== null && revoked !== void 0 ? revoked : {}, timestamp !== null && timestamp !== void 0 ? timestamp : -1, ret);
+        this.handleError(errorCode);
         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)();
-        this.nativeAnoncreds.anoncreds_create_revocation_registry_def(credentialDefinition, credentialDefinitionId, issuerId, tag, revocationRegistryType, maximumCredentialNumber, tailsDirectoryPath, revocationRegistryDefinitionPtr, revocationRegistryDefinitionPrivate);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_revocation_registry_def(credentialDefinition, credentialDefinitionId, issuerId, tag, revocationRegistryType, maximumCredentialNumber, tailsDirectoryPath, revocationRegistryDefinitionPtr, revocationRegistryDefinitionPrivate);
+        this.handleError(errorCode);
         return {
             revocationRegistryDefinition: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(revocationRegistryDefinitionPtr)),
             revocationRegistryDefinitionPrivate: new anoncreds_shared_1.ObjectHandle(handleReturnPointer(revocationRegistryDefinitionPrivate)),
@@ -183,27 +223,26 @@ class NodeJSAnoncreds {
         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)();
-        this.nativeAnoncreds.anoncreds_create_or_update_revocation_state(revocationRegistryDefinition, revocationStatusList, revocationRegistryIndex, tailsPath, oldRevocationState.handle, oldRevocationStatusList.handle, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_or_update_revocation_state(revocationRegistryDefinition, revocationStatusList, revocationRegistryIndex, tailsPath, oldRevocationState.handle, oldRevocationStatusList.handle, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createW3cCredential(options) {
-        var _a;
         const { credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, w3cVersion } = (0, ffi_1.serializeArguments)(options);
         const attributeNames = this.convertAttributeNames(options.attributeRawValues);
         const attributeRawValues = this.convertAttributeRawValues(options.attributeRawValues);
         const revocationConfiguration = this.convertRevocationConfiguration(options.revocationConfiguration);
         const credentialPtr = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_w3c_credential(credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, attributeNames, attributeRawValues, (_a = revocationConfiguration === null || revocationConfiguration === void 0 ? void 0 : revocationConfiguration.ref().address()) !== null && _a !== void 0 ? _a : 0, w3cVersion, credentialPtr);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_w3c_credential(credentialDefinition, credentialDefinitionPrivate, credentialOffer, credentialRequest, attributeNames, attributeRawValues, revocationConfiguration !== null && revocationConfiguration !== void 0 ? revocationConfiguration : 0, w3cVersion, credentialPtr);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(credentialPtr));
     }
     processW3cCredential(options) {
         var _a, _b;
         const { credential, credentialRequestMetadata, linkSecret, credentialDefinition } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_process_w3c_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();
+        const errorCode = this.nativeAnoncreds.anoncreds_process_w3c_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(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     createW3cPresentation(options) {
@@ -213,44 +252,44 @@ class NodeJSAnoncreds {
         const { schemaIds, schemas } = this.convertSchemas(options.schemas);
         const { credentialDefinitionIds, credentialDefinitions } = this.convertCredDefs(options.credentialDefinitions);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_create_w3c_presentation(presentationRequest, credentialEntryList, credentialProveList, linkSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, w3cVersion, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_create_w3c_presentation(presentationRequest, credentialEntryList, credentialProveList, linkSecret, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, w3cVersion, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     verifyW3cPresentation(options) {
         const { presentation, presentationRequest, schemas, credentialDefinitions, revocationRegistryDefinitions, revocationStatusLists, revocationRegistryDefinitionIds, schemaIds, credentialDefinitionIds, } = (0, ffi_1.serializeArguments)(options);
         const nonRevokedIntervalOverrideList = this.convertNonRevokedIntervalOverrides(options.nonRevokedIntervalOverrides);
         const ret = (0, ffi_1.allocateInt8Buffer)();
-        this.nativeAnoncreds.anoncreds_verify_w3c_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions, revocationRegistryDefinitionIds, revocationStatusLists, nonRevokedIntervalOverrideList, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_verify_w3c_presentation(presentation, presentationRequest, schemas, schemaIds, credentialDefinitions, credentialDefinitionIds, revocationRegistryDefinitions !== null && revocationRegistryDefinitions !== void 0 ? revocationRegistryDefinitions : {}, revocationRegistryDefinitionIds !== null && revocationRegistryDefinitionIds !== void 0 ? revocationRegistryDefinitionIds : {}, revocationStatusLists !== null && revocationStatusLists !== void 0 ? revocationStatusLists : {}, nonRevokedIntervalOverrideList, ret);
+        this.handleError(errorCode);
         return Boolean(handleReturnPointer(ret));
     }
     credentialToW3c(options) {
         const { objectHandle, issuerId, w3cVersion } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_credential_to_w3c(objectHandle, issuerId, w3cVersion, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_credential_to_w3c(objectHandle, issuerId, w3cVersion, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     credentialFromW3c(options) {
         const { objectHandle } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_credential_from_w3c(objectHandle, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_credential_from_w3c(objectHandle, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     w3cCredentialGetIntegrityProofDetails(options) {
         const { objectHandle } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocatePointer)();
-        this.nativeAnoncreds.anoncreds_w3c_credential_get_integrity_proof_details(objectHandle, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_w3c_credential_get_integrity_proof_details(objectHandle, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     w3cCredentialProofGetAttribute(options) {
         const { objectHandle, name } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_w3c_credential_proof_get_attribute(objectHandle, name, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_w3c_credential_proof_get_attribute(objectHandle, name, ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     w3cCredentialFromJson(options) {
@@ -263,21 +302,14 @@ class NodeJSAnoncreds {
         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)();
-        this.nativeAnoncreds.anoncreds_get_current_error(ret);
-        this.handleError();
-        return handleReturnPointer(ret);
+        const errorCode = this.nativeAnoncreds.anoncreds_set_default_logger();
+        this.handleError(errorCode);
     }
-    objectFromJson(method, options) {
+    objectFromJson(cb, options) {
         const ret = (0, ffi_1.allocatePointer)();
-        const byteBuffer = anoncreds_shared_1.ByteBuffer.fromUint8Array(new util_1.TextEncoder().encode(options.json));
-        this.handleError();
-        method(byteBuffer, ret);
+        const byteBuffer = new node_util_1.TextEncoder().encode(options.json);
+        const errorCode = cb({ data: byteBuffer, len: byteBuffer.length }, ret);
+        this.handleError(errorCode);
         return new anoncreds_shared_1.ObjectHandle(handleReturnPointer(ret));
     }
     presentationRequestFromJson(options) {
@@ -326,78 +358,76 @@ class NodeJSAnoncreds {
         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);
-        this.nativeAnoncreds.anoncreds_object_get_json(objectHandle, ret);
-        this.handleError();
+        const ret = (0, ffi_1.allocateByteBuffer)();
+        const errorCode = this.nativeAnoncreds.anoncreds_object_get_json(objectHandle, ret);
+        this.handleError(errorCode);
         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);
+        const jsonAsArray = (0, ffi_1.byteBufferToUint8Array)(returnValue);
+        const output = new node_util_1.TextDecoder().decode(jsonAsArray);
+        this.nativeAnoncreds.anoncreds_buffer_free(returnValue);
         return output;
     }
     getTypeName(options) {
         const { objectHandle } = (0, ffi_1.serializeArguments)(options);
         const ret = (0, ffi_1.allocateStringBuffer)();
-        this.nativeAnoncreds.anoncreds_object_get_type_name(objectHandle, ret);
-        this.handleError();
+        const errorCode = this.nativeAnoncreds.anoncreds_object_get_type_name(objectHandle, ret);
+        this.handleError(errorCode);
         return handleReturnPointer(ret);
     }
     objectFree(options) {
         this.nativeAnoncreds.anoncreds_object_free(options.objectHandle.handle);
-        this.handleError();
     }
     convertCredentialList(credentials) {
         const credentialEntries = credentials.map((value) => {
             var _a, _b, _c;
-            return (0, ffi_1.CredentialEntryStruct)({
+            return ({
                 credential: value.credential.handle,
                 timestamp: (_a = value.timestamp) !== null && _a !== void 0 ? _a : -1,
                 rev_state: (_c = (_b = value.revocationState) === null || _b === void 0 ? void 0 : _b.handle) !== null && _c !== void 0 ? _c : 0,
             });
         });
-        return (0, ffi_1.CredentialEntryListStruct)({
+        return {
             count: credentialEntries.length,
             data: credentialEntries,
-        });
+        };
     }
     convertCredentialProves(credentialsProve) {
         const credentialProves = credentialsProve.map((value) => {
             const { entryIndex: entry_idx, isPredicate: is_predicate, reveal, referent } = (0, ffi_1.serializeArguments)(value);
-            return (0, ffi_1.CredentialProveStruct)({ entry_idx, referent, is_predicate, reveal });
+            return { entry_idx, referent, is_predicate, reveal };
         });
-        return (0, ffi_1.CredentialProveListStruct)({
+        return {
             count: credentialProves.length,
             data: credentialProves,
-        });
+        };
     }
     convertSchemas(schemas) {
         const schemaKeys = Object.keys(schemas);
-        const schemaIds = (0, ffi_1.StringListStruct)({
+        const schemaIds = {
             count: schemaKeys.length,
             data: schemaKeys,
-        });
+        };
         const schemaValues = Object.values(schemas);
-        const schemasList = (0, ffi_1.ObjectHandleListStruct)({
-            count: schemaValues.length,
-            data: (0, ffi_1.ObjectHandleArray)(schemaValues.map((o) => o.handle)),
-        });
         return {
             schemaIds,
-            schemas: schemasList,
+            schemas: {
+                count: schemaValues.length,
+                data: schemaValues.map((o) => o.handle),
+            },
         };
     }
     convertCredDefs(credentialDefinitions) {
         const credentialDefinitionKeys = Object.keys(credentialDefinitions);
-        const credentialDefinitionIds = (0, ffi_1.StringListStruct)({
+        const credentialDefinitionIds = {
             count: credentialDefinitionKeys.length,
             data: credentialDefinitionKeys,
-        });
+        };
         const credentialDefinitionValues = Object.values(credentialDefinitions);
-        const credentialDefinitionsList = (0, ffi_1.ObjectHandleListStruct)({
+        const credentialDefinitionsList = {
             count: credentialDefinitionValues.length,
-            data: (0, ffi_1.ObjectHandleArray)(credentialDefinitionValues.map((o) => o.handle)),
-        });
+            data: credentialDefinitionValues.map((o) => o.handle),
+        };
         return {
             credentialDefinitionIds,
             credentialDefinitions: credentialDefinitionsList,
@@ -407,46 +437,46 @@ class NodeJSAnoncreds {
         var _a;
         const nativeNonRevokedIntervalOverrides = nonRevokedIntervalOverrides === null || nonRevokedIntervalOverrides === void 0 ? void 0 : nonRevokedIntervalOverrides.map((value) => {
             const { requestedFromTimestamp, revocationRegistryDefinitionId, overrideRevocationStatusListTimestamp } = (0, ffi_1.serializeArguments)(value);
-            return (0, ffi_1.NonRevokedIntervalOverrideStruct)({
+            return {
                 rev_reg_def_id: revocationRegistryDefinitionId,
                 requested_from_ts: requestedFromTimestamp,
                 override_rev_status_list_ts: overrideRevocationStatusListTimestamp,
-            });
+            };
         });
-        return (0, ffi_1.NonRevokedIntervalOverrideListStruct)({
+        return {
             count: (_a = nonRevokedIntervalOverrides === null || nonRevokedIntervalOverrides === void 0 ? void 0 : nonRevokedIntervalOverrides.length) !== null && _a !== void 0 ? _a : 0,
             data: nativeNonRevokedIntervalOverrides,
-        });
+        };
     }
     convertAttributeNames(attributeRawValues) {
-        return (0, ffi_1.StringListStruct)({
+        return {
             count: Object.keys(attributeRawValues).length,
             data: Object.keys(attributeRawValues),
-        });
+        };
     }
     convertAttributeRawValues(attributeRawValues) {
-        return (0, ffi_1.StringListStruct)({
+        return {
             count: Object.keys(attributeRawValues).length,
             data: Object.values(attributeRawValues),
-        });
+        };
     }
     convertAttributeEncodedValues(attributeEncodedValues) {
         return attributeEncodedValues
-            ? (0, ffi_1.StringListStruct)({
+            ? {
                 count: Object.keys(attributeEncodedValues).length,
                 data: Object.values(attributeEncodedValues),
-            })
+            }
             : undefined;
     }
     convertRevocationConfiguration(revocationConfiguration) {
         if (revocationConfiguration) {
             const { revocationRegistryDefinition, revocationRegistryDefinitionPrivate, revocationStatusList, registryIndex } = (0, ffi_1.serializeArguments)(revocationConfiguration);
-            return (0, ffi_1.CredRevInfoStruct)({
+            return {
                 reg_def: revocationRegistryDefinition,
                 reg_def_private: revocationRegistryDefinitionPrivate,
                 status_list: revocationStatusList,
                 reg_idx: registryIndex,
-            });
+            };
         }
     }
 }