@sphereon/ssi-sdk.vc-status-list 0.34.1-feature.SSISDK.17.bitstring.sl.2 → 0.34.1-feature.SSISDK.17.bitstring.sl.7

package/dist/index.d.cts

@@ -1,10 +1,11 @@
 import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution';
-import { StatusListIndexingDirection, StatusPurpose2021, BitstringStatusPurpose, StatusListType, IIssuer, CredentialProofFormat, StatusListDriverType, StatusListCredential, StatusListCredentialIdMode, ICredentialStatus, OrPromise, ICredential, IVerifiableCredential } from '@sphereon/ssi-types';
+import { StatusListIndexingDirection, StatusPurpose2021, StatusListType, IIssuer, CredentialProofFormat, StatusListDriverType, StatusListCredential, StatusListCredentialIdMode, ICredentialStatus, OrPromise, ICredential, IVerifiableCredential } from '@sphereon/ssi-types';
 import { IPluginMethodMap, IAgentContext, ICredentialIssuer, ICredentialVerifier, IKeyManager, ICredentialPlugin, CredentialPayload } from '@veramo/core';
 import { DataSource } from 'typeorm';
 import { BitsPerStatus } from '@sd-jwt/jwt-status-list';
 import { SdJwtVcPayload } from '@sd-jwt/sd-jwt-vc';
 import { StatusListOpts } from '@sphereon/oid4vci-common';
