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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.vc-status-list",
   "description": "Sphereon SSI-SDK plugin for Status List management, like StatusList2021.",
-  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.13+61bcf6d3",
+  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.14+35c8ca99",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -31,9 +31,9 @@
     "@sphereon/ssi-sdk-ext.did-utils": "0.29.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.29.0",
-    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.17.bitstring.sl.13+61bcf6d3",
-    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.17.bitstring.sl.13+61bcf6d3",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.13+61bcf6d3",
+    "@sphereon/ssi-sdk.credential-vcdm": "0.34.1-feature.SSISDK.17.bitstring.sl.14+35c8ca99",
+    "@sphereon/ssi-sdk.data-store": "0.34.1-feature.SSISDK.17.bitstring.sl.14+35c8ca99",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.14+35c8ca99",
     "@sphereon/vc-status-list": "7.0.0-next.0",
     "@veramo/core": "4.2.0",
     "@veramo/credential-status": "4.2.0",
@@ -72,5 +72,5 @@
     "SSI",
     "StatusList2021"
   ],
-  "gitHead": "61bcf6d37bcb3d77036b5415d72853c3ba3f9273"
+  "gitHead": "35c8ca99b499927dfffd929ae709750a7337b017"
 }

package/src/functions.ts

@@ -1,24 +1,22 @@
 import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
-import {
-  CredentialMapper,
-  type CredentialProofFormat,
-  type StatusListCredential,
-  StatusListDriverType,
-  StatusListType,
-  type StatusPurpose2021,
-} from '@sphereon/ssi-types'
+import { CredentialMapper, type CredentialProofFormat, type StatusListCredential, StatusListType, type StatusPurpose2021 } from '@sphereon/ssi-types'
 import type { CredentialStatus, DIDDocument, IAgentContext, ProofFormat as VeramoProofFormat } from '@veramo/core'
 
