Tweaks for lastPublicKeyId and lastParamsId (#484)

* Tweaks for `lastPublicKeyId` and `nextPublicKeyId` * CHANGELOG + bump up version * Corrections * Tweak
docknetwork · Nov 22, 2024 · cf62e35 · cf62e35
1 parent 591f037
commit cf62e35
Show file tree

Hide file tree

Showing 25 changed files with 137 additions and 47 deletions.
diff --git a/examples/CHANGELOG.md b/examples/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @docknetwork/sdk-examples
 
+## 0.5.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/dock-blockchain-modules@0.7.0
+  - @docknetwork/dock-blockchain-api@0.6.0
+  - @docknetwork/credential-sdk@0.11.0
+
 ## 0.4.5
 
 ### Patch 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.4.5",
+  "version": "0.5.0",
   "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.10.0",
-    "@docknetwork/dock-blockchain-api": "0.5.1",
-    "@docknetwork/dock-blockchain-modules": "0.6.1"
+    "@docknetwork/credential-sdk": "0.11.0",
+    "@docknetwork/dock-blockchain-api": "0.6.0",
+    "@docknetwork/dock-blockchain-modules": "0.7.0"
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "0.11.0",
+  "version": "0.14.0",
   "private": true,
   "workspaces": [
     "packages/*",

diff --git a/packages/cheqd-blockchain-api/CHANGELOG.md b/packages/cheqd-blockchain-api/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @docknetwork/cheqd-blockchain-api
 
+## 0.10.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.11.0
+
 ## 0.9.0
 
 - Allow to use `MultiApiCoreModules` with `CheqdCoreModules`

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.9.0",
+  "version": "0.10.0",
   "license": "MIT",
   "main": "./dist/esm/index.js",
   "type": "module",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@cheqd/sdk": "cjs",
-    "@docknetwork/credential-sdk": "0.10.0"
+    "@docknetwork/credential-sdk": "0.11.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,16 @@
 # @docknetwork/cheqd-blockchain-modules
 
+## 0.9.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.11.0
+
 ## 0.8.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.8.0",
+  "version": "0.9.0",
   "type": "module",
   "license": "MIT",
   "main": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@docknetwork/credential-sdk": "0.10.0"
+    "@docknetwork/credential-sdk": "0.11.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.9.0",
+    "@docknetwork/cheqd-blockchain-api": "0.10.0",
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^24.0.0",

diff --git a/packages/cheqd-blockchain-modules/tests/attest-module.test.js b/packages/cheqd-blockchain-modules/tests/attest-module.test.js
@@ -3,15 +3,15 @@ import { CheqdTestnetDid } from "@docknetwork/credential-sdk/types";
 import { MultiApiDIDModule, MultiApiAttestModule } from "@docknetwork/credential-sdk/modules";
 import generateAttestModuleTests from "@docknetwork/credential-sdk/modules/tests/attest-module";
 import CheqdDIDModule from "../src/did/module";
-import { faucet } from "./constants";
+import { faucet, url } from "./constants";
 import CheqdAttestModule from "../src/attest/module";
 
 describe("AttestModule", () => {
   const cheqd = new CheqdAPI();
 
   beforeAll(async () => {
     await cheqd.init({
-      url: process.env.ENDPOINT_URL || "http://localhost:26657",
+      url: url,
       mnemonic: faucet.mnemonic,
       network: "testnet",
     });

diff --git a/packages/cheqd-blockchain-modules/tests/blob-module.test.js b/packages/cheqd-blockchain-modules/tests/blob-module.test.js
@@ -6,7 +6,7 @@ import {
 import { MultiApiBlobModule } from "@docknetwork/credential-sdk/modules";
 import generateBlobModuleTests from "@docknetwork/credential-sdk/modules/tests/blob-module";
 import CheqdDIDModule from "../src/did/module";
-import { faucet } from "./constants";
+import { faucet, url } from "./constants";
 import CheqdBlobModule from "../src/blob/module";
 import { MultiApiDIDModule } from "@docknetwork/credential-sdk/modules";
 
@@ -15,7 +15,7 @@ describe("BlobModule", () => {
 
   beforeAll(async () => {
     await cheqd.init({
-      url: process.env.ENDPOINT_URL || "http://localhost:26657",
+      url,
       mnemonic: faucet.mnemonic,
       network: "testnet",
     });

diff --git a/packages/cheqd-blockchain-modules/tests/constants.js b/packages/cheqd-blockchain-modules/tests/constants.js
@@ -1,7 +1,9 @@
 export const faucet = {
   prefix: "cheqd",
   minimalDenom: "ncheq",
-  mnemonic:
+  mnemonic: process.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",
-  address: "cheqd1fgl67nvjdkrnaemjzg5sqvck9fcst4vt99gmma",
+  address: process.env.CHEQD_SENDER_ADDRESS || "cheqd1fgl67nvjdkrnaemjzg5sqvck9fcst4vt99gmma",
 };
+
+export const url = process.env.CHEQD_RPC_URL || "http://localhost:26657";
diff --git a/packages/cheqd-blockchain-modules/tests/did-module.test.js b/packages/cheqd-blockchain-modules/tests/did-module.test.js
@@ -2,15 +2,15 @@ import { CheqdAPI } from "@docknetwork/cheqd-blockchain-api";
 import { CheqdTestnetDid } from "@docknetwork/credential-sdk/types";
 import didModuleTests from "@docknetwork/credential-sdk/modules/tests/did-module";
 import CheqdDIDModule from "../src/did/module";
-import { faucet } from "./constants";
+import { faucet, url } from "./constants";
 import { MultiApiDIDModule } from "@docknetwork/credential-sdk/modules";
 
 describe("DIDModule", () => {
   const cheqd = new CheqdAPI();
 
   beforeAll(async () => {
     await cheqd.init({
-      url: process.env.ENDPOINT_URL || "http://localhost:26657",
+      url,
       mnemonic: faucet.mnemonic,
       network: "testnet",
     });

diff --git a/packages/cheqd-blockchain-modules/tests/offchain-signatures-module.test.js b/packages/cheqd-blockchain-modules/tests/offchain-signatures-module.test.js
@@ -5,7 +5,7 @@ import {
 } from "@docknetwork/credential-sdk/types";
 import { MultiApiOffchainSignaturesModule } from "@docknetwork/credential-sdk/modules";
 import generateOffchainSignaturesModuleTests from "@docknetwork/credential-sdk/modules/tests/offchain-signatures-module";
-import { faucet } from "./constants";
+import { faucet, url } from "./constants";
 import {
   CheqdOffchainSignaturesModule,
   CheqdDIDModule,
@@ -21,7 +21,7 @@ describe("OffchainSignaturesModule", () => {
 
   beforeAll(async () => {
     await cheqd.init({
-      url: process.env.ENDPOINT_URL || "http://localhost:26657",
+      url,
       mnemonic: faucet.mnemonic,
       network: "testnet",
     });

diff --git a/packages/credential-sdk/CHANGELOG.md b/packages/credential-sdk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @docknetwork/credential-sdk
 
+## 0.11.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
 ## 0.10.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.10.0",
+  "version": "0.11.0",
   "license": "MIT",
   "type": "module",
   "files": [

diff --git a/packages/dock-blockchain-api/CHANGELOG.md b/packages/dock-blockchain-api/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @docknetwork/dock-blockchain-api
 
+## 0.6.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.11.0
+
 ## 0.5.1
 
 ### Patch Changes

diff --git 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.5.1",
+  "version": "0.6.0",
   "license": "MIT",
   "main": "./dist/esm/index.js",
   "type": "module",
@@ -89,7 +89,7 @@
     "@polkadot/api": "10.12.4"
   },
   "dependencies": {
-    "@docknetwork/credential-sdk": "0.10.0",
+    "@docknetwork/credential-sdk": "0.11.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
@@ -1,5 +1,16 @@
 # @docknetwork/dock-blockchain-modules
 
+## 0.7.0
+
+### Minor Changes
+
+- Tweaks for `lastPublicKeyId` and `nextPublicKeyId`
+
+### Patch Changes
+
+- Updated dependencies
+  - @docknetwork/credential-sdk@0.11.0
+
 ## 0.6.1
 
 ### Patch Changes

diff --git 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.6.1",
+  "version": "0.7.0",
   "license": "MIT",
   "type": "module",
   "main": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@docknetwork/credential-sdk": "0.10.0"
+    "@docknetwork/credential-sdk": "0.11.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.5.1",
+    "@docknetwork/dock-blockchain-api": "0.6.0",
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^24.0.0",

diff --git a/packages/dock-blockchain-modules/src/accumulator/internal.js b/packages/dock-blockchain-modules/src/accumulator/internal.js
@@ -87,6 +87,14 @@ export default class DockInternalAccumulatorModule extends injectParams(
     return (await this.counters(did)).keyCounter;
   }
 
+  async lastParamsId(did) {
+    return await this.paramsCounter(did);
+  }
+
+  async lastPublicKeyId(did) {
+    return await this.keysCounter(did);
+  }
+
   /**
    * Update given witness by downloading necessary blocks and applying the updates if found. Both start and end are inclusive
    * @param accumulatorId

diff --git a/packages/dock-blockchain-modules/src/common/inject-params.js b/packages/dock-blockchain-modules/src/common/inject-params.js
@@ -62,7 +62,7 @@ export default function injectParams(klass) {
         const hexDid = DockDidOrDidMethodKey.from(did);
         const paramsMap = new this.constructor.ParamsMap();
 
-        const paramsCounter = await this.paramsCounter(hexDid);
+        const paramsCounter = await this.lastParamsId(hexDid);
         for (let idx = 1; idx <= paramsCounter; idx++) {
           // eslint-disable-next-line no-await-in-loop
           const params = await this.getParams(hexDid, idx);
@@ -74,6 +74,10 @@ export default function injectParams(klass) {
 
         return paramsMap;
       }
+
+      async lastParamsId(_did) {
+        throw new Error('Unimplemented');
+      }
     },
   };
 

diff --git a/packages/dock-blockchain-modules/src/common/inject-public-keys.js b/packages/dock-blockchain-modules/src/common/inject-public-keys.js
@@ -6,7 +6,7 @@ import {
   TypedMap,
   withNullIfNotAVariant,
 } from '@docknetwork/credential-sdk/types/generic';
-import { isEqualToOrPrototypeOf, withExtendedStaticProperties } from '@docknetwork/credential-sdk/utils';
+import { isEqualToOrPrototypeOf, withExtendedStaticProperties, withExtendedPrototypeProperties } from '@docknetwork/credential-sdk/utils';
 import { DockDidOrDidMethodKey } from '@docknetwork/credential-sdk/types';
 import { createInternalDockModule } from './builders';
 
@@ -85,7 +85,7 @@ export default function injectPublicKeys(klass) {
         const hexDid = DockDidOrDidMethodKey.from(did);
         const publicKeysMap = new this.constructor.PublicKeysMap();
 
-        const keysCounter = await this.keysCounter(hexDid);
+        const keysCounter = await this.lastPublicKeyId(hexDid);
         for (let idx = 1; idx <= keysCounter; idx++) {
           // eslint-disable-next-line no-await-in-loop
           const publicKey = await this.getPublicKey(hexDid, idx, includeParams);
@@ -97,14 +97,18 @@ export default function injectPublicKeys(klass) {
 
         return publicKeysMap;
       }
+
+      async lastPublicKeyId(_did) {
+        throw new Error('Unimplemented');
+      }
     },
   };
 
   return createInternalDockModule(
     { didMethods },
-    withExtendedStaticProperties(
+    withExtendedPrototypeProperties(['lastPublicKeyId'], withExtendedStaticProperties(
       ['PublicKey', 'ParamsRef', 'PublicKeyOwner', 'PublicKeyQuery'],
       obj[name],
-    ),
+    )),
   );
 }