@cef-ebsi/cli 0.1.1 → 1.0.0-alpha.0

package/dist/scripts/bootstrap/3-populateTAR

@@ -10,23 +10,6 @@ proxyledger tar insertApp trusted-schemas-registry-api
 proxyledger tar insertApp ebsi-core-services
 proxyledger tar insertApp authorisation-api
 
-## Insert specific apps
-proxyledger tar insertApp did-registry-api_pilot-temp-01
-proxyledger tar insertApp timestamp-api_pilot-temp-01
-proxyledger tar insertApp trusted-issuers-registry-api_pilot-temp-01
-proxyledger tar insertApp trusted-policies-registry-api_pilot-temp-01
-proxyledger tar insertApp trusted-schemas-registry-api_pilot-temp-01
-proxyledger tar insertApp authorisation-api_pilot-temp-01
-proxyledger tar insertApp test-app-pilot1
-proxyledger tar insertApp test-app-pilot2
-
-## Insert apps for e2e tests
-proxyledger tar insertApp did-registry-api_pilot-test-01
-proxyledger tar insertApp timestamp-api_pilot-test-01
-proxyledger tar insertApp trusted-issuers-registry-api_pilot-test-01
-proxyledger tar insertApp trusted-policies-registry-api_pilot-test-01
-proxyledger tar insertApp trusted-schemas-registry-api_pilot-test-01
-
 ## Authorizations between apps
 
 # APIs that need to access the blockchain through ledger-api
@@ -41,32 +24,3 @@ proxyledger tar insertAuthorization ledger-api trusted-schemas-registry-api
 # With regarding users, each API will authorize tokens issued by
 # authorisation-api, and the set of API is defined as ebsi-core-services
 proxyledger tar insertAuthorization ebsi-core-services authorisation-api
-
-# Authorisations for testing purposes
-proxyledger tar insertAuthorization test-app-pilot1 test-app-pilot2
-proxyledger tar insertAuthorization ledger-api test-app-pilot2
-
-## Define public keys for APIs using the old version (generic apps)
-proxyledger tar insertAppPublicKey 0x8d508a564259616f0f035a5ac6b5f8c3f4223163261b2b3a07c8f3df9b08cbdd <PRIVATE-KEY> # did-registry-api
-proxyledger tar insertAppPublicKey 0xee52082af8acb4a3d78b668bb6ec2809e58e2b5c0c6612c92d872e18289951fc <PRIVATE-KEY> # timestamp-api
-proxyledger tar insertAppPublicKey 0x1795ede2b64392744b86bcf7d5af61aa783def0dbab758ed3b2670d6be130268 <PRIVATE-KEY> # trusted-issuers-registry-api
-proxyledger tar insertAppPublicKey 0xbeed83fa6ecc88546cb8cba6c370ad12b1136fc54cb347b583adf8446594d33f <PRIVATE-KEY> # trusted-policies-registry-api
-proxyledger tar insertAppPublicKey 0x462230ee44ba7f75752d829e359f7fc6dc495038440a0767e62d93dc30c98c47 <PRIVATE-KEY> # trusted-schemas-registry-api
-proxyledger tar insertAppPublicKey 0x559c4f32dc35566e4b92b697499c38f3847a6c53f8344821c24354ead1f2ab1e <PRIVATE-KEY> # authorisation-api
-
-## Define public keys for APIs using the latest version
-proxyledger tar insertAppPublicKey 0xf8e19211b5255735c5264eda71b3fb52586503c4a48b0a727745fc618682043b <PRIVATE-KEY> # did-registry-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0x270321e53c610ec9a13e2fd823c393820960cf32a37309ec98808bffa69c7147 <PRIVATE-KEY> # timestamp-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0xe385c4eb306b7a46798638cf63bd6ceceee470861d1d74490b0e624e93000756 <PRIVATE-KEY> # trusted-issuers-registry-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0xa5bbd1dee2410ac8da4a998aec3ee0226ede6a0ad5b62207e053e7e4567e6a12 <PRIVATE-KEY> # trusted-policies-registry-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0xdb53a0e9d547bb4ce64099d755a75bd2f0f07462c7b56e9dcc8c4710766cd2cb <PRIVATE-KEY> # trusted-schemas-registry-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0x6295c85baca8d6957cc975c100535eeae0086f768e79829f548ce981393557c8 <PRIVATE-KEY> # authorisation-api_pilot-temp-01
-proxyledger tar insertAppPublicKey 0x6e59a3303d47da29eac1ab6bd90244845fe8dbb8b82ab95baaee30f0a6d2b045 <PRIVATE-KEY> # test-app-pilot1
-proxyledger tar insertAppPublicKey 0x7b2506e8d27a8b26566e25b109302ffafc5c1972e484d568906b74eff606f275 <PRIVATE-KEY> # test-app-pilot2
-
-## Define public keys for APIs used in e2e tests
-proxyledger tar insertAppPublicKey 0xde146ccd61b7f99abd9b7da87df81f03cb2ff313a43d29c68262e0862c4ba7ba <PRIVATE-KEY> # did-registry-api_pilot-test-01
-proxyledger tar insertAppPublicKey 0x38c974c33a877f2725046b05ff9d762809d3f8c0392bd3be31803ca2ddecf86b <PRIVATE-KEY> # timestamp-api_pilot-test-01
-proxyledger tar insertAppPublicKey 0x62c2b561c7f8c98795b8db9dff1c304c83ba5988664a40c561d92fe146009848 <PRIVATE-KEY> # trusted-issuers-registry-api_pilot-test-01
-proxyledger tar insertAppPublicKey 0xdf1f9efa300761aae5b586c6e8775ff3413cab87caf412e9e0876e84371d68cf <PRIVATE-KEY> # trusted-policies-registry-api_pilot-test-01
-proxyledger tar insertAppPublicKey 0x16b7cf8141898ad870d8342c5b79e46bb550f139462dda6da99742b63032ba22 <PRIVATE-KEY> # trusted-schemas-registry-api_pilot-test-01

