Use newest DID document format for cheqd mainnet (#515)

* Use newest DID document format for `cheqd` `mainnet` * Deduplicate * Fix imports
docknetwork · Feb 4, 2025 · 4309c47 · 4309c47
1 parent b1aaa4c
commit 4309c47
Show file tree

Hide file tree

Showing 24 changed files with 202 additions and 349 deletions.
diff --git a/.github/workflows/cheqd-sdk-tests.yml b/.github/workflows/cheqd-sdk-tests.yml
@@ -6,7 +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"
-      CHEQD_IMAGE_TAG: 3.1.4
+      CHEQD_IMAGE_TAG: 3.1.5
       CHEQD_NETWORK: "testnet"
     steps:
       - uses: actions/checkout@v2
@@ -22,7 +22,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"
-      CHEQD_IMAGE_TAG: 3.0.2
+      CHEQD_IMAGE_TAG: 3.1.5
       CHEQD_NETWORK: "mainnet"
     steps:
       - uses: actions/checkout@v2

diff --git a/examples/CHANGELOG.md b/examples/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @docknetwork/sdk-examples
 
+## 0.17.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.36.0
+  - @docknetwork/dock-blockchain-api@0.19.1
+  - @docknetwork/dock-blockchain-modules@0.24.1
+
 ## 0.17.0
 
 ### Minor Changes

diff --git a/examples/package.json b/examples/package.json
@@ -2,7 +2,7 @@
   "name": "@docknetwork/sdk-examples",
   "private": true,
   "type": "module",
-  "version": "0.17.0",
+  "version": "0.17.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.35.0",
-    "@docknetwork/dock-blockchain-api": "0.19.0",
-    "@docknetwork/dock-blockchain-modules": "0.24.0"
+    "@docknetwork/credential-sdk": "0.36.0",
+    "@docknetwork/dock-blockchain-api": "0.19.1",
+    "@docknetwork/dock-blockchain-modules": "0.24.1"
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",

diff --git a/packages/cheqd-blockchain-api/CHANGELOG.md b/packages/cheqd-blockchain-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @docknetwork/cheqd-blockchain-api
 
+## 0.28.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.36.0
+
 ## 0.28.0
 
 ### Minor Changes

diff --git 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.28.0",
+  "version": "0.28.1",
   "license": "MIT",
   "main": "./dist/esm/index.js",
   "type": "module",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@cheqd/sdk": "cjs",
-    "@docknetwork/credential-sdk": "0.35.0"
+    "@docknetwork/credential-sdk": "0.36.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",

diff --git a/packages/cheqd-blockchain-modules/CHANGELOG.md b/packages/cheqd-blockchain-modules/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @docknetwork/cheqd-blockchain-modules
 
+## 0.27.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.36.0
+
 ## 0.27.0
 
 ### Minor Changes

diff --git 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.27.0",
+  "version": "0.27.1",
   "type": "module",
   "license": "MIT",
   "main": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@docknetwork/credential-sdk": "0.35.0"
+    "@docknetwork/credential-sdk": "0.36.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.28.0",
+    "@docknetwork/cheqd-blockchain-api": "0.28.1",
     "@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
@@ -1,5 +1,11 @@
 # @docknetwork/credential-sdk
 
+## 0.36.0
+
+### Minor Changes
+
+- Use newest DID document format for `cheqd` `mainnet`
+
 ## 0.35.0
 
 ### Minor Changes

diff --git a/packages/credential-sdk/package.json b/packages/credential-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docknetwork/credential-sdk",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "license": "MIT",
   "type": "module",
   "files": [

diff --git a/...k/src/types/accumulator/accumulator-id.js → ...redential-sdk/src/types/accumulator/id.js b/...k/src/types/accumulator/accumulator-id.js → ...redential-sdk/src/types/accumulator/id.js
@@ -1,5 +1,5 @@
 import { valueBytes } from '../../utils';
-import { CheqdMainnetDid, CheqdTestnetDid, DidRef } from '../did';
+import { CheqdDidRef, CheqdMainnetDid, CheqdTestnetDid } from '../did';
 import {
   TypedBytes,
   TypedEnum,
@@ -66,66 +66,22 @@ export class DockAccumulatorId extends AccumulatorId {
   }
 }
 
-export class CheqdAccumulatorIdValue extends withQualifier(DidRef) {
+export class CheqdAccumulatorIdValue extends CheqdDidRef {
   static Qualifier = 'accumulator:cheqd:';
 
   static Ident = withFromDockId(
     TypedUUID,
     DockAccumulatorId,
     'accumulator:cheqd:',
   );
-
-  static cheqdDid(did) {
-    return did.value;
-  }
-
-  static fromUnqualifiedString(str) {
-    const lastColon = str.lastIndexOf(':');
-    const did = `did:cheqd:${str.slice(0, lastColon)}`;
-    const id = str.slice(lastColon + 1);
-
-    return new this(did, id);
-  }
-
-  toJSON() {
-    return String(this);
-  }
-
-  toEncodedString() {
-    const { did, value, constructor } = this;
-    const { cheqdDid } = constructor;
-
-    let prefix = '';
-    if (cheqdDid(did) instanceof CheqdTestnetDid) {
-      prefix = 'testnet';
-    } else if (cheqdDid(did) instanceof CheqdMainnetDid) {
-      prefix = 'mainnet';
-    } else {
-      throw new Error(
-        `Can't determine DID type: \`${cheqdDid(did)}\`, instance of \`${
-          cheqdDid(did).constructor.name
-        }\``,
-      );
-    }
-
-    return `${prefix}:${did.toEncodedString()}:${value}`;
-  }
 }
 
 export class CheqdTestnetAccumulatorIdValue extends CheqdAccumulatorIdValue {
   static Did = CheqdTestnetDid;
-
-  static cheqdDid(did) {
-    return did;
-  }
 }
 
 export class CheqdMainnetAccumulatorIdValue extends CheqdAccumulatorIdValue {
   static Did = CheqdMainnetDid;
-
-  static cheqdDid(did) {
-    return did;
-  }
 }
 
 export class CheqdAccumulatorId extends AccumulatorId {

diff --git a/packages/credential-sdk/src/types/accumulator/index.js b/packages/credential-sdk/src/types/accumulator/index.js
@@ -3,4 +3,4 @@ export * from './params';
 export * from './public-key';
 export * from './accumulator';
 export * from './counters';
-export * from './accumulator-id';
+export * from './id';
diff --git a/.../credential-sdk/src/types/blob/blob-id.js → packages/credential-sdk/src/types/blob/id.js b/.../credential-sdk/src/types/blob/blob-id.js → packages/credential-sdk/src/types/blob/id.js
@@ -12,7 +12,7 @@ import withFromDockId, {
   patchWithFromDock,
 } from '../generic/with-from-dock-id';
 import { CheqdBlobQualifier, DockBlobQualifier } from './const';
-import { CheqdMainnetDid, CheqdTestnetDid, DidRef } from '../did';
+import { CheqdDidRef, CheqdMainnetDid, CheqdTestnetDid } from '../did';
 import dockDidById from '../../utils/dock-did-by-id';
 
 export class BlobId extends withFrom(
@@ -59,58 +59,18 @@ export class DockBlobId extends BlobId {
   }
 }
 
-export class CheqdBlobIdValue extends withQualifier(DidRef) {
+export class CheqdBlobIdValue extends CheqdDidRef {
   static Qualifier = CheqdBlobQualifier;
 
   static Ident = withFromDockId(TypedUUID, DockBlobId, 'blob:cheqd:');
-
-  static fromUnqualifiedString(str) {
-    const lastColon = str.lastIndexOf(':');
-    const did = `did:cheqd:${str.slice(0, lastColon)}`;
-    const id = str.slice(lastColon + 1);
-
-    return new this(did, id);
-  }
-
-  static cheqdDid(did) {
-    return did.value;
-  }
-
-  toEncodedString() {
-    const { did, value, constructor } = this;
-    const cheqdDid = constructor.cheqdDid(did);
-
-    let prefix = '';
-    if (cheqdDid instanceof CheqdTestnetDid) {
-      prefix = 'testnet';
-    } else if (cheqdDid instanceof CheqdMainnetDid) {
-      prefix = 'mainnet';
-    } else {
-      throw new Error(
-        `Can't determine DID type: \`${cheqdDid(did)}\`, instance of \`${
-          cheqdDid(did).constructor.name
-        }\``,
-      );
-    }
-
-    return `${prefix}:${did.toEncodedString()}:${value}`;
-  }
 }
 
 export class CheqdTestnetBlobIdValue extends CheqdBlobIdValue {
   static Did = CheqdTestnetDid;
-
-  static cheqdDid(did) {
-    return did;
-  }
 }
 
 export class CheqdMainnetBlobIdValue extends CheqdBlobIdValue {
   static Did = CheqdMainnetDid;
-
-  static cheqdDid(did) {
-    return did;
-  }
 }
 
 export class CheqdBlobId extends BlobId {

diff --git a/packages/credential-sdk/src/types/blob/index.js b/packages/credential-sdk/src/types/blob/index.js
@@ -1,8 +1,8 @@
 import { TypedStruct, withProp } from '../generic';
-import { BlobId, CheqdBlobIdValue, DockBlobIdValue } from './blob-id';
+import { BlobId, CheqdBlobIdValue, DockBlobIdValue } from './id';
 import Blob from './blob';
 
-export * from './blob-id';
+export * from './id';
 export { default as Blob } from './blob';
 
 export class BlobWithId extends TypedStruct {
@@ -12,5 +12,13 @@ export class BlobWithId extends TypedStruct {
   };
 }
 
-export class CheqdBlobWithId extends withProp(BlobWithId, 'id', CheqdBlobIdValue) {}
-export class DockBlobWithId extends withProp(BlobWithId, 'id', DockBlobIdValue) {}
+export class CheqdBlobWithId extends withProp(
+  BlobWithId,
+  'id',
+  CheqdBlobIdValue,
+) {}
+export class DockBlobWithId extends withProp(
+  BlobWithId,
+  'id',
+  DockBlobIdValue,
+) {}