From 438eb680fdad85e640023fbf10c4c609abb3b02d Mon Sep 17 00:00:00 2001 From: olegnn Date: Tue, 5 Nov 2024 22:25:33 +0100 Subject: [PATCH 1/3] Fix remaining exports from the `vc` module --- examples/CHANGELOG.md | 9 +++++ examples/package.json | 8 ++-- package.json | 2 +- .../cheqd-blockchain-modules/CHANGELOG.md | 7 ++++ .../cheqd-blockchain-modules/package.json | 4 +- packages/credential-sdk/CHANGELOG.md | 6 +++ packages/credential-sdk/package.json | 2 +- packages/credential-sdk/src/vc/index.js | 39 +++++++++---------- packages/dock-blockchain-api/CHANGELOG.md | 7 ++++ packages/dock-blockchain-api/package.json | 4 +- packages/dock-blockchain-modules/CHANGELOG.md | 7 ++++ packages/dock-blockchain-modules/package.json | 6 +-- 12 files changed, 68 insertions(+), 33 deletions(-) diff --git a/examples/CHANGELOG.md b/examples/CHANGELOG.md index 263766f44..3c1d277a6 100644 --- a/examples/CHANGELOG.md +++ b/examples/CHANGELOG.md @@ -1,5 +1,14 @@ # @docknetwork/sdk-examples +## 0.4.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.6.0 + - @docknetwork/dock-blockchain-api@0.4.1 + - @docknetwork/dock-blockchain-modules@0.5.1 + ## 0.4.0 ### Minor Changes diff --git a/examples/package.json b/examples/package.json index 1a20161e7..cbc542941 100644 --- a/examples/package.json +++ b/examples/package.json @@ -2,7 +2,7 @@ "name": "@docknetwork/sdk-examples", "private": true, "type": "module", - "version": "0.4.0", + "version": "0.4.1", "scripts": { "bbs-dock-example": "babel-node ./bbs-dock.js", "claim-deduction-example": "babel-node ./claim-deduction.js", @@ -19,9 +19,9 @@ "lint": "eslint \"*.js\"" }, "dependencies": { - "@docknetwork/credential-sdk": "0.5.0", - "@docknetwork/dock-blockchain-api": "0.4.0", - "@docknetwork/dock-blockchain-modules": "0.5.0" + "@docknetwork/credential-sdk": "0.6.0", + "@docknetwork/dock-blockchain-api": "0.4.1", + "@docknetwork/dock-blockchain-modules": "0.5.1" }, "devDependencies": { "babel-eslint": "^10.1.0", diff --git a/package.json b/package.json index 8372de77f..444abd2e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "0.5.0", + "version": "0.6.0", "private": true, "workspaces": [ "packages/*", diff --git a/packages/cheqd-blockchain-modules/CHANGELOG.md b/packages/cheqd-blockchain-modules/CHANGELOG.md index a4d409e33..4fd49540c 100644 --- a/packages/cheqd-blockchain-modules/CHANGELOG.md +++ b/packages/cheqd-blockchain-modules/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/cheqd-blockchain-modules +## 0.5.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.6.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/cheqd-blockchain-modules/package.json b/packages/cheqd-blockchain-modules/package.json index a6f8ca725..ce6c3787b 100644 --- a/packages/cheqd-blockchain-modules/package.json +++ b/packages/cheqd-blockchain-modules/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/cheqd-blockchain-modules", - "version": "0.5.0", + "version": "0.5.1", "type": "module", "license": "MIT", "main": "./dist/esm/index.js", @@ -28,7 +28,7 @@ "node": ">=18.0.0" }, "dependencies": { - "@docknetwork/credential-sdk": "0.5.0" + "@docknetwork/credential-sdk": "0.6.0" }, "devDependencies": { "@babel/cli": "^7.24.1", diff --git a/packages/credential-sdk/CHANGELOG.md b/packages/credential-sdk/CHANGELOG.md index 731c033b2..12e5e6593 100644 --- a/packages/credential-sdk/CHANGELOG.md +++ b/packages/credential-sdk/CHANGELOG.md @@ -1,5 +1,11 @@ # @docknetwork/credential-sdk +## 0.6.0 + +### Minor Changes + +- Fix remaining exports from the `vc` module + ## 0.5.0 ### Minor Changes diff --git a/packages/credential-sdk/package.json b/packages/credential-sdk/package.json index e3cea8a1f..38f149e53 100644 --- a/packages/credential-sdk/package.json +++ b/packages/credential-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/credential-sdk", - "version": "0.5.0", + "version": "0.6.0", "license": "MIT", "type": "module", "files": [ diff --git a/packages/credential-sdk/src/vc/index.js b/packages/credential-sdk/src/vc/index.js index 3541b44a6..2f14a8d49 100644 --- a/packages/credential-sdk/src/vc/index.js +++ b/packages/credential-sdk/src/vc/index.js @@ -1,7 +1,7 @@ -import { signPresentation, verifyPresentation } from './presentations'; -import { issueCredential, verifyCredential } from './credentials'; +import { signPresentation, verifyPresentation } from "./presentations"; +import { issueCredential, verifyCredential } from "./credentials"; -import { DEFAULT_TYPE, DEFAULT_CONTEXT } from './constants'; +import { DEFAULT_TYPE, DEFAULT_CONTEXT } from "./constants"; /** * Check that credential is verified, i.e. the credential has VCDM compliant structure and the `proof` @@ -28,20 +28,19 @@ export async function isVerifiedPresentation(presentation, params) { return result.verified; } -// TODO: export more methods supplied in revocation/credentials -export { - verifyCredential, - issueCredential, - signPresentation, - verifyPresentation, - DEFAULT_TYPE, - DEFAULT_CONTEXT, -}; - -export { default as Presentation } from './presentation'; -export { default as VerifiableCredential } from './verifiable-credential'; -export { default as VerifiablePresentation } from './verifiable-presentation'; -export { default as StatusList2021Credential } from './status-list2021-credential'; -export { default as PrivateStatusList2021Credential } from './private-status-list2021-credential'; -export * from './helpers'; -export { validateCredentialSchema } from './schema'; +export { default as Presentation } from "./presentation"; +export { default as VerifiableCredential } from "./verifiable-credential"; +export { default as VerifiablePresentation } from "./verifiable-presentation"; +export { default as StatusList2021Credential } from "./status-list2021-credential"; +export { default as PrivateStatusList2021Credential } from "./private-status-list2021-credential"; +export * from "./credentials"; +export * from "./helpers"; +export * from "./schema"; +export * from "./constants"; +export * from "./custom_crypto"; +export * from "./document-loader"; +export * from "./jws"; +export * from "./presentation"; +export * from "./presentations"; +export * from "./revocation"; +export * from "./schema"; diff --git a/packages/dock-blockchain-api/CHANGELOG.md b/packages/dock-blockchain-api/CHANGELOG.md index c38e71a2a..f300efaae 100644 --- a/packages/dock-blockchain-api/CHANGELOG.md +++ b/packages/dock-blockchain-api/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/dock-blockchain-api +## 0.4.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.6.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/dock-blockchain-api/package.json b/packages/dock-blockchain-api/package.json index a561fc1f6..fd6049137 100644 --- a/packages/dock-blockchain-api/package.json +++ b/packages/dock-blockchain-api/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/dock-blockchain-api", - "version": "0.4.0", + "version": "0.4.1", "license": "MIT", "main": "./dist/esm/index.js", "type": "module", @@ -84,7 +84,7 @@ "@polkadot/api": "10.12.4" }, "dependencies": { - "@docknetwork/credential-sdk": "0.5.0", + "@docknetwork/credential-sdk": "0.6.0", "@docknetwork/node-types": "^0.17.0", "@juanelas/base64": "^1.0.5", "@polkadot/api": "10.12.4", diff --git a/packages/dock-blockchain-modules/CHANGELOG.md b/packages/dock-blockchain-modules/CHANGELOG.md index 79990b480..b636205fc 100644 --- a/packages/dock-blockchain-modules/CHANGELOG.md +++ b/packages/dock-blockchain-modules/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/dock-blockchain-modules +## 0.5.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.6.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/dock-blockchain-modules/package.json b/packages/dock-blockchain-modules/package.json index 8cb2b0272..3620571ab 100644 --- a/packages/dock-blockchain-modules/package.json +++ b/packages/dock-blockchain-modules/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/dock-blockchain-modules", - "version": "0.5.0", + "version": "0.5.1", "license": "MIT", "type": "module", "main": "./dist/esm/index.js", @@ -28,7 +28,7 @@ "node": ">=18.0.0" }, "dependencies": { - "@docknetwork/credential-sdk": "0.5.0" + "@docknetwork/credential-sdk": "0.6.0" }, "devDependencies": { "@babel/cli": "^7.24.1", @@ -37,7 +37,7 @@ "@babel/plugin-syntax-import-attributes": "^7.25.6", "@babel/plugin-transform-modules-commonjs": "^7.24.1", "@babel/preset-env": "^7.24.3", - "@docknetwork/dock-blockchain-api": "0.4.0", + "@docknetwork/dock-blockchain-api": "0.4.1", "@rollup/plugin-alias": "^4.0.2", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-commonjs": "^24.0.0", From e335886f8f3d528a6b3ef76c5adb5d254135d777 Mon Sep 17 00:00:00 2001 From: olegnn Date: Tue, 5 Nov 2024 22:34:06 +0100 Subject: [PATCH 2/3] Lints --- packages/credential-sdk/src/vc/credentials.js | 17 +++-- .../credential-sdk/src/vc/custom_crypto.js | 72 ------------------- packages/credential-sdk/src/vc/index.js | 38 +++++----- packages/credential-sdk/src/vc/revocation.js | 3 - 4 files changed, 26 insertions(+), 104 deletions(-) delete mode 100644 packages/credential-sdk/src/vc/custom_crypto.js diff --git a/packages/credential-sdk/src/vc/credentials.js b/packages/credential-sdk/src/vc/credentials.js index 8f78cf220..88d4f4d86 100644 --- a/packages/credential-sdk/src/vc/credentials.js +++ b/packages/credential-sdk/src/vc/credentials.js @@ -15,20 +15,12 @@ import defaultDocumentLoader from './document-loader'; import { getAndValidateSchemaIfPresent } from './schema'; import { checkRevocationRegistryStatus, - DockRevRegQualifier, getCredentialStatus, isAccumulatorRevocationStatus, isRegistryRevocationStatus, - RevRegType, } from './revocation'; - -import { - getSuiteFromKeyDoc, - expandJSONLD, - getKeyFromDIDDocument, - processIfKvac, -} from './helpers'; import { + DockRevRegQualifier, RevRegType, DEFAULT_CONTEXT_V1_URL, credentialContextField, PrivateStatusList2021EntryType, @@ -36,6 +28,13 @@ import { StatusList2021EntryType, PrivateStatusList2021Qualifier, } from './constants'; + +import { + getSuiteFromKeyDoc, + expandJSONLD, + getKeyFromDIDDocument, + processIfKvac, +} from './helpers'; import { ensureValidDatetime } from '../utils/type-helpers'; import { diff --git a/packages/credential-sdk/src/vc/custom_crypto.js b/packages/credential-sdk/src/vc/custom_crypto.js deleted file mode 100644 index d3b108894..000000000 --- a/packages/credential-sdk/src/vc/custom_crypto.js +++ /dev/null @@ -1,72 +0,0 @@ -import { - EcdsaSecp256k1VerKeyName, - EcdsaSecp256k1SigName, - Ed25519VerKeyName, - Ed25519SigName, - Ed255192020VerKeyName, - Ed255192020SigName, - Sr25519VerKeyName, - Sr25519SigName, - Bls12381BBSDockVerKeyName, - Bls12381BBSSigDockSigName, - Bls12381BBSSigProofDockSigName, - Bls12381BBS23DockVerKeyName, - Bls12381BBS23SigDockSigName, - Bls12381BBS23SigProofDockSigName, - Bls12381PSDockVerKeyName, - Bls12381PSSigDockSigName, - Bls12381PSSigProofDockSigName, - Bls12381BBDT16MacDockName, - Bls12381BBDT16MacProofDockName, -} from './crypto/constants'; - -import EcdsaSecp256k1VerificationKey2019 from './crypto/EcdsaSecp256k1VerificationKey2019'; -import EcdsaSecp256k1Signature2019 from './crypto/EcdsaSecp256k1Signature2019'; -import Ed25519VerificationKey2018 from './crypto/Ed25519VerificationKey2018'; -import Ed25519Signature2018 from './crypto/Ed25519Signature2018'; -import Ed25519Signature2020 from './crypto/Ed25519Signature2020'; -// import Sr25519VerificationKey2020 from './crypto/Sr25519VerificationKey2020'; -// import Sr25519Signature2020 from './crypto/Sr25519Signature2020'; -import Bls12381BBSSignatureDock2022 from './crypto/Bls12381BBSSignatureDock2022'; -import Bls12381BBSSignatureProofDock2022 from './crypto/Bls12381BBSSignatureProofDock2022'; -import Bls12381BBSSignatureDock2023 from './crypto/Bls12381BBSSignatureDock2023'; -import Bls12381BBSSignatureProofDock2023 from './crypto/Bls12381BBSSignatureProofDock2023'; -import Bls12381PSSignatureDock2023 from './crypto/Bls12381PSSignatureDock2023'; -import Bls12381PSSignatureProofDock2023 from './crypto/Bls12381PSSignatureProofDock2023'; -import JsonWebSignature2020 from './crypto/JsonWebSignature2020'; - -export { - EcdsaSecp256k1VerKeyName, - EcdsaSecp256k1SigName, - Ed25519VerKeyName, - Ed25519SigName, - Ed255192020VerKeyName, - Ed255192020SigName, - Sr25519VerKeyName, - Sr25519SigName, - EcdsaSecp256k1VerificationKey2019, - EcdsaSecp256k1Signature2019, - Ed25519VerificationKey2018, - Ed25519Signature2018, - Ed25519Signature2020, - // Sr25519VerificationKey2020, - // Sr25519Signature2020, - Bls12381BBSSignatureDock2022, - Bls12381BBSSignatureProofDock2022, - Bls12381BBSSignatureDock2023, - Bls12381BBSSignatureProofDock2023, - Bls12381PSSignatureDock2023, - Bls12381PSSignatureProofDock2023, - Bls12381BBSDockVerKeyName, - Bls12381BBSSigDockSigName, - Bls12381BBSSigProofDockSigName, - Bls12381BBS23DockVerKeyName, - Bls12381BBS23SigDockSigName, - Bls12381BBS23SigProofDockSigName, - Bls12381PSDockVerKeyName, - Bls12381PSSigDockSigName, - Bls12381PSSigProofDockSigName, - Bls12381BBDT16MacDockName, - Bls12381BBDT16MacProofDockName, - JsonWebSignature2020, -}; diff --git a/packages/credential-sdk/src/vc/index.js b/packages/credential-sdk/src/vc/index.js index 2f14a8d49..8ae23644a 100644 --- a/packages/credential-sdk/src/vc/index.js +++ b/packages/credential-sdk/src/vc/index.js @@ -1,7 +1,5 @@ -import { signPresentation, verifyPresentation } from "./presentations"; -import { issueCredential, verifyCredential } from "./credentials"; - -import { DEFAULT_TYPE, DEFAULT_CONTEXT } from "./constants"; +import { verifyPresentation } from './presentations'; +import { verifyCredential } from './credentials'; /** * Check that credential is verified, i.e. the credential has VCDM compliant structure and the `proof` @@ -28,19 +26,19 @@ export async function isVerifiedPresentation(presentation, params) { return result.verified; } -export { default as Presentation } from "./presentation"; -export { default as VerifiableCredential } from "./verifiable-credential"; -export { default as VerifiablePresentation } from "./verifiable-presentation"; -export { default as StatusList2021Credential } from "./status-list2021-credential"; -export { default as PrivateStatusList2021Credential } from "./private-status-list2021-credential"; -export * from "./credentials"; -export * from "./helpers"; -export * from "./schema"; -export * from "./constants"; -export * from "./custom_crypto"; -export * from "./document-loader"; -export * from "./jws"; -export * from "./presentation"; -export * from "./presentations"; -export * from "./revocation"; -export * from "./schema"; +export { default as Presentation } from './presentation'; +export { default as VerifiableCredential } from './verifiable-credential'; +export { default as VerifiablePresentation } from './verifiable-presentation'; +export { default as StatusList2021Credential } from './status-list2021-credential'; +export { default as PrivateStatusList2021Credential } from './private-status-list2021-credential'; +export * from './credentials'; +export * from './helpers'; +export * from './schema'; +export * from './constants'; +export * from './custom_crypto'; +export { default as CredentialIssuancePurpose } from './CredentialIssuancePurpose'; +export { default as documentLoader } from './document-loader'; +export * from './jws'; +export * from './presentations'; +export * from './revocation'; +export * from './crypto'; diff --git a/packages/credential-sdk/src/vc/revocation.js b/packages/credential-sdk/src/vc/revocation.js index eca03cf0b..69d318834 100644 --- a/packages/credential-sdk/src/vc/revocation.js +++ b/packages/credential-sdk/src/vc/revocation.js @@ -6,7 +6,6 @@ import { KB_UNI_ACCUMULATOR_24, } from '@docknetwork/crypto-wasm-ts'; import { randomAsHex, u8aToHex } from '../utils/bytes'; -import { OneOfPolicy } from '../types/policy'; import { RevRegType, @@ -142,5 +141,3 @@ export async function checkRevocationRegistryStatus( return { verified: true }; } - -export { OneOfPolicy, RevRegType, DockRevRegQualifier }; From d1d0c2e3dfcf7aa81526903b538e8bdf8cadd2f0 Mon Sep 17 00:00:00 2001 From: olegnn Date: Tue, 5 Nov 2024 22:38:01 +0100 Subject: [PATCH 3/3] More tweaks --- packages/credential-sdk/src/types/did/document.js | 2 +- packages/credential-sdk/src/types/did/onchain/did-key.js | 2 +- .../src/types/offchain-signatures/public-keys/index.js | 2 +- packages/credential-sdk/src/vc/credentials.js | 5 +++-- packages/credential-sdk/src/vc/helpers.js | 2 +- packages/credential-sdk/src/vc/index.js | 1 - packages/credential-sdk/src/vc/presentation.js | 2 +- packages/credential-sdk/src/vc/presentations.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/credential-sdk/src/types/did/document.js b/packages/credential-sdk/src/types/did/document.js index d25d4a588..696e8ced7 100644 --- a/packages/credential-sdk/src/types/did/document.js +++ b/packages/credential-sdk/src/types/did/document.js @@ -25,7 +25,7 @@ import { Ed255192020VerKeyName, Ed25519VerKeyName, Sr25519VerKeyName, -} from '../../vc/custom_crypto'; +} from '../../vc/crypto'; import { PublicKeyEd25519, PublicKeySecp256k1, diff --git a/packages/credential-sdk/src/types/did/onchain/did-key.js b/packages/credential-sdk/src/types/did/onchain/did-key.js index 348c01853..6f9f07885 100644 --- a/packages/credential-sdk/src/types/did/onchain/did-key.js +++ b/packages/credential-sdk/src/types/did/onchain/did-key.js @@ -21,7 +21,7 @@ import { Bls12381BBS23DockVerKeyName, Bls12381BBSDockVerKeyName, Bls12381PSDockVerKeyName, -} from '../../../vc/custom_crypto'; +} from '../../../vc/crypto'; /** * Class representing either of possible DidKeys. diff --git a/packages/credential-sdk/src/types/offchain-signatures/public-keys/index.js b/packages/credential-sdk/src/types/offchain-signatures/public-keys/index.js index 1028a7cc5..9780dd2fa 100644 --- a/packages/credential-sdk/src/types/offchain-signatures/public-keys/index.js +++ b/packages/credential-sdk/src/types/offchain-signatures/public-keys/index.js @@ -3,7 +3,7 @@ import { Bls12381BBS23DockVerKeyName, Bls12381BBSDockVerKeyName, Bls12381PSDockVerKeyName, -} from '../../../vc/custom_crypto'; +} from '../../../vc/crypto'; import { BBSPublicKeyValue, BBSPlusPublicKeyValue, diff --git a/packages/credential-sdk/src/vc/credentials.js b/packages/credential-sdk/src/vc/credentials.js index 88d4f4d86..82edff954 100644 --- a/packages/credential-sdk/src/vc/credentials.js +++ b/packages/credential-sdk/src/vc/credentials.js @@ -20,7 +20,8 @@ import { isRegistryRevocationStatus, } from './revocation'; import { - DockRevRegQualifier, RevRegType, + DockRevRegQualifier, + RevRegType, DEFAULT_CONTEXT_V1_URL, credentialContextField, PrivateStatusList2021EntryType, @@ -57,7 +58,7 @@ import { Bls12381BBS23SigDockSigName, Bls12381BBDT16MacDockName, Bls12381BBDT16MacProofDockName, -} from './custom_crypto'; +} from './crypto'; import { signJWS } from './jws'; import Bls12381BBDT16MACProofDock2024 from './crypto/Bls12381BBDT16MACProofDock2024'; diff --git a/packages/credential-sdk/src/vc/helpers.js b/packages/credential-sdk/src/vc/helpers.js index 4a0720df1..cdf182def 100644 --- a/packages/credential-sdk/src/vc/helpers.js +++ b/packages/credential-sdk/src/vc/helpers.js @@ -16,7 +16,7 @@ import { Bls12381PSDockVerKeyName, JsonWebSignature2020, Ed25519Signature2020, -} from './custom_crypto'; +} from './crypto'; import { Bls12381BBDT16DockVerKeyName, Bls12381BBDT16MacDockName, diff --git a/packages/credential-sdk/src/vc/index.js b/packages/credential-sdk/src/vc/index.js index 8ae23644a..c2e84d79f 100644 --- a/packages/credential-sdk/src/vc/index.js +++ b/packages/credential-sdk/src/vc/index.js @@ -35,7 +35,6 @@ export * from './credentials'; export * from './helpers'; export * from './schema'; export * from './constants'; -export * from './custom_crypto'; export { default as CredentialIssuancePurpose } from './CredentialIssuancePurpose'; export { default as documentLoader } from './document-loader'; export * from './jws'; diff --git a/packages/credential-sdk/src/vc/presentation.js b/packages/credential-sdk/src/vc/presentation.js index ff18589e4..d35ce208b 100644 --- a/packages/credential-sdk/src/vc/presentation.js +++ b/packages/credential-sdk/src/vc/presentation.js @@ -27,7 +27,7 @@ import defaultDocumentLoader from './document-loader'; import { Bls12381BBSSignatureDock2023, Bls12381PSSignatureDock2023, -} from './custom_crypto'; +} from './crypto'; import Bls12381BBDT16MACDock2024 from './crypto/Bls12381BBDT16MACDock2024'; import { isCredVerGte060 } from './crypto/common/DockCryptoSignature'; diff --git a/packages/credential-sdk/src/vc/presentations.js b/packages/credential-sdk/src/vc/presentations.js index 38d149b6a..dfb6caafe 100644 --- a/packages/credential-sdk/src/vc/presentations.js +++ b/packages/credential-sdk/src/vc/presentations.js @@ -36,7 +36,7 @@ import { Bls12381BBSSignatureDock2022, Bls12381BBSSignatureDock2023, Bls12381PSSignatureDock2023, -} from './custom_crypto'; +} from './crypto'; const { AuthenticationProofPurpose } = jsigs.purposes;