package/dist/scripts/bootstrap/4-populateTimestamp

@@ -1,6 +1,5 @@
 run bootstrap/0b-loadAdmin
 
-proxyledger timestamp insertHashAlgorithm 256 sha-256 2.16.840.1.101.3.4.2.1 1 sha2-256
 proxyledger timestamp insertHashAlgorithm 256 sha-256 2.16.840.1.101.3.4.2.1 1 sha2-256
 proxyledger timestamp insertHashAlgorithm 384 sha-384 2.16.840.1.101.3.4.2.2 1 sha2-384
 proxyledger timestamp insertHashAlgorithm 512 sha-512 2.16.840.1.101.3.4.2.3 1 sha2-512

package/dist/scripts/bootstrap/6-populateTSR

@@ -1,22 +1,81 @@
 # before running the script download the schemas and put them in scripts/local/schemas
 run bootstrap/0b-loadAdmin
 
-attestation_2022-11: load local/schemas/ebsi-attestation/2022-11/schema.json
-attestation_2022-11_01: load local/schemas/ebsi-attestation/2022-11_01/schema.json
-id_attestation_2022-11_01: compute schemaId attestation_2022-11_01
-presentation_2022-11: load local/schemas/ebsi-presentation/2022-11/schema.json
+# schemas that do not depend on others
+schema1: load scripts/local/schemas/ebsi-attestation/2022-11/schema.json
+schema2: load scripts/local/schemas/ebsi-attestation/2022-11_01/schema.json
+schema3: load scripts/local/schemas/ebsi-presentation/2022-11/schema.json
+schema4: load scripts/local/schemas/type-extensions/credentialStatus/StatusList2021/2022-11_01/schema.json
+schema5: load scripts/local/schemas/type-extensions/termsOfUse/AccreditationPolicy/2023-04/schema.json
+schema6: load scripts/local/schemas/type-extensions/termsOfUse/IssuanceCertificate/2022-11_01/schema.json
+schema7: load scripts/local/schemas/type-extensions/termsOfUse/TrustFrameworkPolicy/2023-04/schema.json
 
-accreditation_2022-11_01: load local/schemas/ebsi-accreditation/2022-11_01/schema.json
-set accreditation_2022-11_01.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+id_attestation_2022-11: compute schemaId schema1
+id_attestation_2022-11_01: compute schemaId schema2
 
