From b9744a4f389ef59a70308fdc14b519147998d34c Mon Sep 17 00:00:00 2001 From: Niels Klomp Date: Sat, 30 Nov 2024 22:10:39 +0100 Subject: [PATCH] chore: require cjs --- packages/key-utils/src/functions.ts | 14 ++++++------- packages/kms-local/package.json | 2 ++ pnpm-lock.yaml | 31 +++++++++++------------------ 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/packages/key-utils/src/functions.ts b/packages/key-utils/src/functions.ts index 9ce84afa..92387815 100644 --- a/packages/key-utils/src/functions.ts +++ b/packages/key-utils/src/functions.ts @@ -1,12 +1,12 @@ import { randomBytes } from '@ethersproject/random' // Do not change these require statements to imports before we change to ESM. Breaks external CJS packages depending on this module -const { bls12_381 } = require('@noble/curves/bls12-381') -const { ed25519 } = require('@noble/curves/ed25519') -const { p256 } = require('@noble/curves/p256') -const { p384 } = require('@noble/curves/p384') -const { p521 } = require('@noble/curves/p521') -const { secp256k1 } = require('@noble/curves/secp256k1') -const { sha256, sha384, sha512 } = require('@noble/hashes/sha2') +import {bls12_381} from "@noble/curves/bls12-381"; +import {ed25519} from '@noble/curves/ed25519'; +import {p256} from '@noble/curves/p256'; +import {p384} from "@noble/curves/p384"; +import {p521} from "@noble/curves/p521"; +import {secp256k1} from '@noble/curves/secp256k1'; +import {sha256, sha384, sha512} from '@noble/hashes/sha2' import { generateRSAKeyAsPEM, hexToBase64, hexToPEM, PEMToJwk, privateKeyHexFromPEM } from '@sphereon/ssi-sdk-ext.x509-utils' import { JoseCurve, JoseSignatureAlgorithm, JWK, JwkKeyType, Loggers } from '@sphereon/ssi-types' import { generateKeyPair as generateSigningKeyPair } from '@stablelib/ed25519' diff --git a/packages/kms-local/package.json b/packages/kms-local/package.json index 911223f4..1097bc43 100644 --- a/packages/kms-local/package.json +++ b/packages/kms-local/package.json @@ -13,6 +13,8 @@ "@sphereon/ssi-sdk-ext.did-utils": "workspace:*", "@sphereon/ssi-sdk-ext.key-utils": "workspace:*", "@sphereon/ssi-sdk-ext.x509-utils": "workspace:*", + "@noble/curves": "^1.7.0", + "@noble/hashes": "^1.6.1", "@trust/keyto": "2.0.0-alpha1", "@veramo/core": "4.2.0", "@veramo/key-manager": "4.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba45fead..ca0f360f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -224,7 +224,7 @@ importers: version: link:../key-utils '@transmute/did-key-bls12381': specifier: 0.3.0-unstable.10 - version: 0.3.0-unstable.10(encoding@0.1.13) + version: 0.3.0-unstable.10(encoding@0.1.13)(expo@52.0.11(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1))(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(web-streams-polyfill@3.3.3) '@veramo/core': specifier: 4.2.0 version: 4.2.0(patch_hash=c5oempznsz4br5w3tcuk2i2mau) @@ -752,6 +752,12 @@ importers: packages/kms-local: dependencies: + '@noble/curves': + specifier: ^1.7.0 + version: 1.7.0 + '@noble/hashes': + specifier: ^1.6.1 + version: 1.6.1 '@sphereon/ssi-sdk-ext.did-utils': specifier: workspace:* version: link:../did-utils @@ -2744,9 +2750,11 @@ packages: '@sphereon/kmp-crypto-kms-azure@0.2.0-SNAPSHOT.12': resolution: {integrity: sha512-XDsLNHmFkHcPkwqmYLhxn1vVs2H6rAglrfjtpulOCmvPaqwROMnjS89lMD7F3fUpF5e5sYpk8IL6WlPZGvAP/A==} + bundledDependencies: [] '@sphereon/kmp-mdl-mdoc@0.2.0-SNAPSHOT.22': resolution: {integrity: sha512-uAZZExVy+ug9JLircejWa5eLtAZ7bnBP6xb7DO2+86LRsHNLh2k2jMWJYxp+iWtGHTsh6RYsZl14ScQLvjiQ/A==} + bundledDependencies: [] '@sphereon/musap-native@0.0.1-next.154': resolution: {integrity: sha512-WNdL0bAYV+YnyAdruoHV9nvWh9gag2ELBhbkXYSvynBv5kLBv2sOQ670+GfiLzoAkgl5xyre58QHVM65zzY8Dw==} @@ -6797,15 +6805,6 @@ packages: resolution: {integrity: sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==} engines: {node: 4.x || >=6.0.0} - node-fetch@2.6.12: - resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -11184,7 +11183,7 @@ snapshots: make-dir: 4.0.0 minimatch: 3.0.5 multimatch: 5.0.0 - node-fetch: 2.6.12(encoding@0.1.13) + node-fetch: 2.6.7(encoding@0.1.13) npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-registry-fetch: 17.1.0 @@ -11664,7 +11663,7 @@ snapshots: '@octokit/request-error': 3.0.3 '@octokit/types': 9.3.2 is-plain-object: 5.0.0 - node-fetch: 2.6.7(encoding@0.1.13) + node-fetch: 2.7.0(encoding@0.1.13) universal-user-agent: 6.0.1 transitivePeerDependencies: - encoding @@ -12661,7 +12660,7 @@ snapshots: '@transmute/did-context@0.6.1-unstable.37': {} - '@transmute/did-key-bls12381@0.3.0-unstable.10(encoding@0.1.13)': + '@transmute/did-key-bls12381@0.3.0-unstable.10(encoding@0.1.13)(expo@52.0.11(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1))(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(web-streams-polyfill@3.3.3)': dependencies: '@transmute/bls12381-key-pair': 0.7.0-unstable.81(encoding@0.1.13) '@transmute/did-key-common': 0.3.0-unstable.10(encoding@0.1.13)(expo@52.0.11(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1))(react-native@0.76.3(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(web-streams-polyfill@3.3.3) @@ -17972,12 +17971,6 @@ snapshots: dependencies: http2-client: 1.3.5 - node-fetch@2.6.12(encoding@0.1.13): - dependencies: - whatwg-url: 5.0.0 - optionalDependencies: - encoding: 0.1.13 - node-fetch@2.6.7(encoding@0.1.13): dependencies: whatwg-url: 5.0.0