chore: merge remote-tracking branch 'origin/main' into feature/encrypted-data-exchange

Author: sanducb

.github/workflows/rafiki/env-setup/action.yml

@@ -7,7 +7,7 @@ runs:
     - uses: pnpm/action-setup@v3
     - uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '24'
         cache: 'pnpm'
     - name: Install dependencies
       shell: bash

.grype.yaml

@@ -1,2 +1,14 @@
 ignore:
   - vulnerability: GHSA-3xgq-45jj-v275
+  - vulnerability: CVE-2026-23950
+  - vulnerability: CVE-2026-23745
+
+  # CVE-2025-64756
+  - vulnerability: CVE-2025-64756
+  - vulnerability: GHSA-5j98-mcp5-4vw2
+
+  # CVE-2026-24842
+  - vulnerability: CVE-2026-24842
+  - vulnerability: GHSA-r6q2-hw4h-h46w
+  - vulnerability: GHSA-8qq5-rm4j-mr97
+  - vulnerability: GHSA-34x7-hfp2-rc4v

.nvmrc

@@ -1 +1 @@
-lts/iron
+v24

.prettierignore

@@ -15,4 +15,5 @@ build
 .docusaurus
 .cache-loader
 .astro
-open-payments-specifications/**
+open-payments-specifications/**
+packages/documentation/**

.trivyignore

@@ -1 +1,5 @@
-CVE-2024-21538
+CVE-2024-21538 exp:2026-03-01
+CVE-2026-23950 exp:2026-03-01
+CVE-2025-64756 exp:2026-03-01
+CVE-2026-23745 exp:2026-03-01
+CVE-2026-24842 exp:2026-03-01

README.md

@@ -149,6 +149,12 @@ This command will:
 - Format all files using Prettier
 - Automatically fix ESLint issues where possible
 
+**Note:** The documentation package (`packages/documentation`) has its own Prettier configuration and is excluded from the root formatting. To format documentation files, use:
+
+```sh
+pnpm format:docs
+```
+
 #### Checking Code Quality
 
 Before committing your changes, verify that your code passes all formatting and linting checks:

localenv/README.md

@@ -135,18 +135,6 @@ git clone --recurse-submodules https://github.com/interledger/rafiki.git
 
 > \*Note: In the Local Playground, Kratos and Mail Slurper are disabled by default.
 
-## Exploring Accounts on Mock Account Servicing Entity
-
-Navigate to `localhost:3030` to view the accounts on the Cloud Nine Wallet mock ASE.
-
-![Mock Account Servicing Entity Accounts](../packages/documentation/public/img/map-accounts.png)
-
-The accounts of the Happy Life Bank mock ASE can be found on `localhost:3031`.
-
-Select an Account Name to view account information, available balance, and a list of transactions.
-
-![Mock Account Servicing Entity Transactions](../packages/documentation/public/img/map-transactions.png)
-
 # Debugging
 
 Debuggers are exposed on the following ports:

localenv/cloud-nine-wallet/docker-compose.yml

@@ -115,7 +115,6 @@ services:
       OPERATOR_TENANT_ID: 438fa74a-fa7d-4317-9ced-dde32ece1787
       CARD_SERVICE_URL: 'http://cloud-nine-wallet-card-service:3007'
       CARD_WEBHOOK_SERVICE_URL: 'http://cloud-nine-wallet-card-service:3007/webhook'
-      DB_ENCRYPTION_SECRET: 'zO9KogehJECHReHgQr+ZWGkmgOD4AYa4ksUxALSwgM8='
     depends_on:
       shared-database:
         condition: service_healthy

localenv/mock-account-servicing-entity/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine3.21 AS base
+FROM node:24-alpine3.23 AS base
 
 WORKDIR /home/rafiki
 
@@ -42,7 +42,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
     --frozen-lockfile
 RUN pnpm --filter mock-account-servicing-entity build
 
-FROM node:20-alpine3.21 AS runner
+FROM node:24-alpine3.23 AS runner
 
 WORKDIR /home/rafiki
 

localenv/mock-account-servicing-entity/app/lib/asset.server.ts

@@ -29,7 +29,6 @@ export const listAssets = async (
               id
               scale
               withdrawalThreshold
-              tenantId
               createdAt
               tenant {
                 id
@@ -59,7 +58,10 @@ export const loadAssets = async (tenantOptions?: TenantOptions) => {
       id: string
       scale: number
       withdrawalThreshold?: bigint | null
-      tenantId: string
+      tenant: {
+        id: string
+        publicName?: string | null
+      } | null
       createdAt: string
     }
   }[] = []