-accreditation_2023-04: load local/schemas/ebsi-accreditation/2023-04-11/schema.json
-set accreditation_2023-04.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+# schemas with id_attestation_2022-11_01
+schema8: load scripts/local/schemas/ebsi-accreditation/2022-11_01/schema.json
+schema9: load scripts/local/schemas/ebsi-accreditation/2023-04/schema.json
+schema10: load scripts/local/schemas/ebsi-ct-qualification/2023-05/schema.json
+schema11: load scripts/local/schemas/ebsi-essp/pda1/2022-11_01/schema.json
+schema12: load scripts/local/schemas/ebsi-euipo/certificate-of-trademark-registration/2023-02/schema.json
+schema13: load scripts/local/schemas/ebsi-muti-uni-pilot/my-academic-id/2023-05/schema.json
+schema14: load scripts/local/schemas/ebsi-revocation-statuslist/2022-11_01/schema.json
 
-proxyledger tsr insertSchema attestation_2022-11 {}
-proxyledger tsr insertSchema attestation_2022-11_01 {}
+set schema8.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema9.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema10.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema11.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema12.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema13.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
+set schema14.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11_01
 
-# skip these commands for later if TSR API v3 is not ready
-proxyledger tsr insertSchema accreditation_2022-11_01 {}
-proxyledger tsr insertSchema accreditation_2023-04 {}
+# schemas with id_attestation_2022-11
+schema15: load scripts/local/schemas/ebsi-essp/pda1/2022-11/schema.json
+schema16: load scripts/local/schemas/ebsi-muti-uni-pilot/education-verifiable-accreditation-records/2022-11/schema.json
+schema17: load scripts/local/schemas/ebsi-muti-uni-pilot/verifiable-attestation-individual-id/2022-11/schema.json
+schema18: load scripts/local/schemas/ebsi-muti-uni-pilot/verifiable-attestation-organisational-id/2022-11/schema.json
+schema19: load scripts/local/schemas/ebsi-muti-uni-pilot/verifiable-diploma/2022-11/schema.json
+schema20: load scripts/local/schemas/ebsi-revocation-statuslist/2022-11/schema.json
+schema21: load scripts/local/schemas/ebsi-verifiable-authorisation/2022-11/schema.json
+schema22: load scripts/local/schemas/ebsi-vid/legal-entity/2022-11/schema.json
+schema23: load scripts/local/schemas/ebsi-vid/natural-person/2022-11/schema.json
+schema24: load scripts/local/schemas/ebsi-vid/verifiable-authorisation/2022-11/schema.json
+
+set schema15.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema16.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema17.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema18.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema19.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema20.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema21.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema22.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema23.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
+set schema24.allOf.0.$ref SET_DOMAIN /trusted-schemas-registry/v3/schemas/ id_attestation_2022-11
 
-# the rest of the schemas can be inserted from the json-schema repository
+proxyledger tsr insertSchema schema1 {}
+proxyledger tsr insertSchema schema2 {}
+proxyledger tsr insertSchema schema3 {}
+proxyledger tsr insertSchema schema4 {}
+proxyledger tsr insertSchema schema5 {}
+proxyledger tsr insertSchema schema6 {}
+proxyledger tsr insertSchema schema7 {}
+
+# skip these commands for later if TSR API v3 is not ready
+proxyledger tsr insertSchema schema8 {}
+proxyledger tsr insertSchema schema9 {}
+proxyledger tsr insertSchema schema10 {}
+proxyledger tsr insertSchema schema11 {}
+proxyledger tsr insertSchema schema12 {}
+proxyledger tsr insertSchema schema13 {}
+proxyledger tsr insertSchema schema14 {}
+proxyledger tsr insertSchema schema15 {}
+proxyledger tsr insertSchema schema16 {}
+proxyledger tsr insertSchema schema17 {}
+proxyledger tsr insertSchema schema18 {}
+#proxyledger tsr insertSchema schema19 {} # skip
+proxyledger tsr insertSchema schema20 {}
+proxyledger tsr insertSchema schema21 {}
+proxyledger tsr insertSchema schema22 {}
+proxyledger tsr insertSchema schema23 {}
+proxyledger tsr insertSchema schema24 {}

package/dist/scripts/issue_CTRevocableCredential

