Merge pull request #4 from Sphereon-Opensource/develop

update

.github/workflows/build-test-on-pr.yml

@@ -2,7 +2,7 @@ name: Build and Test PR
 on: [pull_request, workflow_dispatch]
 jobs:
   build-test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:10.10
@@ -14,14 +14,14 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - run: yarn install --frozen-lockfile
+      - run: yarn install
       - run: yarn bootstrap
       - run: yarn build
       - name: run CI tests

.github/workflows/build-test-publish-on-push.yml

@@ -17,7 +17,7 @@ jobs:
       GH_USER: ${{secrets.GH_USER}}
       GH_EMAIL: ${{secrets.GH_EMAIL}}
       VC_HTTP_API_AUTH_TOKEN: ${{secrets.VC_HTTP_API_AUTH_TOKEN}}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:10.10
@@ -28,11 +28,11 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
 
@@ -45,7 +45,7 @@ jobs:
 #          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
 #          key: ${{ runner.os }}-yarn-2-${{ hashFiles('**/package.json') }}
 
-      - run: yarn install --frozen-lockfile
+      - run: yarn install
       - run: yarn bootstrap
       - run: yarn build
       - name: run integration tests
@@ -56,6 +56,7 @@ jobs:
           POSTGRES_PASSWORD: test123
           POSTGRES_PORT: 5432
         run: yarn test:ci
+      - run: git diff -u yarn.lock
 
       - name: setup git coordinates
         run: |

.github/workflows/sync-next-with-latest.yml

@@ -6,9 +6,9 @@ on:
       - 'main'
 jobs:
   merge-branch:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: everlytic/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

lerna.json

@@ -16,5 +16,8 @@
     }
   },
   "useWorkspaces": true,
+  "forceLocal": true,
+  "sort": true,
+  "stream": true,
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/veramo-BBS-workspace",
   "private": true,
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Sphereon Veramo BBS+ signature support (Workspace)",
   "repository": "[email protected]:Sphereon-Opensource/veramo-BBS.git",
   "author": "Sphereon <[email protected]>",
@@ -19,7 +19,8 @@
     "build-clean": "rimraf ./packages/*/dist ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo && jest --clearCache",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org",