-import { IAddStatusListArgs, IBitstringStatusListEntryEntity, IStatusListEntryEntity, StatusListEntity } from '@sphereon/ssi-sdk.data-store'
+import {
+  BitstringStatusListEntryCredentialStatus,
+  IBitstringStatusListEntryEntity,
+  IStatusListEntryEntity,
+  StatusListEntity,
+} from '@sphereon/ssi-sdk.data-store'
 
 import { checkStatus } from '@sphereon/vc-status-list'
 
 // @ts-ignore
 import { CredentialJwtOrJSON, StatusMethod } from 'credential-status'
 import {
-  BitstringStatus,
-  BitstringStatusListEntryCredentialStatus,
   CreateNewStatusListFuncArgs,
+  IMergeDetailsWithEntityArgs,
+  IToDetailsFromCredentialArgs,
   Status2021,
   StatusList2021EntryCredentialStatus,
   StatusList2021ToVerifiableCredentialArgs,
@@ -31,6 +29,12 @@ import {
 import { assertValidProofType, determineStatusListType, getAssertedValue, getAssertedValues } from './utils'
 import { getStatusListImplementation } from './impl/StatusListFactory'
 import { IVcdmCredentialPlugin } from '@sphereon/ssi-sdk.credential-vcdm'
+import {
+  IBitstringStatusListImplementationResult,
+  IExtractedCredentialDetails,
+  IOAuthStatusListImplementationResult,
+  IStatusList2021ImplementationResult,
+} from './impl/IStatusList'
 
 export async function fetchStatusListCredential(args: { statusListCredential: string }): Promise<StatusListCredential> {
   const url = getAssertedValue('statusListCredential', args.statusListCredential)
@@ -142,7 +146,7 @@ export async function simpleCheckStatusFromStatusListUrl(args: {
   type?: StatusListType | 'StatusList2021Entry'
   id?: string
   statusListIndex: string
-}): Promise<number | Status2021 | StatusOAuth | BitstringStatus> {
+}): Promise<number | Status2021 | StatusOAuth> {
   return checkStatusIndexFromStatusListCredential({
     ...args,
     statusListCredential: await fetchStatusListCredential(args),
@@ -156,7 +160,7 @@ export async function checkStatusIndexFromStatusListCredential(args: {
   id?: string
   statusListIndex: string | number
   bitsPerStatus?: number
-}): Promise<number | Status2021 | StatusOAuth | BitstringStatus> {
+}): Promise<number | Status2021 | StatusOAuth> {
   const statusListType: StatusListType = determineStatusListType(args.statusListCredential)
   const implementation = getStatusListImplementation(statusListType)
   return implementation.checkStatusIndex(args)
@@ -181,31 +185,36 @@ export async function updateStatusIndexFromStatusListCredential(
   return implementation.updateStatusListIndex(args, context)
 }
 
-export async function statusListCredentialToDetails({
-  statusListType,
-  correlationId,
-  driverType,
-  statusListCredential,
-  bitsPerStatus,
-}: {
-  statusListType: StatusListType
-  statusListCredential: StatusListCredential
-  correlationId?: string
-  driverType?: StatusListDriverType
-  bitsPerStatus?: number
-}): Promise<StatusListResult & Partial<IAddStatusListArgs>> {
-  const credential = getAssertedValue('statusListCredential', statusListCredential)
+export async function extractCredentialDetails(statusListCredential: StatusListCredential): Promise<IExtractedCredentialDetails> {
+  const statusListType = determineStatusListType(statusListCredential)
   const implementation = getStatusListImplementation(statusListType)
+  return implementation.extractCredentialDetails(statusListCredential)
+}
 
-  // The implementation should now return all the type-specific fields needed for the entity
-  const result = await implementation.toStatusListDetails({
-    statusListPayload: credential,
-    correlationId: correlationId,
-    driverType: driverType,
-    bitsPerStatus: bitsPerStatus,
-  })
+export async function toStatusListDetails(
+  args: IToDetailsFromCredentialArgs,
+): Promise<StatusListResult & (IStatusList2021ImplementationResult | IOAuthStatusListImplementationResult | IBitstringStatusListImplementationResult)>
 
-  return result
+export async function toStatusListDetails(
+  args: IMergeDetailsWithEntityArgs,
+): Promise<StatusListResult & (IStatusList2021ImplementationResult | IOAuthStatusListImplementationResult | IBitstringStatusListImplementationResult)>
+
+export async function toStatusListDetails(
+  args: IToDetailsFromCredentialArgs | IMergeDetailsWithEntityArgs,
+): Promise<
+  StatusListResult & (IStatusList2021ImplementationResult | IOAuthStatusListImplementationResult | IBitstringStatusListImplementationResult)
+> {
+  if ('statusListCredential' in args) {
+    // CREATE/READ context
+    const statusListType = args.statusListType
+    const implementation = getStatusListImplementation(statusListType)
+    return implementation.toStatusListDetails(args)
+  } else {
+    // UPDATE context
+    const statusListType = args.statusListEntity.type
+    const implementation = getStatusListImplementation(statusListType)
+    return implementation.toStatusListDetails(args)
+  }
 }
 
 export async function createCredentialStatusFromStatusList(args: {

package/src/impl/BitstringStatusListImplementation.ts

@@ -28,14 +28,13 @@ import {
   StatusListType,
 } from '@sphereon/ssi-types'
 
-import type { IBitstringStatusListImplementationResult, IStatusList } from './IStatusList'
+import type { IBitstringStatusListImplementationResult, IExtractedCredentialDetails, IStatusList } from './IStatusList'
 import {
-  BitstringStatus,
-  BitstringStatusListEntryCredentialStatus,
   CheckStatusIndexArgs,
   CreateStatusListArgs,
+  IMergeDetailsWithEntityArgs,
+  IToDetailsFromCredentialArgs,
   StatusListResult,
-  ToStatusListDetailsArgs,
   UpdateStatusListFromEncodedListArgs,
   UpdateStatusListIndexArgs,
 } from '../types'
@@ -48,11 +47,17 @@ import {
   BitstringStatusPurpose,
   createStatusListCredential,
 } from '@4sure-tech/vc-bitstring-status-lists'
-import { BitstringStatusListEntity, IBitstringStatusListEntryEntity, IStatusListEntryEntity, StatusListEntity } from '@sphereon/ssi-sdk.data-store'
+import {
+  BitstringStatusListEntity,
+  BitstringStatusListEntryCredentialStatus,
+  IBitstringStatusListEntryEntity,
+  IStatusListEntryEntity,
+  StatusListEntity,
+} from '@sphereon/ssi-sdk.data-store'
 import { IVcdmCredentialPlugin } from '@sphereon/ssi-sdk.credential-vcdm'
 
 export const DEFAULT_LIST_LENGTH = 131072 // W3C spec minimum
-export const DEFAULT_PROOF_FORMAT = 'lds' as CredentialProofFormat
+export const DEFAULT_PROOF_FORMAT = 'vc+jwt' as CredentialProofFormat
 export const DEFAULT_STATUS_PURPOSE: BitstringStatusPurpose = 'revocation'
 
 /**
@@ -148,9 +153,10 @@ export class BitstringStatusListImplementation implements IStatusList {
 
     const index = typeof args.statusListIndex === 'number' ? args.statusListIndex : parseInt(args.statusListIndex)
     const statusList: BitstreamStatusList = await BitstreamStatusList.decode({ encodedList: origEncodedList, statusSize: args.bitsPerStatus })
-    statusList.setStatus(index, args.value)
+    const bitstringStatusId = args.value as number
+    statusList.setStatus(index, bitstringStatusId)
 
-    const proofFormat = CredentialMapper.detectDocumentType(credential) === DocumentFormat.JWT ? 'jwt' : 'lds'
+    const proofFormat = CredentialMapper.detectDocumentType(credential) === DocumentFormat.JWT ? 'vc+jwt' : 'lds'
 
     const credSubject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject
 
@@ -275,7 +281,7 @@ export class BitstringStatusListImplementation implements IStatusList {
    * @param args - Check parameters including the status list credential and index
    * @returns Promise resolving to the status value at the specified index
    */
-  async checkStatusIndex(args: CheckStatusIndexArgs): Promise<BitstringStatus> {
+  async checkStatusIndex(args: CheckStatusIndexArgs): Promise<number> {
     if (!args.bitsPerStatus || args.bitsPerStatus < 1) {
       return Promise.reject(Error('bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (checkStatusIndex)'))
     }
@@ -292,62 +298,111 @@ export class BitstringStatusListImplementation implements IStatusList {
     return statusList.getStatus(numIndex)
   }
 
+  async extractCredentialDetails(credential: StatusListCredential): Promise<IExtractedCredentialDetails> {
+    const uniform = CredentialMapper.toUniformCredential(credential)
+    const { issuer, credentialSubject } = uniform
+    const subject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject
+
+    return {
+      id: getAssertedValue('id', uniform.id),
+      issuer,
+      encodedList: getAssertedProperty('encodedList', subject),
+    }
+  }
+
   /**
    * Converts a status list credential payload to detailed status list information
    *
    * @param args - Conversion parameters including the status list payload
    * @returns Promise resolving to detailed status list information
    */
-  async toStatusListDetails(args: ToStatusListDetailsArgs): Promise<StatusListResult & IBitstringStatusListImplementationResult> {
-    const { statusListPayload, bitsPerStatus } = args
-    if (!bitsPerStatus || bitsPerStatus < 1) {
-      return Promise.reject(Error('bitsPerStatus must be set for bitstring status lists and must be 1 or higher. (toStatusListDetails)'))
-    }
-
-    const uniform = CredentialMapper.toUniformCredential(statusListPayload)
-    const { issuer, credentialSubject } = uniform
-    const id = getAssertedValue('id', uniform.id)
-    const encodedList = getAssertedProperty('encodedList', credentialSubject)
-    const proofFormat: CredentialProofFormat = CredentialMapper.detectDocumentType(statusListPayload) === DocumentFormat.JWT ? 'vc+jwt' : 'lds'
-    const credSubject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject
-    const statusPurpose = getAssertedProperty('statusPurpose', credSubject)
-    const validFrom = uniform.validFrom ? new Date(uniform.validFrom) : undefined
-    const validUntil = uniform.validUntil ? new Date(uniform.validUntil) : undefined
-    const ttl = credSubject.ttl
-    const statuslistLength: number = BitstreamStatusList.getStatusListLength(encodedList, bitsPerStatus)
-
-    return {
-      // Base implementation fields
-      id,
-      encodedList,
-      issuer,
-      type: StatusListType.BitstringStatusList,
-      proofFormat,
-      length: statuslistLength,
-      statusListCredential: statusListPayload,
-      statuslistContentType: this.buildContentType(proofFormat),
-      correlationId: args.correlationId, // FIXME these do not need to be inside the impl
-      driverType: args.driverType, // FIXME these do not need to be inside the impl
-
-      // Flattened Bitstring-specific fields
-      statusPurpose,
-      bitsPerStatus,
-      ...(validFrom && { validFrom }),
-      ...(validUntil && { validUntil }),
-      ...(ttl && { ttl }),
-
-      // Legacy nested structure for backward compatibility
-      bitstringStatusList: {
+  // For CREATE and READ contexts
+  async toStatusListDetails(args: IToDetailsFromCredentialArgs): Promise<StatusListResult & IBitstringStatusListImplementationResult>
+  // For UPDATE contexts
+  async toStatusListDetails(args: IMergeDetailsWithEntityArgs): Promise<StatusListResult & IBitstringStatusListImplementationResult>
+  async toStatusListDetails(
+    args: IToDetailsFromCredentialArgs | IMergeDetailsWithEntityArgs,
+  ): Promise<StatusListResult & IBitstringStatusListImplementationResult> {
+    if ('statusListCredential' in args) {
+      // CREATE/READ context
+      const { statusListCredential, bitsPerStatus, correlationId, driverType } = args
+      if (!bitsPerStatus || bitsPerStatus < 1) {
+        return Promise.reject(Error('bitsPerStatus must be set for bitstring status lists and must be 1 or higher'))
+      }
+
+      const uniform = CredentialMapper.toUniformCredential(statusListCredential)
+      const { issuer, credentialSubject } = uniform
+      const subject = Array.isArray(credentialSubject) ? credentialSubject[0] : credentialSubject
+
+      const id = getAssertedValue('id', uniform.id)
+      const encodedList = getAssertedProperty('encodedList', subject)
+      const statusPurpose = getAssertedProperty('statusPurpose', subject)
+      const validFrom = uniform.validFrom ? new Date(uniform.validFrom) : undefined
+      const validUntil = uniform.validUntil ? new Date(uniform.validUntil) : undefined
+      const ttl = subject.ttl
+      const proofFormat: CredentialProofFormat = CredentialMapper.detectDocumentType(statusListCredential) === DocumentFormat.JWT ? 'vc+jwt' : 'lds'
+      const statuslistLength = BitstreamStatusList.getStatusListLength(encodedList, bitsPerStatus)
+
+      return {
+        id,
+        encodedList,
+        issuer,
+        type: StatusListType.BitstringStatusList,
+        proofFormat,
+        length: statuslistLength,
+        statusListCredential,
+        statuslistContentType: this.buildContentType(proofFormat),
+        correlationId,
+        driverType,
         statusPurpose,
         bitsPerStatus,
         ...(validFrom && { validFrom }),
         ...(validUntil && { validUntil }),
         ...(ttl && { ttl }),
-      },
-
-      // Optional fields from args
-      ...(args.correlationId && { correlationId: args.correlationId }),
-      ...(args.driverType && { driverType: args.driverType }),
+        bitstringStatusList: {
+          statusPurpose,
+          bitsPerStatus,
+          ...(validFrom && { validFrom }),
+          ...(validUntil && { validUntil }),
+          ...(ttl && { ttl }),
+        },
+      }
+    } else {
+      // UPDATE context
+      const { extractedDetails, statusListEntity } = args
+      const bitstringEntity = statusListEntity as BitstringStatusListEntity
+      if (!bitstringEntity.bitsPerStatus) {
+        return Promise.reject(Error('bitsPerStatus must be present for a bitstring status list'))
+      }
+
+      const proofFormat: CredentialProofFormat =
+        CredentialMapper.detectDocumentType(statusListEntity.statusListCredential!) === DocumentFormat.JWT ? 'vc+jwt' : 'lds'
+      const statuslistLength = BitstreamStatusList.getStatusListLength(extractedDetails.encodedList, bitstringEntity.bitsPerStatus)
+
+      return {
+        id: extractedDetails.id,
+        encodedList: extractedDetails.encodedList,
+        issuer: extractedDetails.issuer,
+        type: StatusListType.BitstringStatusList,
+        proofFormat,
+        length: statuslistLength,
+        statusListCredential: statusListEntity.statusListCredential!,
+        statuslistContentType: this.buildContentType(proofFormat),
+        correlationId: statusListEntity.correlationId,
+        driverType: statusListEntity.driverType,
+        statusPurpose: bitstringEntity.statusPurpose,
+        bitsPerStatus: bitstringEntity.bitsPerStatus,
+        ...(bitstringEntity.validFrom && { validFrom: bitstringEntity.validFrom }),
+        ...(bitstringEntity.validUntil && { validUntil: bitstringEntity.validUntil }),
+        ...(bitstringEntity.ttl && { ttl: bitstringEntity.ttl }),
+        bitstringStatusList: {
+          statusPurpose: bitstringEntity.statusPurpose,
+          bitsPerStatus: bitstringEntity.bitsPerStatus,
+          ...(bitstringEntity.validFrom && { validFrom: bitstringEntity.validFrom }),
+          ...(bitstringEntity.validUntil && { validUntil: bitstringEntity.validUntil }),
+          ...(bitstringEntity.ttl && { ttl: bitstringEntity.ttl }),
+        },
+      }
     }
   }
 
@@ -364,25 +419,17 @@ export class BitstringStatusListImplementation implements IStatusList {
   }): Promise<BitstringStatusListEntryCredentialStatus> {
     const { statusList, statusListEntry, statusListIndex } = args
 
-    // Type guard to ensure we have a bitstring entry
-    const isBitstringEntry = (entry: IStatusListEntryEntity | IBitstringStatusListEntryEntity): entry is IBitstringStatusListEntryEntity => {
-      return 'statusPurpose' in entry
-    }
-
-    if (!isBitstringEntry(statusListEntry)) {
-      throw new Error('Expected bitstring status list entry for bitstring status list')
-    }
-
-    // Cast to BitstringStatusListEntity to access specific properties
     const bitstringStatusList = statusList as BitstringStatusListEntity
-
+    const bitstringStatusListEntry = statusListEntry as IBitstringStatusListEntryEntity
     return {
       id: `${statusList.id}#${statusListIndex}`,
       type: 'BitstringStatusListEntry',
-      statusPurpose: statusListEntry.statusPurpose,
+      statusPurpose: bitstringStatusListEntry.statusPurpose,
       statusListIndex: '' + statusListIndex,
       statusListCredential: statusList.id,
       bitsPerStatus: bitstringStatusList.bitsPerStatus,
+      statusMessage: bitstringStatusListEntry.statusMessage,
+      statusReference: bitstringStatusListEntry.statusReference,
     } satisfies BitstringStatusListEntryCredentialStatus
   }
 

package/src/impl/IStatusList.ts

@@ -1,16 +1,15 @@
 import type { IAgentContext } from '@veramo/core'
 import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import {
-  BitstringStatus,
-  BitstringStatusListEntryCredentialStatus,
   CheckStatusIndexArgs,
   CreateStatusListArgs,
+  IMergeDetailsWithEntityArgs,
+  IToDetailsFromCredentialArgs,
   Status2021,
   StatusList2021EntryCredentialStatus,
   StatusListOAuthEntryCredentialStatus,
   StatusListResult,
   StatusOAuth,
-  ToStatusListDetailsArgs,
   UpdateStatusListFromEncodedListArgs,
   UpdateStatusListIndexArgs,
 } from '../types'
@@ -24,8 +23,21 @@ import {
   StatusListType,
   StatusPurpose2021,
 } from '@sphereon/ssi-types'
-import { IBitstringStatusListEntryEntity, IStatusListEntryEntity, StatusListEntity } from '@sphereon/ssi-sdk.data-store'
+import {
+  BitstringStatusListEntryCredentialStatus,
+  IBitstringStatusListEntryEntity,
+  IStatusListEntryEntity,
+  StatusListEntity,
+} from '@sphereon/ssi-sdk.data-store'
 import { IVcdmCredentialPlugin } from '@sphereon/ssi-sdk.credential-vcdm'
+import { DecodedStatusListPayload } from './encoding/common'
+
+export interface IExtractedCredentialDetails {
+  id: string
+  issuer: string | IIssuer
+  encodedList: string
+  decodedPayload?: DecodedStatusListPayload
+}
 
 export interface IStatusList {
   /**
@@ -52,13 +64,29 @@ export interface IStatusList {
   /**
    * Checks the status at a given index in the status list
    */
-  checkStatusIndex(args: CheckStatusIndexArgs): Promise<number | Status2021 | StatusOAuth | BitstringStatus>
+  checkStatusIndex(args: CheckStatusIndexArgs): Promise<number | Status2021 | StatusOAuth>
+
+  /**
+   * Performs the initial parsing of a StatusListCredential.
+   * This method handles expensive operations like JWT/CWT decoding once.
+   * It extracts all details available from the credential payload itself.
+   */
+  extractCredentialDetails(credential: StatusListCredential): Promise<IExtractedCredentialDetails>
+
+  /**
+   * Converts a credential and its known metadata into a full StatusListResult.
+   */
+  toStatusListDetails(
+    args: IToDetailsFromCredentialArgs,
+  ): Promise<
+    StatusListResult & (IStatusList2021ImplementationResult | IOAuthStatusListImplementationResult | IBitstringStatusListImplementationResult)
+  >
 
   /**
-   * Collects the status list details - returns flattened entity data ready for storage
+   * Merges pre-parsed details from a new credential with an existing database entity.
    */
   toStatusListDetails(
-    args: ToStatusListDetailsArgs,
+    args: IMergeDetailsWithEntityArgs,
   ): Promise<
     StatusListResult & (IStatusList2021ImplementationResult | IOAuthStatusListImplementationResult | IBitstringStatusListImplementationResult)
   >

package/src/impl/OAuthStatusList.ts

@@ -3,16 +3,17 @@ import { type CompactJWT, type CredentialProofFormat, type CWT, StatusListType }
 import type {
   CheckStatusIndexArgs,
   CreateStatusListArgs,
+  IMergeDetailsWithEntityArgs,
+  IToDetailsFromCredentialArgs,
   SignedStatusListData,
   StatusListOAuthEntryCredentialStatus,
   StatusListResult,
   StatusOAuth,
-  ToStatusListDetailsArgs,
   UpdateStatusListFromEncodedListArgs,
   UpdateStatusListIndexArgs,
 } from '../types'
 import { determineProofFormat, ensureDate, getAssertedValue, getAssertedValues } from '../utils'
-import type { IOAuthStatusListImplementationResult, IStatusList } from './IStatusList'
+import type { IExtractedCredentialDetails, IOAuthStatusListImplementationResult, IStatusList } from './IStatusList'
 import { StatusList } from '@sd-jwt/jwt-status-list'
 import type { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
 import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
@@ -164,41 +165,87 @@ export class OAuthStatusListImplementation implements IStatusList {
     return statusList.getStatus(index)
   }
 
-  async toStatusListDetails(args: ToStatusListDetailsArgs): Promise<StatusListResult & IOAuthStatusListImplementationResult> {
-    const { statusListPayload } = args as { statusListPayload: CompactJWT | CWT }
-    const proofFormat = determineProofFormat(statusListPayload)
-    const decoded = proofFormat === 'jwt' ? decodeStatusListJWT(statusListPayload) : decodeStatusListCWT(statusListPayload)
-    const { statusList, issuer, id, exp } = decoded
+  async extractCredentialDetails(credential: CompactJWT | CWT): Promise<IExtractedCredentialDetails> {
+    if (typeof credential !== 'string') {
+      return Promise.reject('statusListCredential must be a JWT or CWT string')
+    }
 
-    const bitsPerStatus = statusList.getBitsPerStatus()
-    const expiresAt = exp ? new Date(exp * 1000) : undefined
+    const proofFormat = determineProofFormat(credential)
+    const decoded = proofFormat === 'jwt' ? decodeStatusListJWT(credential) : decodeStatusListCWT(credential)
 
     return {
-      // Base implementation fields
-      id,
-      encodedList: statusList.compressStatusList(),
-      issuer,
-      type: StatusListType.OAuthStatusList,
-      proofFormat,
-      length: statusList.statusList.length,
-      statusListCredential: statusListPayload,
-      statuslistContentType: this.buildContentType(proofFormat),
-      correlationId: args.correlationId, // FIXME these do not need to be inside the impl
-      driverType: args.driverType, // FIXME these do not need to be inside the impl
+      id: decoded.id,
+      issuer: decoded.issuer,
+      encodedList: decoded.statusList.compressStatusList(),
+      decodedPayload: decoded,
+    }
+  }
 
-      // Flattened OAuth-specific fields
-      bitsPerStatus,
-      ...(expiresAt && { expiresAt }),
+  // For CREATE and READ contexts
+  async toStatusListDetails(args: IToDetailsFromCredentialArgs): Promise<StatusListResult & IOAuthStatusListImplementationResult>
+  // For UPDATE contexts
+  async toStatusListDetails(args: IMergeDetailsWithEntityArgs): Promise<StatusListResult & IOAuthStatusListImplementationResult>
+  async toStatusListDetails(
+    args: IToDetailsFromCredentialArgs | IMergeDetailsWithEntityArgs,
+  ): Promise<StatusListResult & IOAuthStatusListImplementationResult> {
+    if ('statusListCredential' in args) {
+      // CREATE/READ context
+      const { statusListCredential, bitsPerStatus, correlationId, driverType } = args
+      if (!bitsPerStatus || bitsPerStatus < 1) {
+        return Promise.reject(Error('bitsPerStatus must be set for OAuth status lists and must be 1 or higher'))
+      }
 
-      // Legacy nested structure for backward compatibility
-      oauthStatusList: {
+      const proofFormat = determineProofFormat(statusListCredential as string)
+      const decoded =
+        proofFormat === 'jwt' ? decodeStatusListJWT(statusListCredential as string) : decodeStatusListCWT(statusListCredential as string)
+      const { statusList, issuer, id, exp } = decoded
+      const expiresAt = exp ? new Date(exp * 1000) : undefined
+
+      return {
+        id,
+        encodedList: statusList.compressStatusList(),
+        issuer,
+        type: StatusListType.OAuthStatusList,
+        proofFormat,
+        length: statusList.statusList.length,
+        statusListCredential: statusListCredential as CompactJWT | CWT,
+        statuslistContentType: this.buildContentType(proofFormat),
+        correlationId,
+        driverType,
         bitsPerStatus,
         ...(expiresAt && { expiresAt }),
-      },
-
-      // Optional fields from args
-      ...(args.correlationId && { correlationId: args.correlationId }),
-      ...(args.driverType && { driverType: args.driverType }),
+        oauthStatusList: {
+          bitsPerStatus,
+          ...(expiresAt && { expiresAt }),
+        },
+      }
+    } else {
+      // UPDATE context
+      const { extractedDetails, statusListEntity } = args
+      const oauthEntity = statusListEntity as OAuthStatusListEntity
+      const decoded = extractedDetails.decodedPayload as { statusList: StatusList; exp?: number }
+
+      const proofFormat = determineProofFormat(statusListEntity.statusListCredential as string)
+      const expiresAt = decoded.exp ? new Date(decoded.exp * 1000) : undefined
+
+      return {
+        id: extractedDetails.id,
+        encodedList: extractedDetails.encodedList,
+        issuer: extractedDetails.issuer,
+        type: StatusListType.OAuthStatusList,
+        proofFormat,
+        length: decoded.statusList.statusList.length,
+        statusListCredential: statusListEntity.statusListCredential!,
+        statuslistContentType: this.buildContentType(proofFormat),
+        correlationId: statusListEntity.correlationId,
+        driverType: statusListEntity.driverType,
+        bitsPerStatus: oauthEntity.bitsPerStatus,
+        ...(expiresAt && { expiresAt }),
+        oauthStatusList: {
+          bitsPerStatus: oauthEntity.bitsPerStatus,
+          ...(expiresAt && { expiresAt }),
+        },
+      }
     }
   }