@@ -6,8 +6,8 @@ payloadCTRevocableCredential: load assets/CTRevocableCredential.json
 set payloadCTRevocableCredential.issuer $1
 set payloadCTRevocableCredential.credentialSubject.id $2
 set payloadCTRevocableCredential.termsOfUse.id $3
-set payloadCTRevocableCredential.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
-set payloadCTRevocableCredential.credentialStatus.id domain /trusted-issuers-registry/v4/issuers/ user.did /proxies/ $4 /credentials/status/ $5
+set payloadCTRevocableCredential.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadCTRevocableCredential.credentialStatus.id domain /trusted-issuers-registry/v5/issuers/ user.did /proxies/ $4 /credentials/status/ $5
 set payloadCTRevocableCredential.credentialStatus.statusListIndex $6
-set payloadCTRevocableCredential.credentialStatus.statusListCredential domain /trusted-issuers-registry/v4/issuers/ user.did /proxies/ $4 /credentials/status/ $5
+set payloadCTRevocableCredential.credentialStatus.statusListCredential domain /trusted-issuers-registry/v5/issuers/ user.did /proxies/ $4 /credentials/status/ $5
 compute createVcJwt payloadCTRevocableCredential {} ES256

package/dist/scripts/issue_SelfAttestationSupportOffice

@@ -5,7 +5,7 @@
 payloadVc: load assets/CredentialToAttestVerifiableAuthorisationForTrustChain.json
 set payloadVc.issuer $1
 set payloadVc.credentialSubject.id $1
-set payloadVc.credentialSubject.accreditedFor[0].schemaId domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
-set payloadVc.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe
+set payloadVc.credentialSubject.accreditedFor[0].schemaId domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVc.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/zjVFNvbEBPAr3a724DttioZpgZmNr75BBtRzZqk7pkDe
 set payloadVc.credentialSubject.reservedAttributeId $2
 compute createVcJwt payloadVc {} ES256

package/dist/scripts/issue_VerifiableAccreditationToAccredit

@@ -5,8 +5,8 @@
 payloadVcTAO: load assets/VerifiableAccreditationToAccredit.json
 set payloadVcTAO.issuer $1
 set payloadVcTAO.credentialSubject.id $2
-set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSubject.accreditedFor.0.schemaId domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 set payloadVcTAO.termsOfUse.0.id $3
-set payloadVcTAO.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTAO.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 set payloadVcTAO.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcTAO {} ES256

package/dist/scripts/issue_VerifiableAccreditationToAttest

@@ -5,8 +5,8 @@
 payloadVcTI: load assets/VerifiableAccreditationToAttest.json
 set payloadVcTI.issuer $1
 set payloadVcTI.credentialSubject.id $2
-set payloadVcTI.credentialSubject.accreditedFor.0.schemaId domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSubject.accreditedFor.0.schemaId domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 set payloadVcTI.termsOfUse.id $3
-set payloadVcTI.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcTI.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 set payloadVcTI.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcTI {} ES256

package/dist/scripts/issue_VerifiableAuthorisationForTrustChain

@@ -6,6 +6,6 @@ payloadVcRootTAO: load assets/VerifiableAuthorisationForTrustChain.json
 set payloadVcRootTAO.issuer $1
 set payloadVcRootTAO.credentialSubject.id $2
 set payloadVcRootTAO.termsOfUse.id $3
-set payloadVcRootTAO.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcRootTAO.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 set payloadVcRootTAO.credentialSubject.reservedAttributeId $4
 compute createVcJwt payloadVcRootTAO {} ES256

package/dist/scripts/issue_VerifiableAuthorisationToOnboard

@@ -6,5 +6,5 @@ payloadVcOnboard: load assets/VerifiableAuthorisationToOnboard.json
 set payloadVcOnboard.issuer $1
 set payloadVcOnboard.credentialSubject.id $2
 set payloadVcOnboard.termsOfUse.id $3
-set payloadVcOnboard.credentialSchema.id domain /trusted-schemas-registry/v2/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
+set payloadVcOnboard.credentialSchema.id domain /trusted-schemas-registry/v3/schemas/z3MgUFUkb722uq4x3dv5yAJmnNmzDFeK5UC8x83QoeLJM
 compute createVcJwt payloadVcOnboard {} ES256

