From 677743d9b6aafcd8808379710e10535c28c5fa04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 13:49:41 +0000 Subject: [PATCH 1/5] chore(deps-dev): Bump @biomejs/biome from 1.6.4 to 1.7.0 Bumps [@biomejs/biome](https://github.com/biomejs/biome/tree/HEAD/packages/@biomejs/biome) from 1.6.4 to 1.7.0. - [Release notes](https://github.com/biomejs/biome/releases) - [Changelog](https://github.com/biomejs/biome/blob/main/CHANGELOG.md) - [Commits](https://github.com/biomejs/biome/commits/cli/v1.7.0/packages/@biomejs/biome) --- updated-dependencies: - dependency-name: "@biomejs/biome" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pnpm-lock.yaml | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9aff96a..dd364d8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@biomejs/biome': specifier: ^1.6.0 - version: 1.6.4 + version: 1.7.0 '@types/node': specifier: ^20.10.2 version: 20.12.7 @@ -287,24 +287,24 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@biomejs/biome@1.6.4: - resolution: {integrity: sha512-3groVd2oWsLC0ZU+XXgHSNbq31lUcOCBkCcA7sAQGBopHcmL+jmmdoWlY3S61zIh+f2mqQTQte1g6PZKb3JJjA==} + /@biomejs/biome@1.7.0: + resolution: {integrity: sha512-mejiRhnAq6UrXtYvjWJUKdstcT58n0/FfKemFf3d2Ou0HxOdS88HQmWtQ/UgyZvOEPD572YbFTb6IheyROpqkw==} engines: {node: '>=14.21.3'} hasBin: true requiresBuild: true optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.6.4 - '@biomejs/cli-darwin-x64': 1.6.4 - '@biomejs/cli-linux-arm64': 1.6.4 - '@biomejs/cli-linux-arm64-musl': 1.6.4 - '@biomejs/cli-linux-x64': 1.6.4 - '@biomejs/cli-linux-x64-musl': 1.6.4 - '@biomejs/cli-win32-arm64': 1.6.4 - '@biomejs/cli-win32-x64': 1.6.4 - dev: true - - /@biomejs/cli-darwin-arm64@1.6.4: - resolution: {integrity: sha512-2WZef8byI9NRzGajGj5RTrroW9BxtfbP9etigW1QGAtwu/6+cLkdPOWRAs7uFtaxBNiKFYA8j/BxV5zeAo5QOQ==} + '@biomejs/cli-darwin-arm64': 1.7.0 + '@biomejs/cli-darwin-x64': 1.7.0 + '@biomejs/cli-linux-arm64': 1.7.0 + '@biomejs/cli-linux-arm64-musl': 1.7.0 + '@biomejs/cli-linux-x64': 1.7.0 + '@biomejs/cli-linux-x64-musl': 1.7.0 + '@biomejs/cli-win32-arm64': 1.7.0 + '@biomejs/cli-win32-x64': 1.7.0 + dev: true + + /@biomejs/cli-darwin-arm64@1.7.0: + resolution: {integrity: sha512-12TaeaKHU4SAZt0fQJ2bYk1jUb4foope7LmgDE5p3c0uMxd3mFkg1k7G721T+K6UHYULcSOQDsNNM8DhYi8Irg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] @@ -312,8 +312,8 @@ packages: dev: true optional: true - /@biomejs/cli-darwin-x64@1.6.4: - resolution: {integrity: sha512-uo1zgM7jvzcoDpF6dbGizejDLCqNpUIRkCj/oEK0PB0NUw8re/cn1EnxuOLZqDpn+8G75COLQTOx8UQIBBN/Kg==} + /@biomejs/cli-darwin-x64@1.7.0: + resolution: {integrity: sha512-6Qq1BSIB0cpp0cQNqO/+EiUV7FE3jMpF6w7+AgIBXp0oJxUWb2Ff0RDZdO9bfzkimXD58j0vGpNHMGnCcjDV2Q==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] @@ -321,8 +321,8 @@ packages: dev: true optional: true - /@biomejs/cli-linux-arm64-musl@1.6.4: - resolution: {integrity: sha512-Hp8Jwt6rjj0wCcYAEN6/cfwrrPLLlGOXZ56Lei4Pt4jy39+UuPeAVFPeclrrCfxyL1wQ2xPrhd/saTHSL6DoJg==} + /@biomejs/cli-linux-arm64-musl@1.7.0: + resolution: {integrity: sha512-pwIY80nU7SAxrVVZ6HD9ah1pruwh9ZqlSR0Nvbg4ZJqQa0POhiB+RJx7+/1Ml2mTZdrl8kb/YiwQpD16uwb5wg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] @@ -330,8 +330,8 @@ packages: dev: true optional: true - /@biomejs/cli-linux-arm64@1.6.4: - resolution: {integrity: sha512-wAOieaMNIpLrxGc2/xNvM//CIZg7ueWy3V5A4T7gDZ3OL/Go27EKE59a+vMKsBCYmTt7jFl4yHz0TUkUbodA/w==} + /@biomejs/cli-linux-arm64@1.7.0: + resolution: {integrity: sha512-GwSci7xBJ2j1CrdDXDUVXnUtrvypEz/xmiYPpFeVdlX5p95eXx+7FekPPbJfhGGw5WKSsKZ+V8AAlbN+kUwJWw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] @@ -339,8 +339,8 @@ packages: dev: true optional: true - /@biomejs/cli-linux-x64-musl@1.6.4: - resolution: {integrity: sha512-wqi0hr8KAx5kBO0B+m5u8QqiYFFBJOSJVSuRqTeGWW+GYLVUtXNidykNqf1JsW6jJDpbkSp2xHKE/bTlVaG2Kg==} + /@biomejs/cli-linux-x64-musl@1.7.0: + resolution: {integrity: sha512-KzCA0mW4LSbCd7XZWaEJvTOTTBjfJoVEXkfq1fsXxww1HB+ww5PGMbhbIcbYCsj2CTJUifeD5hOkyuBVppU1xQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] @@ -348,8 +348,8 @@ packages: dev: true optional: true - /@biomejs/cli-linux-x64@1.6.4: - resolution: {integrity: sha512-qTWhuIw+/ePvOkjE9Zxf5OqSCYxtAvcTJtVmZT8YQnmY2I62JKNV2m7tf6O5ViKZUOP0mOQ6NgqHKcHH1eT8jw==} + /@biomejs/cli-linux-x64@1.7.0: + resolution: {integrity: sha512-1y+odKQsyHcw0JCGRuqhbx7Y6jxOVSh4lGIVDdJxW1b55yD22DY1kcMEfhUte6f95OIc2uqfkwtiI6xQAiZJdw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] @@ -357,8 +357,8 @@ packages: dev: true optional: true - /@biomejs/cli-win32-arm64@1.6.4: - resolution: {integrity: sha512-Wp3FiEeF6v6C5qMfLkHwf4YsoNHr/n0efvoC8jCKO/kX05OXaVExj+1uVQ1eGT7Pvx0XVm/TLprRO0vq/V6UzA==} + /@biomejs/cli-win32-arm64@1.7.0: + resolution: {integrity: sha512-AvLDUYZBpOUFgS/mni4VruIoVV3uSGbKSkZQBPXsHgL0w4KttLll3NBrVanmWxOHsom6C6ocHLyfAY8HUc8TXg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] @@ -366,8 +366,8 @@ packages: dev: true optional: true - /@biomejs/cli-win32-x64@1.6.4: - resolution: {integrity: sha512-mz183Di5hTSGP7KjNWEhivcP1wnHLGmOxEROvoFsIxMYtDhzJDad4k5gI/1JbmA0xe4n52vsgqo09tBhrMT/Zg==} + /@biomejs/cli-win32-x64@1.7.0: + resolution: {integrity: sha512-Pylm00BAAuLVb40IH9PC17432BTsY8K4pSUvhvgR1eaalnMaD6ug9SYJTTzKDbT6r24MPAGCTiSZERyhGkGzFQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] From 292a33e65871732ccafa6263199a74068a225073 Mon Sep 17 00:00:00 2001 From: "Lukas.J.Han" Date: Wed, 17 Apr 2024 21:52:03 -0700 Subject: [PATCH 2/5] fix: biome Signed-off-by: Lukas.J.Han --- packages/core/src/test/index.spec.ts | 2 +- packages/core/test/app-e2e.spec.ts | 2 +- packages/sd-jwt-vc/test/app-e2e.spec.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/test/index.spec.ts b/packages/core/src/test/index.spec.ts index 6e06534..9682700 100644 --- a/packages/core/src/test/index.spec.ts +++ b/packages/core/src/test/index.spec.ts @@ -11,7 +11,7 @@ const nodeVersionMajor = Number.parseInt( 10, ); -export const createSignerVerifier = () => { +const createSignerVerifier = () => { const { privateKey, publicKey } = Crypto.generateKeyPairSync('ed25519'); const signer: Signer = async (data: string) => { const sig = Crypto.sign(null, Buffer.from(data), privateKey); diff --git a/packages/core/test/app-e2e.spec.ts b/packages/core/test/app-e2e.spec.ts index 35f149d..6cb7d34 100644 --- a/packages/core/test/app-e2e.spec.ts +++ b/packages/core/test/app-e2e.spec.ts @@ -11,7 +11,7 @@ import path from 'node:path'; import { describe, expect, test } from 'vitest'; import { digest, generateSalt } from '@sd-jwt/crypto-nodejs'; -export const createSignerVerifier = () => { +const createSignerVerifier = () => { const { privateKey, publicKey } = Crypto.generateKeyPairSync('ed25519'); const signer: Signer = async (data: string) => { const sig = Crypto.sign(null, Buffer.from(data), privateKey); diff --git a/packages/sd-jwt-vc/test/app-e2e.spec.ts b/packages/sd-jwt-vc/test/app-e2e.spec.ts index c58fbfb..16c6f0c 100644 --- a/packages/sd-jwt-vc/test/app-e2e.spec.ts +++ b/packages/sd-jwt-vc/test/app-e2e.spec.ts @@ -11,7 +11,7 @@ import path from 'node:path'; import { describe, expect, test } from 'vitest'; import { digest, generateSalt } from '@sd-jwt/crypto-nodejs'; -export const createSignerVerifier = () => { +const createSignerVerifier = () => { const { privateKey, publicKey } = Crypto.generateKeyPairSync('ed25519'); const signer: Signer = async (data: string) => { const sig = Crypto.sign(null, Buffer.from(data), privateKey); From e6201aab72bb535917febe0cbcc7a48cde913412 Mon Sep 17 00:00:00 2001 From: "Lukas.J.Han" Date: Wed, 17 Apr 2024 22:08:57 -0700 Subject: [PATCH 3/5] ci: test for ci pass Signed-off-by: Lukas.J.Han --- .github/workflows/build-test-publish-on-push-cached.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-publish-on-push-cached.yaml b/.github/workflows/build-test-publish-on-push-cached.yaml index 492591f..f74536e 100644 --- a/.github/workflows/build-test-publish-on-push-cached.yaml +++ b/.github/workflows/build-test-publish-on-push-cached.yaml @@ -43,7 +43,7 @@ jobs: - uses: pnpm/action-setup@v3 with: version: 8 - - run: pnpm add -g pnpm + - run: pnpm add -g pnpm@8.15.7 - name: 'Restore build output' uses: actions/cache/restore@v4 with: @@ -105,7 +105,7 @@ jobs: node-version: 20 cache: 'pnpm' # we are not using the github action for biome, but the package.json script. this makes sure we are using the same versions. - - name: Run Biome + - name: Run Biome run: pnpm run biome:ci # Only run this job when the push is on main From 9adedc59f6a4d2970eb55519770ccb596820bf0c Mon Sep 17 00:00:00 2001 From: "Lukas.J.Han" Date: Wed, 17 Apr 2024 22:13:00 -0700 Subject: [PATCH 4/5] test: fix import Signed-off-by: Lukas.J.Han --- packages/sd-jwt-vc/src/test/index.spec.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/sd-jwt-vc/src/test/index.spec.ts b/packages/sd-jwt-vc/src/test/index.spec.ts index 1e3d34d..03527db 100644 --- a/packages/sd-jwt-vc/src/test/index.spec.ts +++ b/packages/sd-jwt-vc/src/test/index.spec.ts @@ -1,14 +1,31 @@ import { digest, generateSalt } from '@sd-jwt/crypto-nodejs'; -import type { DisclosureFrame } from '@sd-jwt/types'; +import type { DisclosureFrame, Signer, Verifier } from '@sd-jwt/types'; import { describe, test, expect } from 'vitest'; import { SDJwtVcInstance } from '..'; -import { createSignerVerifier } from '../../test/app-e2e.spec'; import type { SdJwtVcPayload } from '../sd-jwt-vc-payload'; +import Crypto from 'node:crypto'; const iss = 'ExampleIssuer'; const vct = 'https://example.com/schema/1'; const iat = new Date().getTime() / 1000; +const createSignerVerifier = () => { + const { privateKey, publicKey } = Crypto.generateKeyPairSync('ed25519'); + const signer: Signer = async (data: string) => { + const sig = Crypto.sign(null, Buffer.from(data), privateKey); + return Buffer.from(sig).toString('base64url'); + }; + const verifier: Verifier = async (data: string, sig: string) => { + return Crypto.verify( + null, + Buffer.from(data), + publicKey, + Buffer.from(sig, 'base64url'), + ); + }; + return { signer, verifier }; +}; + describe('App', () => { test('Example', async () => { const { signer, verifier } = createSignerVerifier(); From 18f98b29d0202de4f1ddd1b2f0ec6c0c983086d2 Mon Sep 17 00:00:00 2001 From: "Lukas.J.Han" Date: Thu, 18 Apr 2024 08:49:42 -0700 Subject: [PATCH 5/5] Revert "ci: test for ci pass" This reverts commit e6201aab72bb535917febe0cbcc7a48cde913412. Signed-off-by: Lukas.J.Han --- .github/workflows/build-test-publish-on-push-cached.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-publish-on-push-cached.yaml b/.github/workflows/build-test-publish-on-push-cached.yaml index f74536e..492591f 100644 --- a/.github/workflows/build-test-publish-on-push-cached.yaml +++ b/.github/workflows/build-test-publish-on-push-cached.yaml @@ -43,7 +43,7 @@ jobs: - uses: pnpm/action-setup@v3 with: version: 8 - - run: pnpm add -g pnpm@8.15.7 + - run: pnpm add -g pnpm - name: 'Restore build output' uses: actions/cache/restore@v4 with: @@ -105,7 +105,7 @@ jobs: node-version: 20 cache: 'pnpm' # we are not using the github action for biome, but the package.json script. this makes sure we are using the same versions. - - name: Run Biome + - name: Run Biome run: pnpm run biome:ci # Only run this job when the push is on main