From bc9505fcb5e6c6151711dc3ee5ae219b47acaf46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 May 2026 13:26:47 +0000 Subject: [PATCH 1/6] chore(deps): update docker - updates --- Dockerfile | 2 +- docker-compose.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 809c5a4c..d272be77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.23 +# syntax=docker/dockerfile:1.24 FROM node:24-alpine AS builder WORKDIR /veritable-ui diff --git a/docker-compose.yml b/docker-compose.yml index 948317dd..b647cab6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: # -------------------- shared -------------------------------# keycloak: - image: quay.io/keycloak/keycloak:26.6.1 + image: quay.io/keycloak/keycloak:26.6.2 container_name: keycloak environment: - KC_BOOTSTRAP_ADMIN_USERNAME=admin @@ -79,7 +79,7 @@ services: - OPEN_CORPORATES_API_URL=http://wiremock:8080 - OPEN_CORPORATES_API_KEY=${OPEN_CORPORATES_API_KEY} postgres-veritable-ui-alice: - image: postgres:18.3-alpine + image: postgres:18.4-alpine container_name: postgres-veritable-ui-alice ports: - 5432:5432 @@ -91,7 +91,7 @@ services: - POSTGRES_DB=veritable-ui postgres-veritable-cloudagent-alice: container_name: postgres-veritable-cloudagent-alice - image: postgres:18.3-alpine + image: postgres:18.4-alpine restart: on-failure volumes: - postgres-veritable-cloudagent-alice:/var/lib/postgresql @@ -100,7 +100,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-alice: - image: digicatapult/veritable-cloudagent:v0.18.30 + image: digicatapult/veritable-cloudagent:v0.19.5 container_name: veritable-cloudagent-alice restart: always depends_on: @@ -177,7 +177,7 @@ services: - LOCAL_REGISTRY_COUNTRY_CODE=GB postgres-veritable-ui-bob: - image: postgres:18.3-alpine + image: postgres:18.4-alpine container_name: postgres-veritable-ui-bob ports: - 5433:5432 @@ -189,7 +189,7 @@ services: - POSTGRES_DB=veritable-ui postgres-veritable-cloudagent-bob: container_name: postgres-veritable-cloudagent-bob - image: postgres:18.3-alpine + image: postgres:18.4-alpine restart: on-failure volumes: - postgres-veritable-cloudagent-bob:/var/lib/postgresql @@ -198,7 +198,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-bob: - image: digicatapult/veritable-cloudagent:v0.18.30 + image: digicatapult/veritable-cloudagent:v0.19.5 container_name: veritable-cloudagent-bob restart: always depends_on: @@ -275,7 +275,7 @@ services: - OPEN_CORPORATES_API_KEY=${OPEN_CORPORATES_API_KEY} postgres-veritable-ui-charlie: - image: postgres:18.3-alpine + image: postgres:18.4-alpine container_name: postgres-veritable-ui-charlie ports: - 5434:5432 @@ -287,7 +287,7 @@ services: - POSTGRES_DB=veritable-ui postgres-veritable-cloudagent-charlie: container_name: postgres-veritable-cloudagent-charlie - image: postgres:18.3-alpine + image: postgres:18.4-alpine restart: on-failure volumes: - postgres-veritable-cloudagent-charlie:/var/lib/postgresql @@ -296,7 +296,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-charlie: - image: digicatapult/veritable-cloudagent:v0.18.30 + image: digicatapult/veritable-cloudagent:v0.19.5 container_name: veritable-cloudagent-charlie restart: always depends_on: From 488650c89112634d035b8be4d0ea754109000c87 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 26 May 2026 14:52:08 +0100 Subject: [PATCH 2/6] cloudagent updates --- src/models/__tests__/credentialSchema.test.ts | 6 +++--- src/models/credentialSchema.ts | 2 +- src/models/veritableCloudagent/internal.ts | 3 ++- .../credentialEvents/__tests__/index.test.ts | 4 ++-- src/services/credentialEvents/index.ts | 6 +++--- src/services/veritableCloudagentEvents.ts | 14 +++++++------- test/integration/pinVerification.test.ts | 12 ++++++------ 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/models/__tests__/credentialSchema.test.ts b/src/models/__tests__/credentialSchema.test.ts index 0364dc74..d5df7847 100644 --- a/src/models/__tests__/credentialSchema.test.ts +++ b/src/models/__tests__/credentialSchema.test.ts @@ -27,7 +27,7 @@ describe('credentialSchema', function () { }) expect(getCreatedDids.callCount).to.equal(0) expect(createDid.callCount).to.equal(1) - expect(createDid.firstCall.args).deep.equal(['key', { keyType: 'ed25519' }]) + expect(createDid.firstCall.args).deep.equal(['key', { createKey: { type: { kty: 'OKP', crv: 'Ed25519' } } }]) }) test('policy = CREATE_NEW, has existing = true', async function () { @@ -50,7 +50,7 @@ describe('credentialSchema', function () { }) expect(getCreatedDids.callCount).to.equal(0) expect(createDid.callCount).to.equal(1) - expect(createDid.firstCall.args).deep.equal(['key', { keyType: 'ed25519' }]) + expect(createDid.firstCall.args).deep.equal(['key', { createKey: { type: { kty: 'OKP', crv: 'Ed25519' } } }]) }) test('policy = FIND_EXISTING, has existing = false', async function () { @@ -140,7 +140,7 @@ describe('credentialSchema', function () { expect(getCreatedDids.callCount).to.equal(1) expect(getCreatedDids.firstCall.args).deep.equal([{ method: 'key' }]) expect(createDid.callCount).to.equal(1) - expect(createDid.firstCall.args).deep.equal(['key', { keyType: 'ed25519' }]) + expect(createDid.firstCall.args).deep.equal(['key', { createKey: { type: { kty: 'OKP', crv: 'Ed25519' } } }]) }) }) diff --git a/src/models/credentialSchema.ts b/src/models/credentialSchema.ts index b0fe3435..8712bcd7 100644 --- a/src/models/credentialSchema.ts +++ b/src/models/credentialSchema.ts @@ -41,7 +41,7 @@ export class CredentialSchema { } if (policy === 'CREATE_NEW' || policy === 'EXISTING_OR_NEW') { - const result = await this.cloudagent.createDid('key', { keyType: 'ed25519' }) + const result = await this.cloudagent.createDid('key', { createKey: { type: { kty: 'OKP', crv: 'Ed25519' } } }) return result.id } diff --git a/src/models/veritableCloudagent/internal.ts b/src/models/veritableCloudagent/internal.ts index 3d49eaa1..71bc0361 100644 --- a/src/models/veritableCloudagent/internal.ts +++ b/src/models/veritableCloudagent/internal.ts @@ -244,6 +244,7 @@ export default class VeritableCloudagentInt): Promise { + public async createDid(method: string, options: Record): Promise { return this.postRequest('/v1/dids/create', { method, options }, this.buildParser(didCreateParser)).then( (res) => res.didDocument ) diff --git a/src/services/credentialEvents/__tests__/index.test.ts b/src/services/credentialEvents/__tests__/index.test.ts index c7923718..b3e63236 100644 --- a/src/services/credentialEvents/__tests__/index.test.ts +++ b/src/services/credentialEvents/__tests__/index.test.ts @@ -33,9 +33,9 @@ describe('credentialEvents', function () { const credentialEvents = new CredentialEvents(...deps.args) credentialEvents.start() - deps.eventMock.emit('CredentialStateChanged', { + deps.eventMock.emit('DidCommCredentialStateChanged', { payload: { - credentialRecord, + credentialExchangeRecord: credentialRecord, }, }) diff --git a/src/services/credentialEvents/index.ts b/src/services/credentialEvents/index.ts index 48256fb0..8c52f880 100644 --- a/src/services/credentialEvents/index.ts +++ b/src/services/credentialEvents/index.ts @@ -32,11 +32,11 @@ export default class CredentialEvents { } public start() { - this.events.on('CredentialStateChanged', this.credentialStateChangedHandler) + this.events.on('DidCommCredentialStateChanged', this.credentialStateChangedHandler) } - private credentialStateChangedHandler: eventData<'CredentialStateChanged'> = async (event) => { - const record = event.payload.credentialRecord + private credentialStateChangedHandler: eventData<'DidCommCredentialStateChanged'> = async (event) => { + const record = event.payload.credentialExchangeRecord const formatData = await this.cloudagent.getCredentialFormatData(record.id) const maybeSchema = formatData.offer?.anoncreds.schema_id ? await this.cloudagent.getSchemaById(formatData.offer.anoncreds.schema_id) diff --git a/src/services/veritableCloudagentEvents.ts b/src/services/veritableCloudagentEvents.ts index a64ef631..0f0f89ab 100644 --- a/src/services/veritableCloudagentEvents.ts +++ b/src/services/veritableCloudagentEvents.ts @@ -31,8 +31,8 @@ const eventParser = z.discriminatedUnion('type', [ }), }), z.object({ - type: z.literal('CredentialStateChanged'), - payload: z.object({ credentialRecord: credentialParser }), + type: z.literal('DidCommCredentialStateChanged'), + payload: z.object({ credentialExchangeRecord: credentialParser }), }), z.object({ type: z.literal('BasicMessageStateChanged'), payload: z.object({}) }), z.object({ type: z.literal('RevocationNotificationReceived'), payload: z.object({}) }), @@ -140,8 +140,8 @@ export default class VeritableCloudagentEvents extends IndexedAsyncEventEmitter< id = data.payload.connectionRecord.id this.logger.trace('DID rotation event on connection %s', id) break - case 'CredentialStateChanged': - id = data.payload.credentialRecord.id + case 'DidCommCredentialStateChanged': + id = data.payload.credentialExchangeRecord.id credentialSeen.add(id) break case 'DrpcRequestStateChanged': @@ -170,9 +170,9 @@ export default class VeritableCloudagentEvents extends IndexedAsyncEventEmitter< for (const credential of await this.veritable.getCredentials()) { if (!credentialSeen.has(credential.id)) { - this.emitIndexed('CredentialStateChanged', credential.id, { - type: 'CredentialStateChanged', - payload: { credentialRecord: credential }, + this.emitIndexed('DidCommCredentialStateChanged', credential.id, { + type: 'DidCommCredentialStateChanged', + payload: { credentialExchangeRecord: credential }, }) } } diff --git a/test/integration/pinVerification.test.ts b/test/integration/pinVerification.test.ts index 8815e85b..44d0adcd 100644 --- a/test/integration/pinVerification.test.ts +++ b/test/integration/pinVerification.test.ts @@ -42,10 +42,10 @@ describe('pin-submission', function () { beforeEach(async function () { const credentialDonePromise = new Promise((resolve) => { context.cloudagentEvents.on( - 'CredentialStateChanged', + 'DidCommCredentialStateChanged', ({ payload: { - credentialRecord: { state }, + credentialExchangeRecord: { state }, }, }) => { if (state === 'done') { @@ -62,7 +62,7 @@ describe('pin-submission', function () { await Promise.race([ credentialDonePromise, - delayAndReject(1000, 'Timeout waiting for credential to reach done state'), + delayAndReject(5000, 'Timeout waiting for credential to reach done state'), ]) }) @@ -95,10 +95,10 @@ describe('pin-submission', function () { beforeEach(async function () { const credentialDonePromise = new Promise((resolve) => { context.cloudagentEvents.on( - 'CredentialStateChanged', + 'DidCommCredentialStateChanged', ({ payload: { - credentialRecord: { state }, + credentialExchangeRecord: { state }, }, }) => { if (state === 'done') { @@ -115,7 +115,7 @@ describe('pin-submission', function () { await Promise.race([ credentialDonePromise, - delayAndReject(1000, 'Timeout waiting for credential to reach done state'), + delayAndReject(5000, 'Timeout waiting for credential to reach done state'), ]) }) From a932392124dad5a55f7499260b385f0b3ce53778 Mon Sep 17 00:00:00 2001 From: "dc-autobot[bot]" <181364585+dc-autobot[bot]@users.noreply.github.com> Date: Tue, 26 May 2026 15:49:43 +0000 Subject: [PATCH 3/6] Updating version to 0.21.98 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42fa69fe..b7aad495 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "veritable-ui", - "version": "0.21.97", + "version": "0.21.98", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "veritable-ui", - "version": "0.21.97", + "version": "0.21.98", "license": "Apache-2.0", "dependencies": { "@digicatapult/tsoa-oauth-express": "^2.0.65", diff --git a/package.json b/package.json index 53ce357d..e2a0cd64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "veritable-ui", - "version": "0.21.97", + "version": "0.21.98", "description": "UI for Veritable", "main": "src/index.ts", "type": "module", From 3f4e717e570bf131bb4611a198838ad50438d951 Mon Sep 17 00:00:00 2001 From: "dc-autobot[bot]" <181364585+dc-autobot[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 01:01:35 +0000 Subject: [PATCH 4/6] Updating version to 0.21.99 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7aad495..ed1fbc32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "veritable-ui", - "version": "0.21.98", + "version": "0.21.99", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "veritable-ui", - "version": "0.21.98", + "version": "0.21.99", "license": "Apache-2.0", "dependencies": { "@digicatapult/tsoa-oauth-express": "^2.0.65", diff --git a/package.json b/package.json index e2a0cd64..b81f0047 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "veritable-ui", - "version": "0.21.98", + "version": "0.21.99", "description": "UI for Veritable", "main": "src/index.ts", "type": "module", From 1902bcdfd61be6665857ef3a568dc4984b22555d Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 27 May 2026 16:02:05 +0100 Subject: [PATCH 5/6] use 0.20.0 cloudagent --- docker-compose.yml | 12 ++++++------ docker/cloudagent.env | 1 - test/testcontainers/testcontainersSetup.ts | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b647cab6..ae9574d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,7 +100,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-alice: - image: digicatapult/veritable-cloudagent:v0.19.5 + image: digicatapult/veritable-cloudagent:v0.20.0 container_name: veritable-cloudagent-alice restart: always depends_on: @@ -198,7 +198,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-bob: - image: digicatapult/veritable-cloudagent:v0.19.5 + image: digicatapult/veritable-cloudagent:v0.20.0 container_name: veritable-cloudagent-bob restart: always depends_on: @@ -296,7 +296,7 @@ services: - POSTGRES_PASSWORD=postgres - POSTGRES_DB=postgres-veritable-cloudagent veritable-cloudagent-charlie: - image: digicatapult/veritable-cloudagent:v0.19.5 + image: digicatapult/veritable-cloudagent:v0.20.0 container_name: veritable-cloudagent-charlie restart: always depends_on: @@ -317,8 +317,8 @@ services: image: rnwood/smtp4dev:3.15.0 container_name: smtp4dev ports: - - '5001:80' # Port for accessing smtp4dev's web interface - - '2525:25' # Port for SMTP connections + - "5001:80" # Port for accessing smtp4dev's web interface + - "2525:25" # Port for SMTP connections restart: always # -------------------- wiremock ----------------------------# @@ -328,7 +328,7 @@ services: container_name: wiremock # scale: 0 // TODO: remove this, only for dev ports: - - '8443:8080' # Port for accessing wiremock + - "8443:8080" # Port for accessing wiremock restart: always volumes: - ./test/wiremock/:/home/wiremock/mappings/ diff --git a/docker/cloudagent.env b/docker/cloudagent.env index 9be7501e..9e037218 100644 --- a/docker/cloudagent.env +++ b/docker/cloudagent.env @@ -5,4 +5,3 @@ IPFS_ORIGIN=http://ipfs:5001 POSTGRES_PORT=5432 POSTGRES_USERNAME=postgres POSTGRES_PASSWORD=postgres -LABEL=veritable-cloudagent diff --git a/test/testcontainers/testcontainersSetup.ts b/test/testcontainers/testcontainersSetup.ts index 24ddb555..92f99613 100644 --- a/test/testcontainers/testcontainersSetup.ts +++ b/test/testcontainers/testcontainersSetup.ts @@ -158,7 +158,6 @@ export async function cloudagentContainer(name: string, hostPort: number): Promi POSTGRES_PORT: '5432', POSTGRES_USERNAME: 'postgres', POSTGRES_PASSWORD: 'postgres', - LABEL: 'veritable-cloudagent', }) .withWaitStrategy(Wait.forListeningPorts()) .withNetwork(network) From 19b2111630f6724f9bfb5f04d3a9a5ec8029c894 Mon Sep 17 00:00:00 2001 From: "dc-autobot[bot]" <181364585+dc-autobot[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 15:02:59 +0000 Subject: [PATCH 6/6] Updating version to 0.21.100 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4e10b58..15293d44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "veritable-ui", - "version": "0.21.99", + "version": "0.21.100", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "veritable-ui", - "version": "0.21.99", + "version": "0.21.100", "license": "Apache-2.0", "dependencies": { "@digicatapult/tsoa-oauth-express": "^2.0.65", diff --git a/package.json b/package.json index b069d4a0..e8bf2538 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "veritable-ui", - "version": "0.21.99", + "version": "0.21.100", "description": "UI for Veritable", "main": "src/index.ts", "type": "module",