@sphereon/ssi-sdk.oid4vci-holder 0.34.1-feature.SSISDK.78.280 → 0.34.1-feature.SSISDK.82.and.SSISDK.70.345

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.34.1-feature.SSISDK.78.280+c08a3255",
+  "version": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,27 +26,27 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.19.1-next.220",
+    "@sphereon/did-auth-siop": "0.19.1-next.234",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/oid4vci-client": "0.19.1-next.220",
-    "@sphereon/oid4vci-common": "0.19.1-next.220",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.78.280+c08a3255",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280+c08a3255",
+    "@sphereon/oid4vci-client": "0.19.1-next.234",
+    "@sphereon/oid4vci-common": "0.19.1-next.234",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.contact-manager": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.credential-store": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.credential-validation": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.issuance-branding": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.mdl-mdoc": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.oidf-client": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.sd-jwt": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-op-auth": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-sdk.xstate-machine-persistence": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -59,8 +59,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.19.1-next.220",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.78.280+c08a3255",
+    "@sphereon/oid4vc-common": "0.19.1-next.234",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.34.1-feature.SSISDK.82.and.SSISDK.70.345+e5abbf1a",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
@@ -90,5 +90,5 @@
     "OID4VCI",
     "State Machine"
   ],
-  "gitHead": "c08a32550479235265b02f17e9554f541836c635"
+  "gitHead": "e5abbf1a0404fbc2aeb350a248183f70598ffbc0"
 }

package/src/agent/OID4VCIHolder.ts