package/dist/scripts/wctv3/accreditAndAuthorize

@@ -23,7 +23,7 @@ conformance check ti_request_verifiable_accreditation_to_attest
 t: authorisation auth tir_invite_presentation ES256 vcTI.vc
 using token t.access_token
 tir setAttributeData myIssuer.did vcTI.reservedAttributeId vcTI.vc
-set vcTI.url https://api-test.ebsi.eu/trusted-issuers-registry/v4/issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
+set vcTI.url https://api-test.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTI.reservedAttributeId
 conformance check ti_register_verifiable_accreditation_to_attest
 
 # create a proxy
@@ -45,7 +45,7 @@ conformance check ti_request_ctrevocable
 conformance check ti_validate_ctrevocable
 
 # revoke credential
-statusListIndex: compute statusListIndex did:ebsi:zy8jAhPDbhwKN74YFWAUzD5
+statusListIndex: compute statusListIndex did:ebsi:ztTYEydcPQ2SrKoghHqxBfK
 conformance clientMockUpdateList 1 statusListIndex 1
 conformance check ti_revoke_ctrevocable
 
@@ -57,7 +57,7 @@ conformance check tao_request_verifiable_accreditation_to_accredit
 t: authorisation auth tir_write_presentation ES256
 using token t.access_token
 tir setAttributeData myIssuer.did vcTAO.reservedAttributeId vcTAO.vc
-set vcTAO.url https://api-test.ebsi.eu/trusted-issuers-registry/v4/issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
+set vcTAO.url https://api-test.ebsi.eu/trusted-issuers-registry/v5/issuers/ myIssuer.did /attributes/ vcTAO.reservedAttributeId
 set user.accreditationUrl vcTAO.url
 conformance clientMockInitiate
 conformance check tao_register_verifiable_accreditation_to_accredit

package/dist/scripts/wctv3/holderWallet

@@ -1,22 +1,28 @@
 using user ES256 did2
 
-c0: conformance holder CTWalletCrossInTime inTime
-conformance check ct_wallet_cross_in_time
+c0: conformance holder CTWalletCrossAuthorisedInTime authorisedInTime
+conformance check ct_wallet_cross_authorised_in_time
 
-c1: conformance holder CTWalletCrossDeferred deferred
-conformance check ct_wallet_cross_deferred
+c1: conformance holder CTWalletCrossAuthorisedDeferred authorisedDeferred
+conformance check ct_wallet_cross_authorised_deferred
 
-c2: conformance holder CTWalletCrossPreAuthorised preAuthorised
-conformance check ct_wallet_cross_pre_authorised
+c2: conformance holder CTWalletCrossPreAuthorisedInTime preAuthorisedInTime
+conformance check ct_wallet_cross_pre_authorised_in_time
 
-c3: conformance holder CTWalletSameInTime inTime
-conformance check ct_wallet_same_in_time
+c3: conformance holder CTWalletCrossPreAuthorisedDeferred preAuthorisedDeferred
+conformance check ct_wallet_cross_pre_authorised_deferred
 
-c4: conformance holder CTWalletSameDeferred deferred
-conformance check ct_wallet_same_deferred
+c4: conformance holder CTWalletSameAuthorisedInTime authorisedInTime
+conformance check ct_wallet_same_authorised_in_time
 
-c5: conformance holder CTWalletSamePreAuthorised preAuthorised
-conformance check ct_wallet_same_pre_authorised
+c5: conformance holder CTWalletSameAuthorisedDeferred authorisedDeferred
+conformance check ct_wallet_same_authorised_deferred
+
+c6: conformance holder CTWalletSamePreAuthorisedInTime preAuthorisedInTime
+conformance check ct_wallet_same_pre_authorised_in_time
+
+c7: conformance holder CTWalletSamePreAuthorisedDeferred preAuthorisedDeferred
+conformance check ct_wallet_same_pre_authorised_deferred
 
 set credentials []
 set credentials.0 c0
@@ -25,5 +31,8 @@ set credentials.2 c2
 set credentials.3 c3
 set credentials.4 c4
 set credentials.5 c5
-conformance holder CTWalletQualificationCredential inTime ES256 credentials
+set credentials.6 c6
+set credentials.7 c7
+
+conformance holder CTWalletQualificationCredential authorisedInTime ES256 credentials
 conformance check request_ct_wallet_qualification_credential

