From 75d555e8d0ca1dee5e0564803349f184265f336d Mon Sep 17 00:00:00 2001 From: Oleg Nosov Date: Wed, 4 Dec 2024 17:17:15 +0400 Subject: [PATCH] Use latest `cheqd` node for tests (#489) * Use latest `cheqd` node * Include `IMAGE_TAG` * Include `IMAGE_TAG` in `turbo` call * Modify the `SDK` to be compatible with the most recent `cheqd` node. * Update snapshots * Correct `IMAGE_TAG` * Switch to `cjs` tag * Bump up version * Improve `filterObj` * Enable cache for build --- .github/workflows/cheqd-sdk-tests.yml | 3 +- examples/CHANGELOG.md | 11 +- examples/package.json | 8 +- package.json | 2 +- packages/cheqd-blockchain-api/CHANGELOG.md | 11 ++ packages/cheqd-blockchain-api/package.json | 4 +- .../cheqd-blockchain-modules/CHANGELOG.md | 7 ++ .../cheqd-blockchain-modules/package.json | 6 +- packages/credential-sdk/CHANGELOG.md | 6 ++ packages/credential-sdk/package.json | 2 +- .../src/types/did/document/index.js | 101 ++++++++++++------ ...method-ref-or-cheqd-verification-method.js | 22 ++++ .../verification-method-ref-or-did-key.js | 14 --- .../types/did/document/verification-method.js | 42 +------- packages/credential-sdk/src/utils/misc.js | 20 ++++ .../tests/__snapshots__/document.test.js.snap | 79 ++++++-------- 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 +- scripts/cheqd_entrypoint | 27 +++-- scripts/with_cheqd_docker_test_node | 16 ++- turbo.json | 2 +- yarn.lock | 4 +- 24 files changed, 249 insertions(+), 162 deletions(-) create mode 100644 packages/credential-sdk/src/types/did/document/verification-method-ref-or-cheqd-verification-method.js delete mode 100644 packages/credential-sdk/src/types/did/document/verification-method-ref-or-did-key.js diff --git a/.github/workflows/cheqd-sdk-tests.yml b/.github/workflows/cheqd-sdk-tests.yml index f9395c876..bb803bcc3 100644 --- a/.github/workflows/cheqd-sdk-tests.yml +++ b/.github/workflows/cheqd-sdk-tests.yml @@ -6,6 +6,7 @@ jobs: runs-on: ubuntu-latest env: CHEQD_MNEMONIC: "steak come surprise obvious remain black trouble measure design volume retreat float coach amused match album moment radio stuff crack orphan ranch dose endorse" + IMAGE_TAG: 3.0.1 steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 @@ -14,4 +15,4 @@ jobs: - run: yarn install --frozen-lockfile --ignore-scripts - run: npm install -g turbo@2.0.5 - run: turbo telemetry disable - - run: CHEQD_MNEMONIC=$CHEQD_MNEMONIC turbo run test-with-node --filter @docknetwork/cheqd-blockchain-modules + - run: CHEQD_MNEMONIC=$CHEQD_MNEMONIC IMAGE_TAG=$IMAGE_TAG turbo run test-with-node --filter @docknetwork/cheqd-blockchain-modules diff --git a/examples/CHANGELOG.md b/examples/CHANGELOG.md index bd965720d..a7b8d27b5 100644 --- a/examples/CHANGELOG.md +++ b/examples/CHANGELOG.md @@ -1,5 +1,14 @@ # @docknetwork/sdk-examples +## 0.6.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.15.0 + - @docknetwork/dock-blockchain-api@0.8.1 + - @docknetwork/dock-blockchain-modules@0.9.1 + ## 0.6.0 ### Minor Changes @@ -13,12 +22,12 @@ - @docknetwork/dock-blockchain-api@0.8.0 - @docknetwork/credential-sdk@0.14.0 - ## 0.5.2 ### Patch Changes - Updated dependencies + - @docknetwork/dock-blockchain-api@0.7.0 - @docknetwork/credential-sdk@0.13.0 - @docknetwork/dock-blockchain-modules@0.8.1 diff --git a/examples/package.json b/examples/package.json index c559751a5..8663ed000 100644 --- a/examples/package.json +++ b/examples/package.json @@ -2,7 +2,7 @@ "name": "@docknetwork/sdk-examples", "private": true, "type": "module", - "version": "0.6.0", + "version": "0.6.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.14.0", - "@docknetwork/dock-blockchain-api": "0.8.0", - "@docknetwork/dock-blockchain-modules": "0.9.0" + "@docknetwork/credential-sdk": "0.15.0", + "@docknetwork/dock-blockchain-api": "0.8.1", + "@docknetwork/dock-blockchain-modules": "0.9.1" }, "devDependencies": { "babel-eslint": "^10.1.0", diff --git a/package.json b/package.json index 2af6454b0..7faf6e1ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "0.16.0", + "version": "0.17.0", "private": true, "workspaces": [ "packages/*", diff --git a/packages/cheqd-blockchain-api/CHANGELOG.md b/packages/cheqd-blockchain-api/CHANGELOG.md index 94f13ddd8..e2e9c2ee5 100644 --- a/packages/cheqd-blockchain-api/CHANGELOG.md +++ b/packages/cheqd-blockchain-api/CHANGELOG.md @@ -1,5 +1,16 @@ # @docknetwork/cheqd-blockchain-api +## 0.14.0 + +### Minor Changes + +- Modify the `SDK` to be compatible with the most recent `cheqd` node. + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.15.0 + ## 0.13.0 ### Minor Changes diff --git a/packages/cheqd-blockchain-api/package.json b/packages/cheqd-blockchain-api/package.json index c6bd09af2..60c2bd8a3 100644 --- a/packages/cheqd-blockchain-api/package.json +++ b/packages/cheqd-blockchain-api/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/cheqd-blockchain-api", - "version": "0.13.0", + "version": "0.14.0", "license": "MIT", "main": "./dist/esm/index.js", "type": "module", @@ -34,7 +34,7 @@ }, "dependencies": { "@cheqd/sdk": "cjs", - "@docknetwork/credential-sdk": "0.14.0" + "@docknetwork/credential-sdk": "0.15.0" }, "devDependencies": { "@babel/cli": "^7.24.1", diff --git a/packages/cheqd-blockchain-modules/CHANGELOG.md b/packages/cheqd-blockchain-modules/CHANGELOG.md index b86578794..0899d314e 100644 --- a/packages/cheqd-blockchain-modules/CHANGELOG.md +++ b/packages/cheqd-blockchain-modules/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/cheqd-blockchain-modules +## 0.11.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.15.0 + ## 0.11.0 ### Minor Changes diff --git a/packages/cheqd-blockchain-modules/package.json b/packages/cheqd-blockchain-modules/package.json index 7bf608017..2bf2ee9dd 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.11.0", + "version": "0.11.1", "type": "module", "license": "MIT", "main": "./dist/esm/index.js", @@ -33,7 +33,7 @@ "node": ">=18.0.0" }, "dependencies": { - "@docknetwork/credential-sdk": "0.14.0" + "@docknetwork/credential-sdk": "0.15.0" }, "devDependencies": { "@babel/cli": "^7.24.1", @@ -42,7 +42,7 @@ "@babel/plugin-syntax-import-attributes": "^7.25.6", "@babel/plugin-transform-modules-commonjs": "^7.24.1", "@babel/preset-env": "^7.24.3", - "@docknetwork/cheqd-blockchain-api": "0.13.0", + "@docknetwork/cheqd-blockchain-api": "0.14.0", "@rollup/plugin-alias": "^4.0.2", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-commonjs": "^24.0.0", diff --git a/packages/credential-sdk/CHANGELOG.md b/packages/credential-sdk/CHANGELOG.md index 01a607992..d1c6a4ad4 100644 --- a/packages/credential-sdk/CHANGELOG.md +++ b/packages/credential-sdk/CHANGELOG.md @@ -1,5 +1,11 @@ # @docknetwork/credential-sdk +## 0.15.0 + +### Minor Changes + +- Modify the `SDK` to be compatible with the most recent `cheqd` node. + ## 0.14.0 ### Minor Changes diff --git a/packages/credential-sdk/package.json b/packages/credential-sdk/package.json index 5c95e3841..a8530583e 100644 --- a/packages/credential-sdk/package.json +++ b/packages/credential-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@docknetwork/credential-sdk", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "type": "module", "files": [ diff --git a/packages/credential-sdk/src/types/did/document/index.js b/packages/credential-sdk/src/types/did/document/index.js index 0824b4d43..1ebc9ff19 100644 --- a/packages/credential-sdk/src/types/did/document/index.js +++ b/packages/credential-sdk/src/types/did/document/index.js @@ -1,5 +1,6 @@ import { TypedArray, + TypedMap, TypedSet, TypedString, TypedStruct, @@ -10,8 +11,9 @@ import { NamespaceDid } from '../onchain/typed-did'; import { DidKey, DidKeys } from '../onchain/did-key'; import { VerificationRelationship } from '../onchain/verification-relationship'; import { Service, CheqdService } from './service'; -import { VerificationMethod, CheqdVerificationMethod, VerificationMethodRefWithDidKey } from './verification-method'; -import VerificationMethodRefOrDidKey from './verification-method-ref-or-did-key'; +import { VerificationMethod, CheqdVerificationMethod } from './verification-method'; +import VerificationMethodRefOrCheqdVerificationMethod from './verification-method-ref-or-cheqd-verification-method'; +import { Ed25519Verification2018Method } from './verification-method-type'; import VerificationMethodRef from './verification-method-ref'; import { ATTESTS_IRI, CONTEXT_URI } from './const'; @@ -33,6 +35,10 @@ class VerificationMethods extends TypedArray { static Class = VerificationMethod; } +class CheqdVerificationMethods extends TypedArray { + static Class = CheqdVerificationMethod; +} + export class Services extends TypedArray { static Class = Service; } @@ -43,8 +49,8 @@ export class VerificationMethodReferences extends TypedArray { export class VersionId extends TypedUUID {} -class AssertionMethod extends TypedArray { - static Class = VerificationMethodRefOrDidKey; +class CheqdAssertionMethod extends TypedArray { + static Class = VerificationMethodRefOrCheqdVerificationMethod; } export class DIDDocument extends TypedStruct { @@ -225,14 +231,14 @@ export class DIDDocument extends TypedStruct { capabilityInvocation, } = this; - class VerificationMethodRefOrDidKeySet extends TypedSet { - static Class = VerificationMethodRefOrDidKey; + class VerificationMethodRefOrCheqdVerificationMethodSet extends TypedSet { + static Class = VerificationMethodRefOrCheqdVerificationMethod; } - const auth = new VerificationMethodRefOrDidKeySet(authentication); - const assertion = new VerificationMethodRefOrDidKeySet(assertionMethod); - const keyAgr = new VerificationMethodRefOrDidKeySet(keyAgreement); - const capInv = new VerificationMethodRefOrDidKeySet(capabilityInvocation); + const auth = new VerificationMethodRefOrCheqdVerificationMethodSet(authentication); + const assertion = new VerificationMethodRefOrCheqdVerificationMethodSet(assertionMethod); + const keyAgr = new VerificationMethodRefOrCheqdVerificationMethodSet(keyAgreement); + const capInv = new VerificationMethodRefOrCheqdVerificationMethodSet(capabilityInvocation); const keys = [...verificationMethod] .map((method) => { @@ -295,14 +301,12 @@ export class CheqdDIDDocument extends TypedStruct { id: ID, alsoKnownAs: AlsoKnownAs, controller: Controllers, - verificationMethod: class CheqdVerificationMethods extends TypedArray { - static Class = CheqdVerificationMethod; - }, + verificationMethod: CheqdVerificationMethods, service: class CheqdServices extends TypedArray { static Class = CheqdService; }, authentication: VerificationMethodReferences, - assertionMethod: AssertionMethod, + assertionMethod: CheqdAssertionMethod, keyAgreement: VerificationMethodReferences, capabilityInvocation: VerificationMethodReferences, capabilityDelegation: VerificationMethodReferences, @@ -314,7 +318,7 @@ export class CheqdDIDDocument extends TypedStruct { id, alsoKnownAs, controller, - rawVerificationMethodWithOffchainKeys, + rawVerificationMethod, service, authentication, assertionMethodWithOffchainKeys, @@ -323,29 +327,42 @@ export class CheqdDIDDocument extends TypedStruct { capabilityDelegation, versionId = TypedUUID.random(), ) { - const verificationMethodWithOffchainKeys = [...rawVerificationMethodWithOffchainKeys].map((verMethod) => CheqdVerificationMethod.from(verMethod)); + const verificationMethod = CheqdVerificationMethods.from(rawVerificationMethod); + const mappedVerificationMethod = [...verificationMethod].map( + (verMethod) => { + if (verMethod.isOffchain()) { + return new CheqdVerificationMethod( + verMethod.id, + verMethod.controller, + new Ed25519Verification2018Method(), + Array(32).fill(0), + ); + } - const offchainVerMethod = verificationMethodWithOffchainKeys.filter((verMethod) => verMethod.isOffchain()); - const verificationMethod = verificationMethodWithOffchainKeys.filter( - (verMethod) => !verMethod.isOffchain(), + return verMethod; + }, ); + const offchainVerMethod = verificationMethod.filter((verMethod) => verMethod.isOffchain()); + const assertionMethod = [ - ...AssertionMethod.from(assertionMethodWithOffchainKeys).filter((ref) => !offchainVerMethod.some((verMethod) => verMethod.id.eq(ref))), - ...[...offchainVerMethod].map((verMethod) => verMethod.toVerificationMethod().toVerificationMethodRefWithDidKey()), + ...CheqdAssertionMethod.from(assertionMethodWithOffchainKeys.filter((ref) => !offchainVerMethod.some((verMethod) => verMethod.id.eq(ref)))), + ...offchainVerMethod, ]; - super(context, + super( + context, id, alsoKnownAs, controller, - verificationMethod, + mappedVerificationMethod, service, authentication, assertionMethod, keyAgreement, capabilityInvocation, capabilityDelegation, - versionId); + versionId, + ); } toDIDDocument() { @@ -363,24 +380,40 @@ export class CheqdDIDDocument extends TypedStruct { service, } = this; - const offchainVerMethod = [ - ...assertionMethod.filter( - (keyRefOrKey) => keyRefOrKey instanceof VerificationMethodRefWithDidKey, - ), - ].map((verMethod) => verMethod.toVerificationMethod()); - const assertionMethodWithoutOffchainKeys = [...assertionMethod].map( - (keyRefOrKey) => (keyRefOrKey instanceof VerificationMethodRefWithDidKey ? keyRefOrKey.ref : keyRefOrKey), - ); + const assertionMethodOffchainKeys = new class extends TypedMap { + static KeyClass = VerificationMethodRef; + + static ValueClass = CheqdVerificationMethod; + }([...assertionMethod].map( + (keyRefOrKey) => (keyRefOrKey instanceof CheqdVerificationMethod ? [keyRefOrKey.id, keyRefOrKey] : null), + ).filter(Boolean)); + const verificationMethodWithOffchainKeys = [...VerificationMethods.from(verificationMethod)].map((verMethod) => { + const offchain = assertionMethodOffchainKeys.get(verMethod.id); + + if (offchain != null) { + return new VerificationMethod( + verMethod.id, + offchain.verificationMethodType, + verMethod.controller, + offchain.verificationMaterial, + ); + } + + return verMethod; + }); + const assertionMethodOnlyRefs = [...assertionMethod].map( + (keyRefOrKey) => (keyRefOrKey instanceof CheqdVerificationMethod ? keyRefOrKey.id : keyRefOrKey), + ).filter(Boolean); return new DIDDocument( context, id, alsoKnownAs, controller, - [...verificationMethod, ...offchainVerMethod], + verificationMethodWithOffchainKeys, service, authentication, - assertionMethodWithoutOffchainKeys, + assertionMethodOnlyRefs, keyAgreement, capabilityInvocation, capabilityDelegation, diff --git a/packages/credential-sdk/src/types/did/document/verification-method-ref-or-cheqd-verification-method.js b/packages/credential-sdk/src/types/did/document/verification-method-ref-or-cheqd-verification-method.js new file mode 100644 index 000000000..d0a884726 --- /dev/null +++ b/packages/credential-sdk/src/types/did/document/verification-method-ref-or-cheqd-verification-method.js @@ -0,0 +1,22 @@ +import VerificationMethodRef from './verification-method-ref'; +import { CheqdVerificationMethod } from './verification-method'; +import { withFrom } from '../../generic'; + +export default class VerificationMethodRefOrCheqdVerificationMethod extends withFrom( + VerificationMethodRef, + (value, from) => { + try { + return class CheqdVerificationMethodToJSONString extends CheqdVerificationMethod { + toJSON() { + return JSON.stringify(JSON.stringify(super.toJSON())); + } + + static from(obj) { + return typeof obj === 'string' ? super.fromJSON(JSON.parse(JSON.parse(obj))) : super.from(obj); + } + }.from(value); + } catch { + return from(value); + } + }, +) {} diff --git a/packages/credential-sdk/src/types/did/document/verification-method-ref-or-did-key.js b/packages/credential-sdk/src/types/did/document/verification-method-ref-or-did-key.js deleted file mode 100644 index a2668d3e6..000000000 --- a/packages/credential-sdk/src/types/did/document/verification-method-ref-or-did-key.js +++ /dev/null @@ -1,14 +0,0 @@ -import VerificationMethodRef from './verification-method-ref'; -import { VerificationMethodRefWithDidKey } from './verification-method'; -import { withFrom } from '../../generic'; - -export default class VerificationMethodRefOrDidKey extends withFrom( - VerificationMethodRef, - (value, from) => { - try { - return VerificationMethodRefWithDidKey.from(value); - } catch (err) { - return from(value); - } - }, -) {} diff --git a/packages/credential-sdk/src/types/did/document/verification-method.js b/packages/credential-sdk/src/types/did/document/verification-method.js index 5687a7ca8..9ce3b129e 100644 --- a/packages/credential-sdk/src/types/did/document/verification-method.js +++ b/packages/credential-sdk/src/types/did/document/verification-method.js @@ -30,9 +30,8 @@ import { Ed25519Verification2018Method, Ed25519Verification2020Method, Verificat import VerificationMethodRef from './verification-method-ref'; import { NamespaceDid } from '../onchain/typed-did'; import { - fmtIter, valueBytes, + fmtIter, valueBytes, filterObj, } from '../../../utils'; -import { DidKeyValue } from '../onchain/did-key'; export class PublicKeyBase58 extends withBase58(TypedBytes) {} @@ -119,16 +118,15 @@ export class VerificationMethod extends withFrom(TypedStruct, (value, from) => ( ); } - toVerificationMethodRefWithDidKey() { - // eslint-disable-next-line no-use-before-define - return new VerificationMethodRefWithDidKey(this.id, this.publicKey()); + toJSON() { + return filterObj(super.toJSON(), (_, value) => value != null); } } export class CheqdVerificationMethod extends withFrom( TypedStruct, (value, from) => (value instanceof VerificationMethod - ? value.toCheqdVerificationMethod() + ? from(value.toCheqdVerificationMethod()) : from(value)), ) { static Classes = { @@ -154,35 +152,3 @@ export class CheqdVerificationMethod extends withFrom( ); } } - -export class VerificationMethodRefWithDidKey extends withFrom( - TypedStruct, - function from(value, fromFn) { - if (typeof value === 'string') { - return new this(...value.split('=')); - } else { - return fromFn(value); - } - }, -) { - static Classes = { - ref: VerificationMethodRef, - key: withBase58(DidKeyValue), - }; - - toVerificationMethod() { - // eslint-disable-next-line no-use-before-define - return new VerificationMethod( - this.ref, - this.key.constructor.VerKeyType, - this.ref.did, - this.key.value.bytes, - ); - } - - toJSON() { - const { ref, key } = this; - - return `${ref}=${key}`; - } -} diff --git a/packages/credential-sdk/src/utils/misc.js b/packages/credential-sdk/src/utils/misc.js index 2f30dbecf..4097ca52b 100644 --- a/packages/credential-sdk/src/utils/misc.js +++ b/packages/credential-sdk/src/utils/misc.js @@ -130,6 +130,26 @@ export function parseDIDUrl(didUrl) { throw new Error(`Invalid DID: \`${didUrl}\``); } +/** + * Filters properties of the object according to the supplied `filter`. + * + * @template K + * @template V + * @param {Object} obj + * @param {function(K, V): boolean} filter + * @returns {Object} + */ +export const filterObj = (obj, filter) => { + const res = Object.create(Object.getPrototypeOf(obj)); + for (const [key, value] of Object.entries(obj)) { + if (filter(key, value)) { + res[key] = value; + } + } + + return res; +}; + /** * Ensures that provided value matches supplied pattern(s), throws an error otherwise. * diff --git a/packages/credential-sdk/tests/__snapshots__/document.test.js.snap b/packages/credential-sdk/tests/__snapshots__/document.test.js.snap index ec764409b..88243fc2f 100644 --- a/packages/credential-sdk/tests/__snapshots__/document.test.js.snap +++ b/packages/credential-sdk/tests/__snapshots__/document.test.js.snap @@ -24,7 +24,7 @@ exports[`DID document workflow \`CheqdDIDDocument\` 2`] = ` "alsoKnownAs": [], "assertionMethod": [ "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-1", - "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2=BBXr5GktzTvvVhRsbmYdJw2Tw3LHbkL8GBewX7KoKTZC8cVhbtbm23jCSmkiqnLEs2vwJDQWFFb5FvNJhDuCHPaZkVobYByLv57KQYVriE7CwrzjXPcp61RVq6sChaE3hQ7SvDVyF55zrZ7xZTyXYKDMLvhYKmHwL8kJ1o9KAq5ZNBFJFSqhCJvejjkPXHg5YXPHAvFKS", + ""{\\"id\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2\\",\\"controller\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54\\",\\"verificationMethodType\\":\\"Bls12381BBSVerificationKeyDock2023\\",\\"verificationMaterial\\":\\"CeEf4Q1kvLo66eSbTSujuasf2mv1rTQEpK8rnuyqMxpP\\"}"", ], "authentication": [ "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-1", @@ -49,6 +49,12 @@ exports[`DID document workflow \`CheqdDIDDocument\` 2`] = ` "verificationMaterial": "Bt5Mafvpcqou1pBF8SnW1BJMvpkSzZnPEgWunTUFwHZm", "verificationMethodType": "Ed25519VerificationKey2018", }, + { + "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", + "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2", + "verificationMaterial": "11111111111111111111111111111111", + "verificationMethodType": "Ed25519VerificationKey2018", + }, ], "versionId": "28edc043-872b-4ab7-9cb8-b01d1bd677c5", } @@ -62,10 +68,10 @@ exports[`DID document workflow \`CheqdDIDDocument\` 3`] = ` "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-6", "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-8", "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-9", - "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2=BBXr5GktzTvvVhRsbmYdJw2Tw3LHbkL8GBewX7KoKTZC8cVhbtbm23jCSmkiqnLEs2vwJDQWFFb5FvNJhDuCHPaZkVobYByLv57KQYVriE7CwrzjXPcp61RVq6sChaE3hQ7SvDVyF55zrZ7xZTyXYKDMLvhYKmHwL8kJ1o9KAq5ZNBFJFSqhCJvejjkPXHg5YXPHAvFKS", - "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-5=BBXr5GktzTvvVhRsbmYdJw2Tw3G5BoeByaj9iFtGToMCQHXwjsjRvLUpz94VaiJVAYrs4uyKBmBoMN89tbo4dzX5nizBn6MjwbZXKHEKd2ZBzXaVg4TTdw6VHXT9nWYs5PXBEZBWEncp5mZ4pUMwhLk6XQUgSXgYHN9PHik8vszRLLrN1TkWSKn1D2VAm2aGmHyu6Mtnp", - "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-11=BBXr5GktzTvvVhRsbmYdJw2Tw3GBAjToki5h3osi8WMS3RF4QLNS1D3atcFAHFFFFbXfETadaeApWKZsx5jF1WTtngunVo67bFhrd3KxFWtoYUoxtxNABmZpYPTP6HWeadskCqZFZeKVmCu2uu9TtuNjgBA5shwVHcc5cbmEsYavv4nq8oenCzMwjQ4cCxDE2KNHyFXL8", - "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-12=BBXr5GktzTvvVhRsbmYdJw2Tw3LUVjBmqG8HFzgouT6CmR8j6gN1hRg9wg6eBBNoffP4D42hRbzknBxiTSxZAPri5yrWHGKwohGZtirDvLDunXcVA1a4ATw4WdLsfJxK4ayTSqtBhWRJJ8Gcp6yKZBUY96K7242JRcBWP4gzgQsCtdf1AUDEWc5CKsGZ5LfSuTgfKrUQt", + ""{\\"id\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2\\",\\"controller\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54\\",\\"verificationMethodType\\":\\"Bls12381BBSVerificationKeyDock2023\\",\\"verificationMaterial\\":\\"CeEf4Q1kvLo66eSbTSujuasf2mv1rTQEpK8rnuyqMxpP\\"}"", + ""{\\"id\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-5\\",\\"controller\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54\\",\\"verificationMethodType\\":\\"Bls12381BBSVerificationKeyDock2023\\",\\"verificationMaterial\\":\\"9y4gScRXDQJahd1gKbf1pYf9mwcRKnUqzstR3Bn7ydYz\\"}"", + ""{\\"id\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-11\\",\\"controller\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54\\",\\"verificationMethodType\\":\\"Bls12381BBSVerificationKeyDock2023\\",\\"verificationMaterial\\":\\"BBF5rtFSaWt4s4PxMEswkothcPJNLhdsQpggZyUozSdZ\\"}"", + ""{\\"id\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-12\\",\\"controller\\":\\"did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54\\",\\"verificationMethodType\\":\\"Bls12381BBSVerificationKeyDock2023\\",\\"verificationMaterial\\":\\"EaNp37NGpe8KViTKxAdknyvUP44doH1fHnFpYqEcfUjE\\"}"", ], "authentication": [ "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-1", @@ -99,6 +105,12 @@ exports[`DID document workflow \`CheqdDIDDocument\` 3`] = ` "verificationMaterial": "Bt5Mafvpcqou1pBF8SnW1BJMvpkSzZnPEgWunTUFwHZm", "verificationMethodType": "Ed25519VerificationKey2018", }, + { + "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", + "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-2", + "verificationMaterial": "11111111111111111111111111111111", + "verificationMethodType": "Ed25519VerificationKey2018", + }, { "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-3", @@ -111,6 +123,12 @@ exports[`DID document workflow \`CheqdDIDDocument\` 3`] = ` "verificationMaterial": "5FBSa4xAs54osiMs75JcepL695v1XhccQmQePBZQaad9", "verificationMethodType": "Ed25519VerificationKey2018", }, + { + "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", + "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-5", + "verificationMaterial": "11111111111111111111111111111111", + "verificationMethodType": "Ed25519VerificationKey2018", + }, { "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-6", @@ -141,6 +159,18 @@ exports[`DID document workflow \`CheqdDIDDocument\` 3`] = ` "verificationMaterial": "BaGbEav6KzvWhgBWPyZK2vWX5EDDFc4a8rfUwAZ3x8Jn", "verificationMethodType": "Ed25519VerificationKey2018", }, + { + "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", + "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-11", + "verificationMaterial": "11111111111111111111111111111111", + "verificationMethodType": "Ed25519VerificationKey2018", + }, + { + "controller": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54", + "id": "did:cheqd:testnet:f1749383-d9dd-479f-82aa-e52fe8f59c54#keys-12", + "verificationMaterial": "11111111111111111111111111111111", + "verificationMethodType": "Ed25519VerificationKey2018", + }, ], "versionId": "47b4d97b-1ebe-4d81-a3ed-12eb63baaeb9", } @@ -168,9 +198,6 @@ exports[`DID document workflow \`DIDDocument.from\` works 1`] = ` "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-3", "publicKeyBase58": "EaNp37NGpe8KViTKxAdknyvUP44doH1fHnFpYqEcfUjE", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, ], @@ -240,108 +267,72 @@ exports[`DID document workflow \`DIDDocument\` 2`] = ` "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-1", "publicKeyBase58": "Bt5Mafvpcqou1pBF8SnW1BJMvpkSzZnPEgWunTUFwHZm", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-2", "publicKeyBase58": "CeEf4Q1kvLo66eSbTSujuasf2mv1rTQEpK8rnuyqMxpP", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Bls12381BBSVerificationKeyDock2023", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-3", "publicKeyBase58": "GxmaKA52SZGQtZS3Usa6Az48gky2AZRKzRKxsXM6ystc", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-4", "publicKeyBase58": "5FBSa4xAs54osiMs75JcepL695v1XhccQmQePBZQaad9", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-5", "publicKeyBase58": "9y4gScRXDQJahd1gKbf1pYf9mwcRKnUqzstR3Bn7ydYz", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Bls12381BBSVerificationKeyDock2023", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-6", "publicKeyBase58": "EaNp37NGpe8KViTKxAdknyvUP44doH1fHnFpYqEcfUjE", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-7", "publicKeyBase58": "A462rFkYENhY6kf9zLVPg6qvtQhXJ6RuL8CNdHTWzNqa", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-8", "publicKeyBase58": "Amb3kf4if5Av1sz6UdYtEw2iy6DzufRAtch6hiXEWHcw", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-9", "publicKeyBase58": "FwUvnTThdnNPv23Rbq2SXtxxYAT21Atvdd1cZBHPYue4", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-10", "publicKeyBase58": "BaGbEav6KzvWhgBWPyZK2vWX5EDDFc4a8rfUwAZ3x8Jn", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Ed25519VerificationKey2018", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-11", "publicKeyBase58": "BBF5rtFSaWt4s4PxMEswkothcPJNLhdsQpggZyUozSdZ", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Bls12381BBSVerificationKeyDock2023", }, { "controller": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk", "id": "did:dock:5DEHasvC9G3eVF3qCsN2VQvEbHYdQtsv74ozZ1ngQQj39Luk#keys-12", "publicKeyBase58": "EaNp37NGpe8KViTKxAdknyvUP44doH1fHnFpYqEcfUjE", - "publicKeyBase64": null, - "publicKeyHex": null, - "publicKeyJwk": null, "type": "Bls12381BBSVerificationKeyDock2023", }, ], diff --git a/packages/dock-blockchain-api/CHANGELOG.md b/packages/dock-blockchain-api/CHANGELOG.md index 7615a8bef..1825210b3 100644 --- a/packages/dock-blockchain-api/CHANGELOG.md +++ b/packages/dock-blockchain-api/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/dock-blockchain-api +## 0.8.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.15.0 + ## 0.8.0 ### Minor Changes diff --git a/packages/dock-blockchain-api/package.json b/packages/dock-blockchain-api/package.json index 012aded02..e9c0a8923 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.8.0", + "version": "0.8.1", "license": "MIT", "main": "./dist/esm/index.js", "type": "module", @@ -89,7 +89,7 @@ "@polkadot/api": "10.12.4" }, "dependencies": { - "@docknetwork/credential-sdk": "0.14.0", + "@docknetwork/credential-sdk": "0.15.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 f4b7416b9..f8a7dd2fb 100644 --- a/packages/dock-blockchain-modules/CHANGELOG.md +++ b/packages/dock-blockchain-modules/CHANGELOG.md @@ -1,5 +1,12 @@ # @docknetwork/dock-blockchain-modules +## 0.9.1 + +### Patch Changes + +- Updated dependencies + - @docknetwork/credential-sdk@0.15.0 + ## 0.9.0 ### Minor Changes diff --git a/packages/dock-blockchain-modules/package.json b/packages/dock-blockchain-modules/package.json index 562b6ec9e..3f780aea8 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.9.0", + "version": "0.9.1", "license": "MIT", "type": "module", "main": "./dist/esm/index.js", @@ -33,7 +33,7 @@ "node": ">=18.0.0" }, "dependencies": { - "@docknetwork/credential-sdk": "0.14.0" + "@docknetwork/credential-sdk": "0.15.0" }, "devDependencies": { "@babel/cli": "^7.24.1", @@ -42,7 +42,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.8.0", + "@docknetwork/dock-blockchain-api": "0.8.1", "@rollup/plugin-alias": "^4.0.2", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-commonjs": "^24.0.0", diff --git a/scripts/cheqd_entrypoint b/scripts/cheqd_entrypoint index 9dfd14b5d..95b48242b 100755 --- a/scripts/cheqd_entrypoint +++ b/scripts/cheqd_entrypoint @@ -5,10 +5,9 @@ CHAIN_ID="cheqd-dev" NODE_NAME="cheqd-dev" KEY_NAME="my-key" MONIKER="local-node" -STAKE_DENOM="stake" CHAIN_DIR="$HOME/.testnode" -GENESIS_AMOUNT="100000000000000000000000000000ncheq,8246428745600000$STAKE_DENOM" # Very large amount -STAKE_AMOUNT="8246428745600000$STAKE_DENOM" # Ensure this is >= DefaultPowerReduction +GENESIS_AMOUNT="100000000000000000000000000000ncheq" # Very large amount +STAKE_AMOUNT="8246428745600000ncheq" # Ensure this is >= DefaultPowerReduction COMMAND="cheqd-noded" # Install Cosmos SDK if not installed (replace this with your specific chain's SDK) @@ -18,11 +17,23 @@ COMMAND="cheqd-noded" # cd cosmos-sdk # make install # + +# Step 0: Remove the current chain directory (if it exists). rm -rf $CHAIN_DIR # Step 1: Initialize the chain echo "Initializing chain..." -$COMMAND init $NODE_NAME --chain-id $CHAIN_ID --home $CHAIN_DIR +$COMMAND init $NODE_NAME --chain-id $CHAIN_ID --home $CHAIN_DIR --default-denom ncheq + +# Step 1.a: Replace the default "stake" with "ncheq" in the genesis file +echo "Replacing default 'stake' with 'ncheq' in genesis file..." +sed -i 's/"stake"/"ncheq"/' $CHAIN_DIR/config/genesis.json + +# Step 1.b: Configure feemarket +echo "Configuring feemarket..." +sed -i 's/"fee_denom": "stake"/"fee_denom": "ncheq"/' $CHAIN_DIR/config/genesis.json +sed -i 's/"min_base_gas_price": "1.000000000000000000"/"min_base_gas_price": "0.005000000000000000"/' $CHAIN_DIR/config/genesis.json +sed -i 's/"base_gas_price": "1.000000000000000000"/"base_gas_price": "0.005000000000000000"/' $CHAIN_DIR/config/genesis.json # Step 2: Generate a keypair (if it doesn't exist already) if [ -z "$CHEQD_MNEMONIC" ]; then @@ -35,7 +46,7 @@ fi # Step 3: Add the generated key as a genesis account echo "Adding genesis account..." -$COMMAND genesis add-genesis-account $($COMMAND keys show $KEY_NAME -a --keyring-backend test --home $CHAIN_DIR) $GENESIS_AMOUNT --home $CHAIN_DIR +$COMMAND genesis add-genesis-account $($COMMAND keys show $KEY_NAME -a --keyring-backend test --home $CHAIN_DIR) $GENESIS_AMOUNT --keyring-backend test --home $CHAIN_DIR # Step 4: Generate a genesis transaction echo "Generating genesis transaction..." @@ -49,9 +60,13 @@ $COMMAND genesis collect-gentxs --home $CHAIN_DIR echo "Validating genesis file..." $COMMAND genesis validate-genesis --home $CHAIN_DIR +# Step 6.a: Cat genesis file +echo "Modified genesis file..." +cat $CHAIN_DIR/config/genesis.json + # Step 7: Copy custom configuration cp /tmp/cheqd_config.toml $CHAIN_DIR/config/config.toml # Step 8: Starting the node -echo "Starting Cosmos node..." +echo "Starting cheqd node..." $COMMAND start --home $CHAIN_DIR --moniker $MONIKER --log_level info diff --git a/scripts/with_cheqd_docker_test_node b/scripts/with_cheqd_docker_test_node index ab7da8dd5..8a9862238 100755 --- a/scripts/with_cheqd_docker_test_node +++ b/scripts/with_cheqd_docker_test_node @@ -6,10 +6,16 @@ entrypoint="$(realpath $(dirname $0)/cheqd_entrypoint)" config="$(realpath $(dirname $0)/cheqd_config.toml)" # pre-pull -docker pull --platform linux/amd64 ghcr.io/cheqd/cheqd-node:2.0.2 +docker pull --platform linux/amd64 ghcr.io/cheqd/cheqd-node:$IMAGE_TAG # start a pos alice node -alice_container_id=$(docker run --platform linux/amd64 -d --rm --name cheqd-dev -p 26656:26656 -p 26657:26657 -p 1317:1317 -p 9090:9090 -e CHEQD_MNEMONIC="$CHEQD_MNEMONIC" -v $entrypoint:/usr/local/bin/entrypoint.sh -v $config:/tmp/cheqd_config.toml --entrypoint /usr/local/bin/entrypoint.sh ghcr.io/cheqd/cheqd-node:2.0.2 start) +alice_container_id=$(docker run --platform linux/amd64 -d --rm --name cheqd-dev -p 26656:26656 -p 26657:26657 -p 1317:1317 -p 9090:9090 -e CHEQD_MNEMONIC="$CHEQD_MNEMONIC" -v $entrypoint:/usr/local/bin/entrypoint.sh -v $config:/tmp/cheqd_config.toml --entrypoint /usr/local/bin/entrypoint.sh ghcr.io/cheqd/cheqd-node:$IMAGE_TAG start) + +# locate the node's home directory +alice_home=$(docker exec $alice_container_id sh -c 'echo $HOME') + +# tail logs, if necessary +# docker logs -f $alice_container_id cleanup() { docker kill $alice_container_id 2> /dev/null @@ -17,8 +23,8 @@ cleanup() { try_with_node() { sleep 10; - # Execute the commands, potentially against the nodes - $@ + # Execute the commands, potentially against the nodes + $@ } trap cleanup EXIT SIGINT SIGTERM @@ -29,4 +35,4 @@ else exit_code=$? fi -exit $exit_code +exit $exit_code \ No newline at end of file diff --git a/turbo.json b/turbo.json index 387ccfa48..4dc1352ae 100644 --- a/turbo.json +++ b/turbo.json @@ -28,7 +28,7 @@ "test-with-node": { "dependsOn": ["^build"], "outputs": [], - "env": ["CHEQD_MNEMONIC"] + "env": ["CHEQD_MNEMONIC", "IMAGE_TAG"] }, "examples-with-node": { "dependsOn": ["^build"], diff --git a/yarn.lock b/yarn.lock index 4ff1c2021..5bfc109c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4617,7 +4617,7 @@ ky "^0.25.1" ky-universal "^0.8.2" -"@digitalbazaar/http-client@^4.1.1": +"@digitalbazaar/http-client@^4.1.0", "@digitalbazaar/http-client@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@digitalbazaar/http-client/-/http-client-4.1.1.tgz#73d31af4782eadd2440cf0cd487ad591f45d137c" integrity sha512-PG0r9sAEzAmnCSrwKg+HhM6+GNMU24ttiFMBycqhM1vDi8enipuFpW45vn2lzr8+i7I2yLUzNyfrrkQTlzGLmQ== @@ -11348,7 +11348,7 @@ jsonld@digitalcredentials/jsonld.js#v10.x: version "8.3.3-0" resolved "https://codeload.github.com/digitalcredentials/jsonld.js/tar.gz/14357f7a1181ae769ecc50fee9303468f17665ff" dependencies: - "@digitalbazaar/http-client" "^4.1.1" + "@digitalbazaar/http-client" "^4.1.0" canonicalize "^1.0.1" lru-cache "^6.0.0" rdf-canonize "^4.0.1"