+import { BitstringStatusPurpose } from '@4sure-tech/vc-bitstring-status-lists';
 import { StatusMethod } from 'credential-status';
 
 declare enum StatusOAuth {
@@ -16,18 +17,7 @@ declare enum Status2021 {
     Valid = 0,
     Invalid = 1
 }
-type BitstringStatus = {
-    status: string;
-    message?: string;
-    [x: string]: any;
-};
-type BitstringStatusResult = BitstringStatus & {
-    index: number;
-    status: string;
-    set: boolean;
-    message?: string;
-    [x: string]: any;
-};
+type BitstringStatus = number;
 type StatusList2021Args = {
     indexingDirection: StatusListIndexingDirection;
     statusPurpose?: StatusPurpose2021;
@@ -38,8 +28,7 @@ type OAuthStatusListArgs = {
 };
 type BitstringStatusListArgs = {
     statusPurpose: BitstringStatusPurpose;
-    statusSize?: number;
-    statusMessage?: Array<BitstringStatus>;
+    bitsPerStatus: number;
     ttl?: number;
     validFrom?: Date;
     validUntil?: Date;
@@ -54,6 +43,7 @@ type BaseCreateNewStatusListArgs = {
     keyRef?: string;
     statusList2021?: StatusList2021Args;
     oauthStatusList?: OAuthStatusListArgs;
+    bitstringStatusList?: BitstringStatusListArgs;
     driverType?: StatusListDriverType;
 };
 type UpdateStatusList2021Args = {
@@ -65,8 +55,7 @@ type UpdateOAuthStatusListArgs = {
 };
 type UpdateBitstringStatusListArgs = {
     statusPurpose: BitstringStatusPurpose;
-    statusSize?: number;
-    statusMessage?: Array<BitstringStatus>;
+    bitsPerStatus: number;
     validFrom?: Date;
     validUntil?: Date;
     ttl?: number;
@@ -74,7 +63,7 @@ type UpdateBitstringStatusListArgs = {
 interface UpdateStatusListFromEncodedListArgs {
     type?: StatusListType;
     statusListIndex: number | string;
-    value: boolean;
+    value: number;
     proofFormat?: CredentialProofFormat;
     keyRef?: string;
     correlationId?: string;
@@ -117,6 +106,7 @@ interface OAuthStatusDetails {
 }
 interface BitstringStatusDetails {
     statusPurpose: BitstringStatusPurpose;
+    bitsPerStatus: number;
     validFrom?: Date;
     validUntil?: Date;
     ttl?: number;
@@ -139,7 +129,7 @@ interface BitstringStatusListEntryCredentialStatus extends ICredentialStatus {
     statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[];
     statusListIndex: string;
     statusListCredential: string;
-    statusSize?: number;
+    bitsPerStatus?: number;
     statusMessage?: Array<BitstringStatus>;
     statusReference?: string | string[];
 }
@@ -167,17 +157,20 @@ interface UpdateStatusListIndexArgs {
     statusListCredential: StatusListCredential;
     statusListIndex: number | string;
     value: number | Status2021 | StatusOAuth | BitstringStatus;
+    bitsPerStatus?: number;
     keyRef?: string;
     expiresAt?: Date;
 }
 interface CheckStatusIndexArgs {
     statusListCredential: StatusListCredential;
     statusListIndex: string | number;
+    bitsPerStatus?: number;
 }
 interface ToStatusListDetailsArgs {
     statusListPayload: StatusListCredential;
     correlationId?: string;
     driverType?: StatusListDriverType;
+    bitsPerStatus?: number;
 }
 /**
  * The interface definition for a plugin that can add statuslist info to a credential
@@ -307,15 +300,17 @@ declare function checkStatusIndexFromStatusListCredential(args: {
     type?: StatusListType | 'StatusList2021Entry' | 'BitstringStatusListEntry';
     id?: string;
     statusListIndex: string | number;
+    bitsPerStatus?: number;
 }): Promise<number | Status2021 | StatusOAuth | BitstringStatus>;
 declare function createNewStatusList(args: CreateNewStatusListFuncArgs, context: IAgentContext<(ICredentialPlugin | any) & IIdentifierResolution>): Promise<StatusListResult>;
 declare function updateStatusIndexFromStatusListCredential(args: UpdateStatusListIndexArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListResult>;
-declare function statusListCredentialToDetails(args: {
+declare function statusListCredentialToDetails({ correlationId, driverType, statusListCredential, bitsPerStatus, }: {
     statusListCredential: StatusListCredential;
     correlationId?: string;
     driverType?: StatusListDriverType;
+    bitsPerStatus?: number;
 }): Promise<StatusListResult>;
 declare function updateStatusListIndexFromEncodedList(args: UpdateStatusListFromEncodedListArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListResult>;
 declare function statusList2021ToVerifiableCredential(args: StatusList2021ToVerifiableCredentialArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListCredential>;
 
-export { type BaseCreateNewStatusListArgs, type BitstringStatus, type BitstringStatusListArgs, type BitstringStatusListEntryCredentialStatus, type BitstringStatusResult, type CheckStatusIndexArgs, type CreateNewStatusListArgs, type CreateNewStatusListFuncArgs, type CreateStatusListArgs, type CredentialWithStatusSupport, type GetStatusListArgs, type IAddStatusToCredentialArgs, type IAddStatusToSdJwtCredentialArgs, type IIssueCredentialStatusOpts, type IRequiredContext, type IRequiredPlugins, type IStatusListPlugin, type OAuthStatusListArgs, type SignedStatusListData, Status2021, type StatusList2021Args, type StatusList2021EntryCredentialStatus, type StatusList2021ToVerifiableCredentialArgs, type StatusListOAuthEntryCredentialStatus, type StatusListResult, StatusOAuth, type ToStatusListDetailsArgs, type UpdateBitstringStatusListArgs, type UpdateOAuthStatusListArgs, type UpdateStatusList2021Args, type UpdateStatusListFromEncodedListArgs, type UpdateStatusListFromStatusListCredentialArgs, type UpdateStatusListIndexArgs, checkStatusForCredential, checkStatusIndexFromStatusListCredential, createNewStatusList, fetchStatusListCredential, simpleCheckStatusFromStatusListUrl, statusList2021ToVerifiableCredential, statusListCredentialToDetails, statusPluginStatusFunction, updateStatusIndexFromStatusListCredential, updateStatusListIndexFromEncodedList, vcLibCheckStatusFunction };
+export { type BaseCreateNewStatusListArgs, type BitstringStatus, type BitstringStatusListArgs, type BitstringStatusListEntryCredentialStatus, type CheckStatusIndexArgs, type CreateNewStatusListArgs, type CreateNewStatusListFuncArgs, type CreateStatusListArgs, type CredentialWithStatusSupport, type GetStatusListArgs, type IAddStatusToCredentialArgs, type IAddStatusToSdJwtCredentialArgs, type IIssueCredentialStatusOpts, type IRequiredContext, type IRequiredPlugins, type IStatusListPlugin, type OAuthStatusListArgs, type SignedStatusListData, Status2021, type StatusList2021Args, type StatusList2021EntryCredentialStatus, type StatusList2021ToVerifiableCredentialArgs, type StatusListOAuthEntryCredentialStatus, type StatusListResult, StatusOAuth, type ToStatusListDetailsArgs, type UpdateBitstringStatusListArgs, type UpdateOAuthStatusListArgs, type UpdateStatusList2021Args, type UpdateStatusListFromEncodedListArgs, type UpdateStatusListFromStatusListCredentialArgs, type UpdateStatusListIndexArgs, checkStatusForCredential, checkStatusIndexFromStatusListCredential, createNewStatusList, fetchStatusListCredential, simpleCheckStatusFromStatusListUrl, statusList2021ToVerifiableCredential, statusListCredentialToDetails, statusPluginStatusFunction, updateStatusIndexFromStatusListCredential, updateStatusListIndexFromEncodedList, vcLibCheckStatusFunction };

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution';
-import { StatusListIndexingDirection, StatusPurpose2021, BitstringStatusPurpose, StatusListType, IIssuer, CredentialProofFormat, StatusListDriverType, StatusListCredential, StatusListCredentialIdMode, ICredentialStatus, OrPromise, ICredential, IVerifiableCredential } from '@sphereon/ssi-types';
+import { StatusListIndexingDirection, StatusPurpose2021, StatusListType, IIssuer, CredentialProofFormat, StatusListDriverType, StatusListCredential, StatusListCredentialIdMode, ICredentialStatus, OrPromise, ICredential, IVerifiableCredential } from '@sphereon/ssi-types';
 import { IPluginMethodMap, IAgentContext, ICredentialIssuer, ICredentialVerifier, IKeyManager, ICredentialPlugin, CredentialPayload } from '@veramo/core';
 import { DataSource } from 'typeorm';
 import { BitsPerStatus } from '@sd-jwt/jwt-status-list';
 import { SdJwtVcPayload } from '@sd-jwt/sd-jwt-vc';
 import { StatusListOpts } from '@sphereon/oid4vci-common';
+import { BitstringStatusPurpose } from '@4sure-tech/vc-bitstring-status-lists';
 import { StatusMethod } from 'credential-status';
 
 declare enum StatusOAuth {
@@ -16,18 +17,7 @@ declare enum Status2021 {
     Valid = 0,
     Invalid = 1
 }
-type BitstringStatus = {
-    status: string;
-    message?: string;
-    [x: string]: any;
-};
-type BitstringStatusResult = BitstringStatus & {
-    index: number;
-    status: string;
-    set: boolean;
-    message?: string;
-    [x: string]: any;
-};
+type BitstringStatus = number;
 type StatusList2021Args = {
     indexingDirection: StatusListIndexingDirection;
     statusPurpose?: StatusPurpose2021;
@@ -38,8 +28,7 @@ type OAuthStatusListArgs = {
 };
 type BitstringStatusListArgs = {
     statusPurpose: BitstringStatusPurpose;
-    statusSize?: number;
-    statusMessage?: Array<BitstringStatus>;
+    bitsPerStatus: number;
     ttl?: number;
     validFrom?: Date;
     validUntil?: Date;
@@ -54,6 +43,7 @@ type BaseCreateNewStatusListArgs = {
     keyRef?: string;
     statusList2021?: StatusList2021Args;
     oauthStatusList?: OAuthStatusListArgs;
+    bitstringStatusList?: BitstringStatusListArgs;
     driverType?: StatusListDriverType;
 };
 type UpdateStatusList2021Args = {
@@ -65,8 +55,7 @@ type UpdateOAuthStatusListArgs = {
 };
 type UpdateBitstringStatusListArgs = {
     statusPurpose: BitstringStatusPurpose;
-    statusSize?: number;
-    statusMessage?: Array<BitstringStatus>;
+    bitsPerStatus: number;
     validFrom?: Date;
     validUntil?: Date;
     ttl?: number;
@@ -74,7 +63,7 @@ type UpdateBitstringStatusListArgs = {
 interface UpdateStatusListFromEncodedListArgs {
     type?: StatusListType;
     statusListIndex: number | string;
-    value: boolean;
+    value: number;
     proofFormat?: CredentialProofFormat;
     keyRef?: string;
     correlationId?: string;
@@ -117,6 +106,7 @@ interface OAuthStatusDetails {
 }
 interface BitstringStatusDetails {
     statusPurpose: BitstringStatusPurpose;
+    bitsPerStatus: number;
     validFrom?: Date;
     validUntil?: Date;
     ttl?: number;
@@ -139,7 +129,7 @@ interface BitstringStatusListEntryCredentialStatus extends ICredentialStatus {
     statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[];
     statusListIndex: string;
     statusListCredential: string;
-    statusSize?: number;
+    bitsPerStatus?: number;
     statusMessage?: Array<BitstringStatus>;
     statusReference?: string | string[];
 }
@@ -167,17 +157,20 @@ interface UpdateStatusListIndexArgs {
     statusListCredential: StatusListCredential;
     statusListIndex: number | string;
     value: number | Status2021 | StatusOAuth | BitstringStatus;
+    bitsPerStatus?: number;
     keyRef?: string;
     expiresAt?: Date;
 }
 interface CheckStatusIndexArgs {
     statusListCredential: StatusListCredential;
     statusListIndex: string | number;
+    bitsPerStatus?: number;
 }
 interface ToStatusListDetailsArgs {
     statusListPayload: StatusListCredential;
     correlationId?: string;
     driverType?: StatusListDriverType;
+    bitsPerStatus?: number;
 }
 /**
  * The interface definition for a plugin that can add statuslist info to a credential
@@ -307,15 +300,17 @@ declare function checkStatusIndexFromStatusListCredential(args: {
     type?: StatusListType | 'StatusList2021Entry' | 'BitstringStatusListEntry';
     id?: string;
     statusListIndex: string | number;
+    bitsPerStatus?: number;
 }): Promise<number | Status2021 | StatusOAuth | BitstringStatus>;
 declare function createNewStatusList(args: CreateNewStatusListFuncArgs, context: IAgentContext<(ICredentialPlugin | any) & IIdentifierResolution>): Promise<StatusListResult>;
 declare function updateStatusIndexFromStatusListCredential(args: UpdateStatusListIndexArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListResult>;
-declare function statusListCredentialToDetails(args: {
+declare function statusListCredentialToDetails({ correlationId, driverType, statusListCredential, bitsPerStatus, }: {
     statusListCredential: StatusListCredential;
     correlationId?: string;
     driverType?: StatusListDriverType;
+    bitsPerStatus?: number;
 }): Promise<StatusListResult>;
 declare function updateStatusListIndexFromEncodedList(args: UpdateStatusListFromEncodedListArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListResult>;
 declare function statusList2021ToVerifiableCredential(args: StatusList2021ToVerifiableCredentialArgs, context: IAgentContext<ICredentialPlugin & IIdentifierResolution>): Promise<StatusListCredential>;
 
-export { type BaseCreateNewStatusListArgs, type BitstringStatus, type BitstringStatusListArgs, type BitstringStatusListEntryCredentialStatus, type BitstringStatusResult, type CheckStatusIndexArgs, type CreateNewStatusListArgs, type CreateNewStatusListFuncArgs, type CreateStatusListArgs, type CredentialWithStatusSupport, type GetStatusListArgs, type IAddStatusToCredentialArgs, type IAddStatusToSdJwtCredentialArgs, type IIssueCredentialStatusOpts, type IRequiredContext, type IRequiredPlugins, type IStatusListPlugin, type OAuthStatusListArgs, type SignedStatusListData, Status2021, type StatusList2021Args, type StatusList2021EntryCredentialStatus, type StatusList2021ToVerifiableCredentialArgs, type StatusListOAuthEntryCredentialStatus, type StatusListResult, StatusOAuth, type ToStatusListDetailsArgs, type UpdateBitstringStatusListArgs, type UpdateOAuthStatusListArgs, type UpdateStatusList2021Args, type UpdateStatusListFromEncodedListArgs, type UpdateStatusListFromStatusListCredentialArgs, type UpdateStatusListIndexArgs, checkStatusForCredential, checkStatusIndexFromStatusListCredential, createNewStatusList, fetchStatusListCredential, simpleCheckStatusFromStatusListUrl, statusList2021ToVerifiableCredential, statusListCredentialToDetails, statusPluginStatusFunction, updateStatusIndexFromStatusListCredential, updateStatusListIndexFromEncodedList, vcLibCheckStatusFunction };
+export { type BaseCreateNewStatusListArgs, type BitstringStatus, type BitstringStatusListArgs, type BitstringStatusListEntryCredentialStatus, type CheckStatusIndexArgs, type CreateNewStatusListArgs, type CreateNewStatusListFuncArgs, type CreateStatusListArgs, type CredentialWithStatusSupport, type GetStatusListArgs, type IAddStatusToCredentialArgs, type IAddStatusToSdJwtCredentialArgs, type IIssueCredentialStatusOpts, type IRequiredContext, type IRequiredPlugins, type IStatusListPlugin, type OAuthStatusListArgs, type SignedStatusListData, Status2021, type StatusList2021Args, type StatusList2021EntryCredentialStatus, type StatusList2021ToVerifiableCredentialArgs, type StatusListOAuthEntryCredentialStatus, type StatusListResult, StatusOAuth, type ToStatusListDetailsArgs, type UpdateBitstringStatusListArgs, type UpdateOAuthStatusListArgs, type UpdateStatusList2021Args, type UpdateStatusListFromEncodedListArgs, type UpdateStatusListFromStatusListCredentialArgs, type UpdateStatusListIndexArgs, checkStatusForCredential, checkStatusIndexFromStatusListCredential, createNewStatusList, fetchStatusListCredential, simpleCheckStatusFromStatusListUrl, statusList2021ToVerifiableCredential, statusListCredentialToDetails, statusPluginStatusFunction, updateStatusIndexFromStatusListCredential, updateStatusListIndexFromEncodedList, vcLibCheckStatusFunction };

package/dist/index.js

@@ -25,7 +25,8 @@ function getAssertedStatusListType(type) {
   const assertedType = type ?? StatusListType.StatusList2021;
   if (![
     StatusListType.StatusList2021,
-    StatusListType.OAuthStatusList
+    StatusListType.OAuthStatusList,
+    StatusListType.BitstringStatusList
   ].includes(assertedType)) {
     throw Error(`StatusList type ${assertedType} is not supported (yet)`);
   }
@@ -71,6 +72,12 @@ var ValidProofTypeMap = /* @__PURE__ */ new Map([
       "jwt",
       "cbor"
     ]
+  ],
+  [
+    StatusListType.BitstringStatusList,
+    [
+      "lds"
+    ]
   ]
 ]);
 function assertValidProofType(type, proofFormat) {
@@ -213,7 +220,7 @@ var StatusList2021Implementation = class {
       encodedList: args.encodedList
     });
     const index = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
-    statusList.setStatus(index, args.value);
+    statusList.setStatus(index, args.value !== 0);
     const newEncodedList = await statusList.encode();
     const credential = await this.createVerifiableCredential({
       id,
@@ -635,7 +642,7 @@ var OAuthStatusListImplementation = class {
     const issuerString = typeof issuer === "string" ? issuer : issuer.id;
     const listToUpdate = StatusList4.decompressStatusList(args.encodedList, bitsPerStatus ?? DEFAULT_BITS_PER_STATUS);
     const index = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
-    listToUpdate.setStatus(index, args.value ? 1 : 0);
+    listToUpdate.setStatus(index, args.value);
     const { statusListCredential, encodedList } = await this.createSignedStatusList(proofFormat ?? DEFAULT_PROOF_FORMAT2, context, listToUpdate, issuerString, id, expiresAt, keyRef);
     return {
       encodedList,
@@ -715,10 +722,9 @@ import { StatusListType as StatusListType5 } from "@sphereon/ssi-types";
 
 // src/impl/BitstringStatusListImplementation.ts
 import { CredentialMapper as CredentialMapper3, DocumentFormat as DocumentFormat3, StatusListType as StatusListType4 } from "@sphereon/ssi-types";
-import { createList, decodeList } from "@digitalbazaar/vc-bitstring-status-list";
+import { BitstreamStatusList, createStatusListCredential } from "@4sure-tech/vc-bitstring-status-lists";
 var DEFAULT_LIST_LENGTH3 = 131072;
 var DEFAULT_PROOF_FORMAT3 = "lds";
-var DEFAULT_STATUS_SIZE = 1;
 var DEFAULT_STATUS_PURPOSE = "revocation";
 var BitstringStatusListImplementation = class {
   static {
@@ -734,26 +740,28 @@ var BitstringStatusListImplementation = class {
     const veramoProofFormat = proofFormat;
     const { issuer, id } = args;
     const correlationId = getAssertedValue("correlationId", args.correlationId);
-    const { statusPurpose, statusSize, statusMessage, ttl } = args.bitstringStatusList;
-    const list = await createList({
-      length
-    });
-    const encodedList = await list.encode();
+    const { statusPurpose, bitsPerStatus, validFrom, validUntil, ttl } = args.bitstringStatusList;
     const statusListCredential = await this.createVerifiableCredential({
       ...args,
-      encodedList,
       proofFormat: veramoProofFormat,
       statusPurpose: statusPurpose ?? DEFAULT_STATUS_PURPOSE,
-      statusSize: statusSize ?? DEFAULT_STATUS_SIZE,
-      statusMessage,
+      validFrom,
+      validUntil,
       ttl
     }, context);
     return {
-      encodedList,
+      encodedList: statusListCredential.credentialSubject.encodedList,
       statusListCredential,
       bitstringStatusList: {
         statusPurpose: statusPurpose ?? DEFAULT_STATUS_PURPOSE,
-        ttl
+        ...statusListCredential.validFrom && {
+          validFrom: new Date(statusListCredential.validFrom)
+        },
+        ...statusListCredential.validUntil && {
+          validUntil: new Date(statusListCredential.validUntil)
+        },
+        ttl,
+        bitsPerStatus
       },
       length,
       type: StatusListType4.BitstringStatusList,
@@ -765,17 +773,20 @@ var BitstringStatusListImplementation = class {
     };
   }
   async updateStatusListIndex(args, context) {
+    if (!args.bitsPerStatus || args.bitsPerStatus < 1) {
+      return Promise.reject("bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (updateStatusListIndex)");
+    }
     const credential = args.statusListCredential;
     const uniform = CredentialMapper3.toUniformCredential(credential);
     const { issuer, credentialSubject } = uniform;
     const id = getAssertedValue("id", uniform.id);
     const origEncodedList = getAssertedProperty("encodedList", credentialSubject);
     const index = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
-    const statusList = await decodeList({
-      encodedList: origEncodedList
+    const statusList = await BitstreamStatusList.decode({
+      encodedList: origEncodedList,
+      statusSize: args.bitsPerStatus
     });
-    statusList.setStatus(index, args.value != 0);
-    const encodedList = await statusList.encode();
+    statusList.setStatus(index, args.value);
     const proofFormat = CredentialMapper3.detectDocumentType(credential) === DocumentFormat3.JWT ? "jwt" : "lds";
     const credSubject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject;
     const statusPurpose = getAssertedProperty("statusPurpose", credSubject);
@@ -786,7 +797,7 @@ var BitstringStatusListImplementation = class {
       ...args,
       id,
       issuer,
-      encodedList,
+      statusList,
       proofFormat,
       statusPurpose,
       ttl,
@@ -795,14 +806,19 @@ var BitstringStatusListImplementation = class {
     }, context);
     return {
       statusListCredential: updatedCredential,
-      encodedList,
+      encodedList: updatedCredential.credentialSubject.encodedList,
       bitstringStatusList: {
         statusPurpose,
-        validFrom,
-        validUntil,
+        ...updatedCredential.validFrom && {
+          validFrom: new Date(updatedCredential.validFrom)
+        },
+        ...updatedCredential.validUntil && {
+          validUntil: new Date(updatedCredential.validUntil)
+        },
+        bitsPerStatus: args.bitsPerStatus,
         ttl
       },
-      length: statusList.length - 1,
+      length: statusList.getLength(),
       type: StatusListType4.BitstringStatusList,
       proofFormat,
       id,
@@ -814,26 +830,27 @@ var BitstringStatusListImplementation = class {
     if (!args.bitstringStatusList) {
       throw new Error("bitstringStatusList options required for type BitstringStatusList");
     }
+    if (args.bitstringStatusList.bitsPerStatus < 1) {
+      return Promise.reject("bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (updateStatusListFromEncodedList)");
+    }
+    const { statusPurpose, bitsPerStatus, ttl, validFrom, validUntil } = args.bitstringStatusList;
     const proofFormat = args?.proofFormat ?? DEFAULT_PROOF_FORMAT3;
     assertValidProofType(StatusListType4.BitstringStatusList, proofFormat);
     const veramoProofFormat = proofFormat;
     const { issuer, id } = getAssertedValues(args);
-    const statusList = await decodeList({
-      encodedList: args.encodedList
+    const statusList = await BitstreamStatusList.decode({
+      encodedList: args.encodedList,
+      statusSize: bitsPerStatus
     });
     const index = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
     statusList.setStatus(index, args.value);
-    const newEncodedList = await statusList.encode();
-    const { statusPurpose, statusSize, statusMessage, ttl, validFrom, validUntil } = args.bitstringStatusList;
     const credential = await this.createVerifiableCredential({
       id,
       issuer,
-      encodedList: newEncodedList,
+      statusList,
       proofFormat: veramoProofFormat,
       keyRef: args.keyRef,
       statusPurpose,
-      statusSize,
-      statusMessage,
       validFrom,
       validUntil,
       ttl
@@ -841,14 +858,19 @@ var BitstringStatusListImplementation = class {
     return {
       type: StatusListType4.BitstringStatusList,
       statusListCredential: credential,
-      encodedList: newEncodedList,
+      encodedList: credential.credentialSubject.encodedList,
       bitstringStatusList: {
         statusPurpose,
-        validFrom,
-        validUntil,
+        bitsPerStatus,
+        ...credential.validFrom && {
+          validFrom: new Date(credential.validFrom)
+        },
+        ...credential.validUntil && {
+          validUntil: new Date(credential.validUntil)
+        },
         ttl
       },
-      length: statusList.length,
+      length: statusList.getLength(),
       proofFormat: args.proofFormat ?? "lds",
       id,
       issuer,
@@ -856,30 +878,28 @@ var BitstringStatusListImplementation = class {
     };
   }
   async checkStatusIndex(args) {
+    if (!args.bitsPerStatus || args.bitsPerStatus < 1) {
+      return Promise.reject("bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (checkStatusIndex)");
+    }
     const uniform = CredentialMapper3.toUniformCredential(args.statusListCredential);
     const { credentialSubject } = uniform;
     const encodedList = getAssertedProperty("encodedList", credentialSubject);
-    const subject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject;
-    const messageList = subject.statusMessage;
-    const numIndex = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
-    const hexIndex = `0x${numIndex.toString(16)}`;
-    const statusMessage = messageList.find((statMsg) => statMsg.status === hexIndex);
-    const statusList = await decodeList({
-      encodedList
+    const statusSize = args.bitsPerStatus;
+    const statusList = await BitstreamStatusList.decode({
+      encodedList,
+      statusSize
     });
-    if (statusList.length <= numIndex) {
-      throw new Error(`Status list index out of bounds, has ${messageList.length} messages, requested ${numIndex}`);
+    const numIndex = typeof args.statusListIndex === "number" ? args.statusListIndex : parseInt(args.statusListIndex);
+    if (statusList.getLength() <= numIndex) {
+      throw new Error(`Status list index out of bounds, has ${statusList.getLength()} entries, requested ${numIndex}`);
     }
-    const value = statusList.getStatus(numIndex);
-    return {
-      index: numIndex,
-      status: hexIndex,
-      message: statusMessage?.message,
-      set: value
-    };
+    return statusList.getStatus(numIndex);
   }
   async toStatusListDetails(args) {
-    const { statusListPayload } = args;
+    const { statusListPayload, bitsPerStatus } = args;
+    if (!bitsPerStatus || bitsPerStatus < 1) {
+      return Promise.reject("bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (toStatusListDetails)");
+    }
     const uniform = CredentialMapper3.toUniformCredential(statusListPayload);
     const { issuer, credentialSubject } = uniform;
     const id = getAssertedValue("id", uniform.id);
@@ -890,20 +910,19 @@ var BitstringStatusListImplementation = class {
     const validFrom = uniform.validFrom ? new Date(uniform.validFrom) : void 0;
     const validUntil = uniform.validUntil ? new Date(uniform.validUntil) : void 0;
     const ttl = credSubject.ttl;
-    const list = await decodeList({
-      encodedList
-    });
+    const statuslistLength = BitstreamStatusList.getStatusListLength(encodedList, bitsPerStatus);
     return {
       id,
       encodedList,
       issuer,
       type: StatusListType4.BitstringStatusList,
       proofFormat,
-      length: list.length,
+      length: statuslistLength,
       statusListCredential: statusListPayload,
       statuslistContentType: this.buildContentType(proofFormat),
       bitstringStatusList: {
         statusPurpose,
+        bitsPerStatus,
         validFrom,
         validUntil,
         ttl
@@ -922,42 +941,9 @@ var BitstringStatusListImplementation = class {
       vmRelationship: "assertionMethod",
       offlineWhenNoDIDRegistered: true
     });
-    const credentialSubject = {
-      id: args.id,
-      type: "BitstringStatusList",
-      statusPurpose: args.statusPurpose,
-      encodedList: args.encodedList
-    };
-    if (args.statusSize && args.statusSize > 1) {
-      credentialSubject.statusSize = args.statusSize;
-    }
-    if (args.statusMessage) {
-      credentialSubject.statusMessage = args.statusMessage;
-    }
-    if (args.validFrom) {
-      credentialSubject.validFrom = args.validFrom;
-    }
-    if (args.validUntil) {
-      credentialSubject.validUntil = args.validUntil;
-    }
-    if (args.ttl) {
-      credentialSubject.ttl = args.ttl;
-    }
-    const credential = {
-      "@context": [
-        "https://www.w3.org/2018/credentials/v1",
-        "https://www.w3.org/ns/credentials/status/v1"
-      ],
-      id: args.id,
-      issuer: args.issuer,
-      type: [
-        "VerifiableCredential",
-        "BitstringStatusListCredential"
-      ],
-      credentialSubject
-    };
+    const unsignedCredential = await createStatusListCredential(args);
     const verifiableCredential = await context.agent.createVerifiableCredential({
-      credential,
+      credential: unsignedCredential,
       keyRef: args.keyRef ?? identifier.kmsKeyRef,
       proofFormat: args.proofFormat,
       fetchRemoteContexts: true
@@ -1125,8 +1111,8 @@ async function updateStatusIndexFromStatusListCredential(args, context) {
   return implementation.updateStatusListIndex(args, context);
 }
 __name(updateStatusIndexFromStatusListCredential, "updateStatusIndexFromStatusListCredential");
-async function statusListCredentialToDetails(args) {
-  const credential = getAssertedValue("statusListCredential", args.statusListCredential);
+async function statusListCredentialToDetails({ correlationId, driverType, statusListCredential, bitsPerStatus }) {
+  const credential = getAssertedValue("statusListCredential", statusListCredential);
   let statusListType;
   const documentFormat = CredentialMapper4.detectDocumentType(credential);
   if (documentFormat === DocumentFormat4.JWT) {
@@ -1149,8 +1135,9 @@ async function statusListCredentialToDetails(args) {
   const implementation = getStatusListImplementation(statusListType);
   return await implementation.toStatusListDetails({
     statusListPayload: credential,
-    correlationId: args.correlationId,
-    driverType: args.driverType
+    correlationId,
+    driverType,
+    bitsPerStatus
   });
 }
 __name(statusListCredentialToDetails, "statusListCredentialToDetails");