-    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
+    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org",
+    "postinstall": "patch-package"
   },
   "workspaces": {
     "nohoist": [
@@ -42,22 +43,21 @@
     ]
   },
   "devDependencies": {
-    "@microsoft/api-documenter": "^7.14.1",
-    "@microsoft/api-extractor": "^7.19.4",
-    "@microsoft/api-extractor-model": "^7.15.3",
+    "@microsoft/api-documenter": "^7.19.27",
+    "@microsoft/api-extractor": "^7.33.7",
+    "@microsoft/api-extractor-model": "^7.25.3",
     "@types/jest": "^27.4.0",
     "@typescript-eslint/eslint-plugin": "^5.9.1",
     "@typescript-eslint/parser": "^5.9.1",
     "codecov": "^3.8.3",
-    "cross-fetch": "^3.1.5",
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.4",
     "jest": "^27.4.7",
     "jest-fetch-mock": "^3.0.3",
     "json-schema": "^0.4.0",
-    "lerna": "^4.0.0",
+    "lerna": "^6.5.1",
     "lerna-changelog": "^2.2.0",
     "oas-resolver": "^2.5.6",
     "openapi-types": "^10.0.0",
@@ -68,7 +68,34 @@
     "ts-jest": "^27.1.3",
     "ts-json-schema-generator": "^0.97.0",
     "ts-node": "^10.4.0",
-    "typescript": "4.6.4"
+    "typescript": "4.6.4",
+    "patch-package": "^6.5.1",
+    "postinstall-postinstall": "^2.1.0"
+  },
+  "resolutions": {
+    "@veramo/core": "4.2.0",
+    "@veramo/credential-w3c": "4.2.0",
+    "@veramo/data-store": "4.2.0",
+    "@veramo/did-jwt": "4.2.0",
+    "@veramo/credential-ld": "4.2.0",
+    "@veramo/utils": "4.2.0",
+    "@veramo/did-manager": "4.2.0",
+    "@veramo/kms-local": "4.2.0",
+    "@veramo/key-manager": "4.2.0",
+    "@veramo/credential-eip712": "4.2.0",
+    "@veramo/did-comm": "4.2.0",
+    "@veramo/message-handler": "4.2.0",
+    "@veramo/did-discovery": "4.2.0",
+    "@veramo/did-provider-ethr": "4.2.0",
+    "@veramo/did-provider-key": "4.2.0",
+    "@veramo/did-provider-web": "4.2.0",
+    "@veramo/did-resolver": "4.2.0",
+    "@veramo/remote-client": "4.2.0",
+    "@veramo/remote-server": "4.2.0",
+    "@veramo/selective-disclosure": "4.2.0",
+    "@veramo/url-handler": "4.2.0",
+    "**/@digitalcredentials/ed25519-verification-key-2020": "3.2.2",
+    "@veramo/credential-ld/**/isomorphic-webcrypto": "link:./@sphereon/isomorphic-webcrypto"
   },
   "engines": {
     "node": ">= 16.0.0"

packages/bls-did-provider-key/CHANGELOG.md

@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-did-provider-key
 
-
-
-
-
 # [0.8.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.7.0...v0.8.0) (2022-09-03)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-did-provider-key

packages/bls-did-provider-key/package.json

@@ -13,15 +13,19 @@
     "@transmute/did-key-ed25519": "^0.3.0-unstable.10",
     "@transmute/did-key-secp256k1": "^0.3.0-unstable.10",
     "@transmute/did-key-x25519": "^0.3.0-unstable.10",
-    "@veramo/core": "^4.2.0",
-    "@veramo/did-manager": "^4.2.0",
+    "@veramo/core": "4.2.0",
+    "@veramo/did-manager": "4.2.0",
     "debug": "^4.3.4",
     "multibase": "^4.0.6",
     "multicodec": "^3.2.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@veramo/cli": "^4.2.0"
+    "@veramo/cli": "4.2.0"
+  },
+  "resolutions": {
+    "jsonld": "npm:@digitalcredentials/jsonld@^5.2.1",
+    "jsonld-signatures": "npm:@digitalcredentials/jsonld-signatures@^9.3.1"
   },
   "files": [
     "dist/**/*",

packages/bls-did-resolver-key/CHANGELOG.md

@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-did-resolver-key
 
-
-
-
-
 # [0.8.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.7.0...v0.8.0) (2022-09-03)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-did-resolver-key

packages/bls-did-resolver-key/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "multibase": "~4.0.6",
-    "uint8arrays": "^2.0.5",
+    "uint8arrays": "^3.1.1",
     "varint": "^6.0.0"
   },
   "devDependencies": {

packages/bls-did-resolver-key/src/bls12381g2.ts

@@ -1,5 +1,5 @@
 import { DIDDocument } from 'did-resolver'
-import u8a from 'uint8arrays'
+import * as u8a from 'uint8arrays'
 
 export const keyToDidDoc = (pubKeyBytes: Uint8Array, fingerprint: string): DIDDocument => {
   const did = `did:key:${fingerprint}`

packages/bls-did-resolver-key/src/ed25519.ts

@@ -1,4 +1,4 @@
-import u8a from 'uint8arrays'
+import * as u8a from 'uint8arrays'
 import * as ed25519 from '@stablelib/ed25519'
 import { DIDDocument } from 'did-resolver'
 

packages/bls-did-resolver-key/src/secp256k1.ts

@@ -1,4 +1,4 @@
-import u8a from 'uint8arrays'
+import * as u8a from 'uint8arrays'
 import { DIDDocument } from 'did-resolver'
 
 export const keyToDidDoc = (pubKeyBytes: Uint8Array, fingerprint: string): DIDDocument => {

packages/bls-key-manager/CHANGELOG.md

@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-key-manager
 
-
-
-
-
 # [0.8.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.7.0...v0.8.0) (2022-09-03)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-key-manager

packages/bls-key-manager/package.json

@@ -17,20 +17,24 @@
   "dependencies": {
     "@mattrglobal/bbs-signatures": "^1.1.0",
     "@sphereon/ssi-sdk-bls-kms-local": "^0.9.1",
-    "@veramo/core": "^4.2.0",
-    "@veramo/key-manager": "^4.2.0"
+    "@veramo/core": "4.2.0",
+    "@veramo/key-manager": "4.2.0"
   },
   "devDependencies": {
-    "@microsoft/api-documenter": "^7.19.26",
+    "@microsoft/api-documenter": "^7.19.27",
     "@microsoft/api-extractor": "^7.33.7",
     "@microsoft/api-extractor-model": "^7.25.3",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.16",
-    "@veramo/cli": "^4.2.0",
+    "@veramo/cli": "4.2.0",
     "jest": "^29.3.1",
     "prettier": "^2.8.1",
     "ts-jest": "^29.0.3"
   },
+  "resolutions": {
+    "jsonld": "npm:@digitalcredentials/jsonld@^5.2.1",
+    "jsonld-signatures": "npm:@digitalcredentials/jsonld-signatures@^9.3.1"
+  },
   "files": [
     "dist/**/*",
     "src/**/*",

packages/bls-key-manager/src/agent/BlsKeyManager.ts

@@ -5,7 +5,7 @@ import { KeyType } from '@sphereon/ssi-sdk-bls-kms-local'
 
 export class BlsKeyManager extends KeyManager {
   private localStore: AbstractKeyStore
-  private localKms: Record<string, AbstractKeyManagementSystem>
+  private readonly localKms: Record<string, AbstractKeyManagementSystem>
 
   constructor(options: { store: AbstractKeyStore; kms: Record<string, AbstractKeyManagementSystem> }) {
     super({ store: options.store, kms: options.kms })

packages/bls-kms-local/CHANGELOG.md

@@ -7,10 +7,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-kms-local
 
-
-
-
-
 # [0.8.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.7.0...v0.8.0) (2022-09-03)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk-bls-kms-local

packages/bls-kms-local/package.json

@@ -11,19 +11,25 @@
   },
   "dependencies": {
     "@mattrglobal/bbs-signatures": "^1.1.0",
-    "@veramo/core": "^4.2.0"
+    "@sphereon/ssi-sdk-did-utils": "^0.9.0",
+    "@veramo/core": "4.2.0",
+    "@trust/keyto": "^2.0.0-alpha1",
+    "@sphereon/isomorphic-webcrypto": "^2.4.0-unstable.1"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "^7.19.26",
     "@microsoft/api-extractor": "^7.33.7",
     "@microsoft/api-extractor-model": "^7.25.3",
     "@types/jest": "^29.2.4",
     "@types/node": "^16.18.9",
-    "@veramo/cli": "^4.2.0",
+    "@veramo/cli": "4.2.0",
     "jest": "^29.3.1",
     "prettier": "^2.8.1",
     "ts-jest": "^29.0.3"
   },
+  "resolutions": {
+    "**/@digitalcredentials/ed25519-verification-key-2020": "3.2.2"
+  },
   "files": [
     "dist/**/*",
     "src/**/*",