package/dist/scripts/wctv3/issueToHolder

@@ -5,23 +5,33 @@ conformance clientMockInitiate
 jwks: conformance get /issuer-mock/jwks
 issuerMockDidNP: compute did2 jwks.keys.0
 
-set preAuthPayload {"authorization_details":[{"type":"openid_credential","format":"jwt_vc","types":["VerifiableCredential","VerifiableAttestation","CTWalletSamePreAuthorised"],"locations":[""]}]}
-set preAuthPayload.iss user.clientId
-set preAuthPayload.sub issuerMockDidNP
-set preAuthPayload.client_id issuerMockDidNP
-set preAuthPayload.authorization_details[0].locations[0] user.clientId
+set preAuthInTimePayload {"authorization_details":[{"type":"openid_credential","format":"jwt_vc","types":["VerifiableCredential","VerifiableAttestation","CTWalletSamePreAuthorisedInTime"],"locations":[""]}]}
+set preAuthInTimePayload.iss user.clientId
+set preAuthInTimePayload.sub issuerMockDidNP
+set preAuthInTimePayload.client_id issuerMockDidNP
+set preAuthInTimePayload.authorization_details[0].locations[0] user.clientId
 set preAuthHeaders {}
 set preAuthHeaders.kid user.keys.ES256.id
-preAuthorizedCode: compute signJwt preAuthPayload ES256 preAuthHeaders
+preAuthorizedInTimeCode: compute signJwt preAuthInTimePayload ES256 preAuthHeaders
+
+set preAuthDeferredPayload {"authorization_details":[{"type":"openid_credential","format":"jwt_vc","types":["VerifiableCredential","VerifiableAttestation","CTWalletSamePreAuthorisedDeferred"],"locations":[""]}]}
+set preAuthDeferredPayload.iss user.clientId
+set preAuthDeferredPayload.sub issuerMockDidNP
+set preAuthDeferredPayload.client_id issuerMockDidNP
+set preAuthDeferredPayload.authorization_details[0].locations[0] user.clientId
+preAuthorizedDeferredCode: compute signJwt preAuthDeferredPayload ES256 preAuthHeaders
+
 userPin: compute userPin issuerMockDidNP
 
-conformance check issue_to_holder_initiate_ct_wallet_same_in_time
-conformance check issue_to_holder_validate_ct_wallet_same_in_time
-conformance check issue_to_holder_initiate_ct_wallet_same_deferred
-conformance check issue_to_holder_validate_ct_wallet_same_deferred
-conformance check issue_to_holder_initiate_ct_wallet_same_pre_authorised preAuthorizedCode userPin
-conformance check issue_to_holder_validate_ct_wallet_same_pre_authorised preAuthorizedCode userPin
+conformance check issue_to_holder_initiate_ct_wallet_same_authorised_in_time
+conformance check issue_to_holder_validate_ct_wallet_same_authorised_in_time
+conformance check issue_to_holder_initiate_ct_wallet_same_authorised_deferred
+conformance check issue_to_holder_validate_ct_wallet_same_authorised_deferred
+conformance check issue_to_holder_initiate_ct_wallet_same_pre_authorised_in_time preAuthorizedInTimeCode userPin
+conformance check issue_to_holder_validate_ct_wallet_same_pre_authorised_in_time preAuthorizedInTimeCode userPin
+conformance check issue_to_holder_initiate_ct_wallet_same_pre_authorised_deferred preAuthorizedDeferredCode userPin
+conformance check issue_to_holder_validate_ct_wallet_same_pre_authorised_deferred preAuthorizedDeferredCode userPin
 
 compute wait 11
-conformance holder CTIssueQualificationCredential inTime ES256 empty skip-credential-offer
+conformance holder CTIssueQualificationCredential authorisedInTime ES256 empty skip-credential-offer
 conformance check request_ct_issue_to_holder_qualification_credential

package/dist/scripts/wctv3/pda1

@@ -1,2 +1,2 @@
 using user ES256 did2
-cPda1: conformance holder VerifiablePortableDocumentA1 deferred
+cPda1: conformance holder VerifiablePortableDocumentA1 authorisedDeferred