@@ -1,6 +1,6 @@
-import { CredentialOfferClient, MetadataClient, OpenID4VCIClient } from '@sphereon/oid4vci-client'
+import { CredentialOfferClient, MetadataClient, OpenID4VCIClient, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client'
 import {
-  AuthorizationDetails,
+  AuthorizationDetailsV1_0_15,
   AuthorizationRequestOpts,
   AuthorizationServerClientOpts,
   AuthorizationServerOpts,
@@ -123,6 +123,7 @@ import {
   VerificationResult,
   VerifyEBSICredentialIssuerArgs,
   VerifyEBSICredentialIssuerResult,
+  WalletType,
 } from '../types/IOID4VCIHolder'
 
 /**
@@ -378,11 +379,9 @@ export class OID4VCIHolder implements IAgentPlugin {
     }
 
     const authorizationRequestOpts = { ...this.defaultAuthorizationRequestOpts, ...args.authorizationRequestOpts } satisfies AuthorizationRequestOpts
-    // We filter the details first against our vcformat prefs
+    // TODO: Previously we filtered the details first against our vcformat prefs. However auth details does not have the notion of formats anymore
     authorizationRequestOpts.authorizationDetails = authorizationRequestOpts?.authorizationDetails
-      ? asArray(authorizationRequestOpts.authorizationDetails).filter(
-          (detail) => typeof detail === 'string' || this.vcFormatPreferences.includes(detail.format),
-        )
+      ? asArray(authorizationRequestOpts.authorizationDetails)
       : undefined
 
     if (!authorizationRequestOpts.redirectUri) {
@@ -394,18 +393,19 @@ export class OID4VCIHolder implements IAgentPlugin {
       authorizationRequestOpts.clientId = authorizationRequestOpts.redirectUri
     }
 
+    // TODO: This entire filter and formats population should not work anymore, as the auth details no longer have the format property.
     let formats: string[] = this.vcFormatPreferences
     const authFormats = authorizationRequestOpts?.authorizationDetails
-      ?.map((detail: AuthorizationDetails) => (typeof detail === 'object' && 'format' in detail && detail.format ? detail.format : undefined))
+      ?.map((detail: AuthorizationDetailsV1_0_15) => (typeof detail === 'object' && 'format' in detail && detail.format ? detail.format : undefined))
       .filter((format) => !!format)
       .map((format) => format as string)
     if (authFormats && authFormats.length > 0) {
       formats = Array.from(new Set(authFormats))
     }
-    let oid4vciClient: OpenID4VCIClient
+    let oid4vciClient: OpenID4VCIClientV1_0_15
     let offer: CredentialOfferRequestWithBaseUrl | undefined
     if (requestData.existingClientState) {
-      oid4vciClient = await OpenID4VCIClient.fromState({ state: requestData.existingClientState })
+      oid4vciClient = await OpenID4VCIClientV1_0_15.fromState({ state: requestData.existingClientState })
       offer = oid4vciClient.credentialOffer
     } else {
       offer = requestData.credentialOffer
@@ -427,7 +427,7 @@ export class OID4VCIHolder implements IAgentPlugin {
       if (!offer) {
         // else no offer, meaning we have an issuer URL
         logger.log(`Issuer url received (no credential offer): ${uri}`)
-        oid4vciClient = await OpenID4VCIClient.fromCredentialIssuer({
+        oid4vciClient = await OpenID4VCIClientV1_0_15.fromCredentialIssuer({
           credentialIssuer: uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
@@ -435,7 +435,7 @@ export class OID4VCIHolder implements IAgentPlugin {
         })
       } else {
         logger.log(`Credential offer received: ${uri}`)
-        oid4vciClient = await OpenID4VCIClient.fromURI({
+        oid4vciClient = await OpenID4VCIClientV1_0_15.fromURI({
           uri,
           authorizationRequest: authorizationRequestOpts,
           clientId: authorizationRequestOpts.clientId,
@@ -449,7 +449,7 @@ export class OID4VCIHolder implements IAgentPlugin {
       configurationIds = offer.original_credential_offer.credential_configuration_ids
     } else {
       configurationIds = asArray(authorizationRequestOpts.authorizationDetails)
-        .filter((authDetails): authDetails is Exclude<AuthorizationDetails, string> => typeof authDetails !== 'string')
+        // .filter((authDetails): authDetails is Exclude<AuthorizationDetailsV1_0_15, string> => typeof authDetails !== 'string')
         .map((authReqOpts) => authReqOpts.credential_configuration_id)
         .filter((id): id is string => !!id)
     }
@@ -616,14 +616,14 @@ export class OID4VCIHolder implements IAgentPlugin {
   }
 
   private async oid4vciHolderGetCredentials(args: GetCredentialsArgs, context: RequiredContext): Promise<Array<MappedCredentialToAccept>> {
-    const { verificationCode, openID4VCIClientState, didMethodPreferences = this.didMethodPreferences, issuanceOpt, accessTokenOpts } = args
+    const { verificationCode, openID4VCIClientState, didMethodPreferences, issuanceOpt, accessTokenOpts, walletType } = args
     logger.debug(`Getting credentials`, issuanceOpt, accessTokenOpts)
 
     if (!openID4VCIClientState) {
       return Promise.reject(Error('Missing openID4VCI client state in context'))
     }
 
-    const client = await OpenID4VCIClient.fromState({ state: openID4VCIClientState })
+    const client = await OpenID4VCIClientV1_0_15.fromState({ state: openID4VCIClientState })
     const credentialsSupported = await getCredentialConfigsSupportedMerged({
       client,
       vcFormatPreferences: this.vcFormatPreferences,
@@ -635,7 +635,7 @@ export class OID4VCIHolder implements IAgentPlugin {
       credentialsSupported,
       serverMetadata,
       context,
-      didMethodPreferences: Array.isArray(didMethodPreferences) && didMethodPreferences.length > 0 ? didMethodPreferences : this.didMethodPreferences,
+      didMethodPreferences: this.selectDidMethodPreferences(didMethodPreferences, walletType),
       jwtCryptographicSuitePreferences: this.jwtCryptographicSuitePreferences,
       jsonldCryptographicSuitePreferences: this.jsonldCryptographicSuitePreferences,
       ...(issuanceOpt && { forceIssuanceOpt: issuanceOpt }),
@@ -660,6 +660,15 @@ export class OID4VCIHolder implements IAgentPlugin {
     return allCredentials
   }
 
+  private selectDidMethodPreferences(didMethodPreferences: Array<SupportedDidMethodEnum> | undefined, walletType: WalletType) {
+    const supportedDidMethodEnums =
+      Array.isArray(didMethodPreferences) && didMethodPreferences.length > 0 ? didMethodPreferences : this.didMethodPreferences
+    if (walletType === 'ORGANIZATIONAL') {
+      return [SupportedDidMethodEnum.DID_WEB, ...supportedDidMethodEnums]
+    }
+    return supportedDidMethodEnums
+  }
+
   private async oid4vciHolderGetCredential(args: GetCredentialArgs, context: RequiredContext): Promise<MappedCredentialToAccept> {
     const { issuanceOpt, pin, client, accessTokenOpts } = args
     logger.info(`Getting credential`, issuanceOpt)

package/src/link-handler/index.ts

@@ -3,7 +3,7 @@ import { AuthorizationRequestOpts, AuthorizationServerClientOpts, AuthzFlowType,
 import { DefaultLinkPriorities, LinkHandlerAdapter } from '@sphereon/ssi-sdk.core'
 import { IMachineStatePersistence, interpreterStartOrResume, SerializableState } from '@sphereon/ssi-sdk.xstate-machine-persistence'
 import { IAgentContext } from '@veramo/core'
-import { GetMachineArgs, IOID4VCIHolder, OID4VCIMachineEvents, OID4VCIMachineStateNavigationListener } from '../types/IOID4VCIHolder'
+import { GetMachineArgs, IOID4VCIHolder, OID4VCIMachineEvents, OID4VCIMachineStateNavigationListener, WalletType } from '../types/IOID4VCIHolder'
 import { FirstPartyMachineStateNavigationListener } from '../types/FirstPartyMachine'
 
 /**
@@ -14,6 +14,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
   private readonly stateNavigationListener?: OID4VCIMachineStateNavigationListener
   private readonly firstPartyStateNavigationListener?: FirstPartyMachineStateNavigationListener
   private readonly noStateMachinePersistence: boolean
+  private readonly walletType: WalletType
   private readonly authorizationRequestOpts?: AuthorizationRequestOpts
   private readonly clientOpts?: AuthorizationServerClientOpts
   private readonly trustAnchors?: Array<string>
@@ -21,7 +22,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
   constructor(
     args: Pick<
       GetMachineArgs,
-      'stateNavigationListener' | 'authorizationRequestOpts' | 'clientOpts' | 'trustAnchors' | 'firstPartyStateNavigationListener'
+      'stateNavigationListener' | 'authorizationRequestOpts' | 'clientOpts' | 'trustAnchors' | 'firstPartyStateNavigationListener' | 'walletType'
     > & {
       priority?: number | DefaultLinkPriorities
       protocols?: Array<string | RegExp>
@@ -33,6 +34,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
     this.authorizationRequestOpts = args.authorizationRequestOpts
     this.clientOpts = args.clientOpts
     this.context = args.context
+    this.walletType = args.walletType ?? 'NATURAL_PERSON'
     this.noStateMachinePersistence = args.noStateMachinePersistence === true
     this.stateNavigationListener = args.stateNavigationListener
     this.firstPartyStateNavigationListener = args.firstPartyStateNavigationListener
@@ -68,6 +70,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
       ...((clientOpts.clientId || clientOpts.clientAssertionType) && { clientOpts: clientOpts as AuthorizationServerClientOpts }),
       stateNavigationListener: this.stateNavigationListener,
       firstPartyStateNavigationListener: this.firstPartyStateNavigationListener,
+      walletType: this.walletType,
     })
 
     const interpreter = oid4vciMachine.interpreter

package/src/machines/oid4vciMachine.ts

@@ -99,7 +99,7 @@ const oid4vciRequireAuthorizationGuard = (ctx: OID4VCIMachineContext, _event: OI
     throw Error('Missing openID4VCI client state in context')
   }
 
-  if (openID4VCIClientState.authorizationRequestOpts) {
+  if (openID4VCIClientState.authorizationURL && openID4VCIClientState.authorizationRequestOpts) {
     // We have authz options or there is not credential offer to begin with.
     // We require authz as long as we do not have the authz code response
     return !ctx.openID4VCIClientState?.authorizationCodeResponse
@@ -126,6 +126,7 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
     // TODO WAL-671 we need to store the data from OpenIdProvider here in the context and make sure we can restart the machine with it and init the OpenIdProvider
     accessTokenOpts: opts?.accessTokenOpts,
     requestData: opts?.requestData,
+    walletType: opts?.walletType ?? 'NATURAL_PERSON',
     trustAnchors: opts?.trustAnchors ?? [],
     issuanceOpt: opts?.issuanceOpt,
     didMethodPreferences: opts?.didMethodPreferences,
@@ -440,6 +441,10 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication,
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard,
+          },
           {
             target: OID4VCIMachineStates.initiateAuthorizationRequest,
             cond: OID4VCIMachineGuards.requireAuthorizationGuard,
@@ -512,6 +517,10 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
             target: OID4VCIMachineStates.startFirstPartApplicationFlow,
             cond: OID4VCIMachineGuards.isFirstPartyApplication,
           },
+          {
+            target: OID4VCIMachineStates.prepareAuthorizationRequest,
+            cond: OID4VCIMachineGuards.requireAuthorizationGuard,
+          },
           {
             target: OID4VCIMachineStates.verifyPin,
             cond: OID4VCIMachineGuards.requirePinGuard,

package/src/services/OID4VCIHolderService.ts

@@ -209,9 +209,7 @@ export const mapCredentialToAccept = async (args: MapCredentialToAcceptArgs): Pr
   )
   let uniformVerifiableCredential: IVerifiableCredential
   if (CredentialMapper.isSdJwtDecodedCredential(wrappedVerifiableCredential.credential)) {
-    uniformVerifiableCredential = await sdJwtDecodedCredentialToUniformCredential(
-      <SdJwtDecodedVerifiableCredential>wrappedVerifiableCredential.credential,
-    )
+    uniformVerifiableCredential = sdJwtDecodedCredentialToUniformCredential(<SdJwtDecodedVerifiableCredential>wrappedVerifiableCredential.credential)
   } else if (CredentialMapper.isSdJwtEncoded(wrappedVerifiableCredential.credential)) {
     if (!hasher) {
       return Promise.reject('a hasher is required for encoded SD-JWT credentials')
@@ -384,7 +382,7 @@ export const getCredentialConfigsSupportedBySingleTypeOrId = async (
   }
 
   if (configurationId) {
-    const allSupported = client.getCredentialsSupported(format)
+    const allSupported = client.getCredentialsSupported(undefined, format)
     return Object.fromEntries(
       Object.entries(allSupported).filter(
         ([id, supported]) => id === configurationId || supported.id === configurationId || createIdFromTypes(supported) === configurationId,

package/src/types/IOID4VCIHolder.ts

@@ -1,4 +1,5 @@
-import { OpenID4VCIClient, OpenID4VCIClientState } from '@sphereon/oid4vci-client'
+import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common'
+import { OpenID4VCIClientState, OpenID4VCIClientV1_0_15 } from '@sphereon/oid4vci-client'
 import {
   AuthorizationRequestOpts,
   AuthorizationResponse,
@@ -15,7 +16,6 @@ import {
   MetadataDisplay,
   NotificationRequest,
 } from '@sphereon/oid4vci-common'
-import { DynamicRegistrationClientMetadata } from '@sphereon/oid4vc-common'
 import { CreateOrGetIdentifierOpts, IdentifierProviderOpts, SupportedDidMethodEnum } from '@sphereon/ssi-sdk-ext.did-utils'
 import {
   IIdentifierResolution,
@@ -26,6 +26,7 @@ import {
 import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
 import { IContactManager } from '@sphereon/ssi-sdk.contact-manager'
 import { ICredentialStore } from '@sphereon/ssi-sdk.credential-store'
+import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation'
 import {
   DigitalCredential,
   IBasicCredentialClaim,
@@ -38,7 +39,6 @@ import {
 import { IIssuanceBranding } from '@sphereon/ssi-sdk.issuance-branding'
 import { ImDLMdoc } from '@sphereon/ssi-sdk.mdl-mdoc'
 import { ISDJwtPlugin } from '@sphereon/ssi-sdk.sd-jwt'
-import { ICredentialValidation, SchemaValidation } from '@sphereon/ssi-sdk.credential-validation'
 import { IDidAuthSiopOpAuthenticator } from '@sphereon/ssi-sdk.siopv2-oid4vp-op-auth'
 import {
   HasherSync,
@@ -136,6 +136,7 @@ export type OnIdentifierCreatedArgs = {
 
 export type GetMachineArgs = {
   requestData: RequestData
+  walletType: WalletType
   trustAnchors?: Array<string>
   authorizationRequestOpts?: AuthorizationRequestOpts
   clientOpts?: AuthorizationServerClientOpts
@@ -157,7 +158,7 @@ export type CreateCredentialsToSelectFromArgs = Pick<
 export type GetContactArgs = Pick<OID4VCIMachineContext, 'serverMetadata'>
 export type GetCredentialsArgs = Pick<
   OID4VCIMachineContext,
-  'verificationCode' | 'openID4VCIClientState' | 'selectedCredentials' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts'
+  'verificationCode' | 'openID4VCIClientState' | 'selectedCredentials' | 'didMethodPreferences' | 'issuanceOpt' | 'accessTokenOpts' | 'walletType'
 >
 export type AddContactIdentityArgs = Pick<OID4VCIMachineContext, 'credentialsToAccept' | 'contact'>
 export type GetIssuerBrandingArgs = Pick<OID4VCIMachineContext, 'serverMetadata' | 'contact'>
@@ -233,6 +234,7 @@ export type OID4VCIMachineContext = {
   openID4VCIClientState?: OpenID4VCIClientState
   credentialToSelectFrom: Array<CredentialToSelectFromResult>
   contactAlias: string
+  walletType: WalletType
   contact?: Party
   selectedCredentials: Array<string>
   credentialsToAccept: Array<MappedCredentialToAccept>
@@ -316,6 +318,7 @@ export type OID4VCIStateMachine = StateMachine<
 
 export type CreateOID4VCIMachineOpts = {
   requestData: RequestData
+  walletType: WalletType
   machineName?: string
   locale?: string
   trustAnchors?: Array<string>
@@ -514,7 +517,7 @@ export type CredentialToAccept = {
 }
 
 export type GetCredentialConfigsSupportedArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   vcFormatPreferences: Array<string>
   format?: Array<string>
   types?: Array<Array<string>>
@@ -526,7 +529,7 @@ export type GetCredentialConfigsSupportedArgs = {
  * It can potentially return multiple results mainly because of different formats.
  */
 export type GetCredentialConfigsSupportedBySingleTypeOrIdArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   vcFormatPreferences: Array<string>
   format?: string[]
   types?: string[]
@@ -561,7 +564,7 @@ export type GetDefaultIssuanceOptsArgs = {
 }
 
 export type DefaultIssuanceOpts = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
 }
 
 export type GetIdentifierArgs = {
@@ -598,7 +601,7 @@ export type CreateIdentifierCreateOpts = {
 }
 
 export type GetIssuanceOptsArgs = {
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   credentialsSupported: Record<string, CredentialConfigurationSupported>
   serverMetadata: EndpointMetadataResult
   context: RequiredContext
@@ -610,13 +613,13 @@ export type GetIssuanceOptsArgs = {
 
 export type GetIssuanceDidMethodArgs = {
   credentialSupported: CredentialConfigurationSupported
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   didMethodPreferences: Array<SupportedDidMethodEnum>
 }
 
 export type GetIssuanceCryptoSuiteArgs = {
   credentialSupported: CredentialConfigurationSupported
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   jwtCryptographicSuitePreferences: Array<JoseSignatureAlgorithm | JoseSignatureAlgorithmString>
   jsonldCryptographicSuitePreferences: Array<string>
 }
@@ -624,7 +627,7 @@ export type GetIssuanceCryptoSuiteArgs = {
 export type GetCredentialArgs = {
   pin?: string
   issuanceOpt: IssuanceOpts
-  client: OpenID4VCIClient
+  client: OpenID4VCIClientV1_0_15
   accessTokenOpts?: AccessTokenOpts
 }
 
@@ -728,6 +731,8 @@ export type DynamicRegistrationClientMetadataDisplay = Pick<
   'client_name' | 'client_uri' | 'contacts' | 'tos_uri' | 'policy_uri' | 'logo_uri'
 >
 
+export type WalletType = 'NATURAL_PERSON' | 'ORGANIZATIONAL'
+
 export type DidAgents = TAgent<IResolver & IDIDManager>
 
 export type RequiredContext = IAgentContext<