@docknetwork/wallet-sdk-wasm 0.4.22 → 1.5.0

package/lib/services/dids/service-rpc.js

@@ -26,8 +26,8 @@ class DIDServiceRPC extends services_rpcServiceClient.RpcService {
     generateKeyDoc(params) {
         return this.call('generateKeyDoc', params);
     }
-    registerDidDock(keyPair) {
-        return this.call('registerDidDock', keyPair);
+    deriveKeyDoc(params) {
+        return this.call('deriveKeyDoc', params);
     }
     getDidDockDocument(did) {
         return this.call('getDidDockDocument', did);

package/lib/services/dids/service-rpc.mjs

@@ -22,8 +22,8 @@ class DIDServiceRPC extends RpcService {
     generateKeyDoc(params) {
         return this.call('generateKeyDoc', params);
     }
-    registerDidDock(keyPair) {
-        return this.call('registerDidDock', keyPair);
+    deriveKeyDoc(params) {
+        return this.call('deriveKeyDoc', params);
     }
     getDidDockDocument(did) {
         return this.call('getDidDockDocument', did);

package/lib/services/dids/service.js

@@ -7,16 +7,11 @@ var services_dids_config = require('./config.js');
 var services_keyring_service = require('../keyring/service.js');
 var services_utilCrypto_service = require('../util-crypto/service.js');
 var assert = require('assert');
-var did = require('@docknetwork/sdk/utils/did');
-var services_dock_service = require('../dock/service.js');
-var dock = require('@docknetwork/sdk');
-var publicKeys = require('@docknetwork/sdk/public-keys');
-var core_logger = require('../../core/logger.js');
+var services_blockchain_service = require('../blockchain/service.js');
 var core_polkadotUtils = require('../../core/polkadot-utils.js');
 var base64url = require('base64url');
 var services_credential_utils = require('../credential/utils.js');
-var Ed25519Signature2020 = require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-var EcdsaSecp256k1Signature2019 = require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+var crypto = require('@docknetwork/credential-sdk/vc/crypto');
 require('@polkadot/keyring');
 require('@polkadot/util-crypto');
 require('../keyring/configs.js');
@@ -25,32 +20,37 @@ require('bignumber.js');
 require('../../types.js');
 require('@polkadot/util');
 require('../util-crypto/configs.js');
-require('@docknetwork/sdk/resolver');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
+require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/dock-blockchain-modules');
 require('events');
+require('../../core/logger.js');
 require('../../modules/event-manager.js');
-require('../dock/configs.js');
+require('@docknetwork/credential-sdk/types');
+require('@docknetwork/credential-sdk/keypairs');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/sdk/utils/misc');
 require('base58-universal');
 require('@docknetwork/universal-wallet/methods/keypairs');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 var base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
-var Ed25519Signature2020__default = /*#__PURE__*/_interopDefaultLegacy(Ed25519Signature2020);
-var EcdsaSecp256k1Signature2019__default = /*#__PURE__*/_interopDefaultLegacy(EcdsaSecp256k1Signature2019);
 
+// @ts-nocheck
 async function getSignerKeypair(privateKeyDoc) {
-    const privateKey = privateKeyDoc.keypair || services_credential_utils.keyDocToKeypair(privateKeyDoc, services_dock_service.dockService.dock);
+    const privateKey = privateKeyDoc.keypair || services_credential_utils.keyDocToKeypair(privateKeyDoc, services_blockchain_service.blockchainService.dock);
     if (!privateKey.signer && privateKey.sign) {
         privateKey.signer = () => ({ sign: ({ data }) => privateKey.sign(data) });
     }
     // ed25519 should use latest
     if (privateKeyDoc.type.startsWith('Ed25519')) {
-        return new Ed25519Signature2020__default["default"]({
+        return new crypto.Ed25519Signature2020({
             keypair: privateKey,
             ...privateKeyDoc,
         });
@@ -58,7 +58,7 @@ async function getSignerKeypair(privateKeyDoc) {
     // HACK: for secp256k1 keyDocToKeypair returns an unusable class, wrap it in EcdsaSecp256k1Signature2019
     // TODO: refactor so that keyDocToKeypair returns EcdsaSecp256k1Signature2019
     if (privateKey.type === 'secp256k1') {
-        return new EcdsaSecp256k1Signature2019__default["default"]({
+        return new crypto.EcdsaSecp256k1Signature2019({
             keypair: privateKey,
             ...privateKeyDoc,
         });
@@ -74,7 +74,7 @@ class DIDService {
         DIDService.prototype.keypairToDIDKeyDocument,
         DIDService.prototype.getDIDResolution,
         DIDService.prototype.generateKeyDoc,
-        DIDService.prototype.registerDidDock,
+        DIDService.prototype.deriveKeyDoc,
         DIDService.prototype.getDidDockDocument,
         DIDService.prototype.createSignedJWT,
     ];
@@ -106,6 +106,15 @@ class DIDService {
         }
         return core_polkadotUtils.polkadotToKeydoc(keyring, params.controller);
     }
+    async deriveKeyDoc(params) {
+        services_dids_config.validation.deriveKeyDoc(params);
+        const { pair, type = 'ed25519' } = params;
+        const keyring = services_keyring_service.keyringService.createFromPair({
+            pair,
+            type,
+        });
+        return core_polkadotUtils.polkadotToKeydoc(keyring, params.controller);
+    }
     async createSignedJWT({ payload, privateKeyDoc, headerInput }) {
         const privateKey = await getSignerKeypair(privateKeyDoc);
         const { sign } = typeof privateKey.signer === 'function'
@@ -125,27 +134,10 @@ class DIDService {
     }
     async getDidDockDocument(did) {
         assert__default["default"](!!did, 'DID is required');
-        const dock = services_dock_service.getDock();
-        const result = await dock.did.getDocument(did);
+        services_blockchain_service.blockchainService.dock;
+        const result = await services_blockchain_service.blockchainService.didModule.getDocument(did);
         return result;
     }
-    async registerDidDock(keyPairJSON) {
-        assert__default["default"](!!keyPairJSON, 'keyPair is required');
-        const dockDID = did.createNewDockDID();
-        const dock$1 = services_dock_service.getDock();
-        const keyPair = services_keyring_service.keyringService.keyring.addFromJson(keyPairJSON);
-        keyPair.unlock('');
-        dock$1.setAccount(keyPair);
-        const publicKey = dock.PublicKeySr25519.fromKeyringPair(keyPair);
-        const didKey = new publicKeys.DidKey(publicKey, new publicKeys.VerificationRelationship());
-        core_logger.Logger.info(`Submitting new DID: ${dockDID}`);
-        const result = await dock$1.did.new(dockDID, [didKey], [], false);
-        core_logger.Logger.info(`DID created with tx hash ${result.txHash.toString()}`);
-        return {
-            dockDID,
-            keyPairWalletId: keyPairJSON.address,
-        };
-    }
 }
 const didService = new DIDService();
 

package/lib/services/dids/service.mjs

@@ -1,18 +1,13 @@
-import { DIDKeyManager } from '@docknetwork/wallet-sdk-dids/src';
+import { DIDKeyManager } from '@docknetwork/wallet-sdk-dids/lib';
 import { serviceName, validation } from './config.mjs';
 import { keyringService } from '../keyring/service.mjs';
 import { utilCryptoService } from '../util-crypto/service.mjs';
 import assert from 'assert';
-import { createNewDockDID } from '@docknetwork/sdk/utils/did';
-import { dockService, getDock } from '../dock/service.mjs';
-import { PublicKeySr25519 } from '@docknetwork/sdk';
-import { DidKey, VerificationRelationship } from '@docknetwork/sdk/public-keys';
-import { Logger } from '../../core/logger.mjs';
+import { blockchainService } from '../blockchain/service.mjs';
 import { polkadotToKeydoc } from '../../core/polkadot-utils.mjs';
 import base64url from 'base64url';
 import { keyDocToKeypair } from '../credential/utils.mjs';
-import Ed25519Signature2020 from '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import EcdsaSecp256k1Signature2019 from '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import { Ed25519Signature2020, EcdsaSecp256k1Signature2019 } from '@docknetwork/credential-sdk/vc/crypto';
 import '@polkadot/keyring';
 import '@polkadot/util-crypto';
 import '../keyring/configs.mjs';
@@ -21,19 +16,26 @@ import 'bignumber.js';
 import '../../types.mjs';
 import '@polkadot/util';
 import '../util-crypto/configs.mjs';
-import '@docknetwork/sdk/resolver';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
+import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/dock-blockchain-modules';
 import 'events';
+import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
-import '../dock/configs.mjs';
+import '@docknetwork/credential-sdk/types';
+import '@docknetwork/credential-sdk/keypairs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import '@docknetwork/universal-wallet/methods/keypairs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 
+// @ts-nocheck
 async function getSignerKeypair(privateKeyDoc) {
-    const privateKey = privateKeyDoc.keypair || keyDocToKeypair(privateKeyDoc, dockService.dock);
+    const privateKey = privateKeyDoc.keypair || keyDocToKeypair(privateKeyDoc, blockchainService.dock);
     if (!privateKey.signer && privateKey.sign) {
         privateKey.signer = () => ({ sign: ({ data }) => privateKey.sign(data) });
     }
@@ -63,7 +65,7 @@ class DIDService {
         DIDService.prototype.keypairToDIDKeyDocument,
         DIDService.prototype.getDIDResolution,
         DIDService.prototype.generateKeyDoc,
-        DIDService.prototype.registerDidDock,
+        DIDService.prototype.deriveKeyDoc,
         DIDService.prototype.getDidDockDocument,
         DIDService.prototype.createSignedJWT,
     ];
@@ -95,6 +97,15 @@ class DIDService {
         }
         return polkadotToKeydoc(keyring, params.controller);
     }
+    async deriveKeyDoc(params) {
+        validation.deriveKeyDoc(params);
+        const { pair, type = 'ed25519' } = params;
+        const keyring = keyringService.createFromPair({
+            pair,
+            type,
+        });
+        return polkadotToKeydoc(keyring, params.controller);
+    }
     async createSignedJWT({ payload, privateKeyDoc, headerInput }) {
         const privateKey = await getSignerKeypair(privateKeyDoc);
         const { sign } = typeof privateKey.signer === 'function'
@@ -114,27 +125,10 @@ class DIDService {
     }
     async getDidDockDocument(did) {
         assert(!!did, 'DID is required');
-        const dock = getDock();
-        const result = await dock.did.getDocument(did);
+        blockchainService.dock;
+        const result = await blockchainService.didModule.getDocument(did);
         return result;
     }
-    async registerDidDock(keyPairJSON) {
-        assert(!!keyPairJSON, 'keyPair is required');
-        const dockDID = createNewDockDID();
-        const dock = getDock();
-        const keyPair = keyringService.keyring.addFromJson(keyPairJSON);
-        keyPair.unlock('');
-        dock.setAccount(keyPair);
-        const publicKey = PublicKeySr25519.fromKeyringPair(keyPair);
-        const didKey = new DidKey(publicKey, new VerificationRelationship());
-        Logger.info(`Submitting new DID: ${dockDID}`);
-        const result = await dock.did.new(dockDID, [didKey], [], false);
-        Logger.info(`DID created with tx hash ${result.txHash.toString()}`);
-        return {
-            dockDID,
-            keyPairWalletId: keyPairJSON.address,
-        };
-    }
 }
 const didService = new DIDService();
 

package/lib/services/edv/hmac.js

@@ -2,6 +2,7 @@
 
 var base64url = require('base64url-universal');
 var crypto = require('@docknetwork/universal-wallet/crypto');
+var util = require('@polkadot/util');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -44,6 +45,10 @@ class HMAC {
         }, true, ['sign', 'verify']);
         return key;
     }
+    static async deriveKey(baseKey) {
+        const key = await crypto__default["default"].subtle.importKey('raw', util.hexToU8a(baseKey), { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
+        return key;
+    }
     static async exportKey(key) {
         const rawKey = await crypto__default["default"].subtle.exportKey('raw', key);
         return base64url__namespace.encode(Buffer.from(rawKey));

package/lib/services/edv/hmac.mjs

@@ -1,5 +1,6 @@
 import * as base64url from 'base64url-universal';
 import crypto from '@docknetwork/universal-wallet/crypto';
+import { hexToU8a } from '@polkadot/util';
 
 class HMAC {
     key;
@@ -19,6 +20,10 @@ class HMAC {
         }, true, ['sign', 'verify']);
         return key;
     }
+    static async deriveKey(baseKey) {
+        const key = await crypto.subtle.importKey('raw', hexToU8a(baseKey), { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
+        return key;
+    }
     static async exportKey(key) {
         const rawKey = await crypto.subtle.exportKey('raw', key);
         return base64url.encode(Buffer.from(rawKey));

package/lib/services/edv/index.js

@@ -9,7 +9,9 @@ require('@docknetwork/universal-wallet/storage/edv-http-storage');
 require('./hmac.js');
 require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
+require('@polkadot/util');
 require('@digitalbazaar/ed25519-verification-key-2018');
+require('@digitalbazaar/ed25519-verification-key-2020');
 require('@digitalbazaar/x25519-key-agreement-key-2020');
 require('@docknetwork/universal-wallet/methods/keypairs');
 require('@docknetwork/wallet-sdk-data-store/lib/logger');
@@ -24,27 +26,27 @@ require('../../core/validation.js');
 require('bignumber.js');
 require('../../types.js');
 require('../util-crypto/service.js');
-require('@polkadot/util');
 require('../util-crypto/configs.js');
-require('@docknetwork/sdk/utils/did');
-require('../dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('../blockchain/service.js');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
+require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
-require('../dock/configs.js');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
 require('../../core/polkadot-utils.js');
+require('@docknetwork/credential-sdk/keypairs');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/sdk/utils/misc');
 require('base58-universal');
 require('base64url');
 require('../credential/utils.js');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
 
 

package/lib/services/edv/index.mjs

@@ -5,12 +5,14 @@ import '@docknetwork/universal-wallet/storage/edv-http-storage';
 import './hmac.mjs';
 import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
+import '@polkadot/util';
 import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/ed25519-verification-key-2020';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
 import '@docknetwork/universal-wallet/methods/keypairs';
-import '@docknetwork/wallet-sdk-data-store/src/logger';
+import '@docknetwork/wallet-sdk-data-store/lib/logger';
 import '../dids/service.mjs';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
 import '../keyring/service.mjs';
 import '@polkadot/keyring';
@@ -20,25 +22,25 @@ import '../../core/validation.mjs';
 import 'bignumber.js';
 import '../../types.mjs';
 import '../util-crypto/service.mjs';
-import '@polkadot/util';
 import '../util-crypto/configs.mjs';
-import '@docknetwork/sdk/utils/did';
-import '../dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '../blockchain/service.mjs';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
+import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
-import '../dock/configs.mjs';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
 import '../../core/polkadot-utils.mjs';
+import '@docknetwork/credential-sdk/keypairs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import 'base64url';
 import '../credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
-import '@docknetwork/wallet-sdk-wasm/src/services/keyring';
+import '@docknetwork/credential-sdk/vc/crypto';
+import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';

package/lib/services/edv/service-rpc.js

@@ -27,6 +27,10 @@ class EDVServiceRpc extends services_rpcServiceClient.RpcService {
     return this.call('generateKeys');
   }
 
+  deriveKeys() {
+    return this.call('deriveKeys');
+  }
+
   find(params     ) {
     return this.call('find', params);
   }

package/lib/services/edv/service-rpc.mjs

@@ -23,6 +23,10 @@ class EDVServiceRpc extends RpcService {
     return this.call('generateKeys');
   }
 
+  deriveKeys() {
+    return this.call('deriveKeys');
+  }
+
   find(params     ) {
     return this.call('find', params);
   }

package/lib/services/edv/service.js

@@ -6,49 +6,52 @@ var services_edv_configs = require('./configs.js');
 var EDVHTTPStorageInterface = require('@docknetwork/universal-wallet/storage/edv-http-storage');
 var services_edv_hmac = require('./hmac.js');
 var ed25519VerificationKey2018 = require('@digitalbazaar/ed25519-verification-key-2018');
+var ed25519VerificationKey2020 = require('@digitalbazaar/ed25519-verification-key-2020');
 var x25519KeyAgreementKey2020 = require('@digitalbazaar/x25519-key-agreement-key-2020');
 var keypairs = require('@docknetwork/universal-wallet/methods/keypairs');
 var logger = require('@docknetwork/wallet-sdk-data-store/lib/logger');
 var services_dids_service = require('../dids/service.js');
 var keyring = require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
+var utilCrypto = require('@polkadot/util-crypto');
+var base64url = require('base64url-universal');
 require('assert');
-require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
+require('@polkadot/util');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
 require('../keyring/service.js');
 require('@polkadot/keyring');
-require('@polkadot/util-crypto');
 require('../keyring/configs.js');
 require('../../core/validation.js');
 require('bignumber.js');
 require('../../types.js');
 require('../util-crypto/service.js');
-require('@polkadot/util');
 require('../util-crypto/configs.js');
-require('@docknetwork/sdk/utils/did');
-require('../dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('../blockchain/service.js');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
+require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
-require('../dock/configs.js');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
 require('../../core/polkadot-utils.js');
+require('@docknetwork/credential-sdk/keypairs');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/sdk/utils/misc');
 require('base58-universal');
 require('base64url');
 require('../credential/utils.js');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var EDVHTTPStorageInterface__default = /*#__PURE__*/_interopDefaultLegacy(EDVHTTPStorageInterface);
+var base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
 
 // @ts-nocheck
 /**
@@ -59,6 +62,7 @@ class EDVService {
     insertQueue = Promise.resolve();
     rpcMethods = [
         EDVService.prototype.generateKeys,
+        EDVService.prototype.deriveKeys,
         EDVService.prototype.initialize,
         EDVService.prototype.find,
         EDVService.prototype.update,
@@ -129,6 +133,18 @@ class EDVService {
         const hmacKey = await services_edv_hmac.exportKey(await services_edv_hmac.generateKey());
         return { verificationKey, agreementKey, hmacKey };
     }
+    async deriveKeys(masterKey) {
+        await keyring.keyringService.initialize({
+            ss58Format: 22,
+        });
+        const pair = utilCrypto.ed25519PairFromSeed(base64url__default["default"].decode(masterKey));
+        const keyPair = await services_dids_service.didService.deriveKeyDoc({ pair });
+        const verificationKey = await ed25519VerificationKey2018.Ed25519VerificationKey2018.from(keyPair);
+        const verificationKey2020 = await ed25519VerificationKey2020.Ed25519VerificationKey2020.fromEd25519VerificationKey2018({ keyPair });
+        const agreementKey = await x25519KeyAgreementKey2020.X25519KeyAgreementKey2020.fromEd25519VerificationKey2020({ keyPair: verificationKey2020 });
+        const hmacKey = await services_edv_hmac.exportKey(await services_edv_hmac.deriveKey(masterKey));
+        return { verificationKey, agreementKey, hmacKey };
+    }
     find(params) {
         return this.storageInterface.find(params);
     }

package/lib/services/edv/service.mjs

@@ -2,45 +2,47 @@ import { serviceName } from './configs.mjs';
 import EDVHTTPStorageInterface from '@docknetwork/universal-wallet/storage/edv-http-storage';
 import HMAC from './hmac.mjs';
 import { Ed25519VerificationKey2018 } from '@digitalbazaar/ed25519-verification-key-2018';
+import { Ed25519VerificationKey2020 } from '@digitalbazaar/ed25519-verification-key-2020';
 import { X25519KeyAgreementKey2020 } from '@digitalbazaar/x25519-key-agreement-key-2020';
 import { getKeypairFromDoc } from '@docknetwork/universal-wallet/methods/keypairs';
-import { logger } from '@docknetwork/wallet-sdk-data-store/src/logger';
+import { logger } from '@docknetwork/wallet-sdk-data-store/lib/logger';
 import { didService } from '../dids/service.mjs';
-import { keyringService } from '@docknetwork/wallet-sdk-wasm/src/services/keyring';
+import { keyringService } from '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
+import { ed25519PairFromSeed } from '@polkadot/util-crypto';
+import base64url__default from 'base64url-universal';
 import 'assert';
-import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@polkadot/util';
+import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
 import '../keyring/service.mjs';
 import '@polkadot/keyring';
-import '@polkadot/util-crypto';
 import '../keyring/configs.mjs';
 import '../../core/validation.mjs';
 import 'bignumber.js';
 import '../../types.mjs';
 import '../util-crypto/service.mjs';
-import '@polkadot/util';
 import '../util-crypto/configs.mjs';
-import '@docknetwork/sdk/utils/did';
-import '../dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '../blockchain/service.mjs';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
+import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
-import '../dock/configs.mjs';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
 import '../../core/polkadot-utils.mjs';
+import '@docknetwork/credential-sdk/keypairs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import 'base64url';
 import '../credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import '@docknetwork/credential-sdk/vc/crypto';
 
 // @ts-nocheck
 /**
@@ -51,6 +53,7 @@ class EDVService {
     insertQueue = Promise.resolve();
     rpcMethods = [
         EDVService.prototype.generateKeys,
+        EDVService.prototype.deriveKeys,
         EDVService.prototype.initialize,
         EDVService.prototype.find,
         EDVService.prototype.update,
@@ -121,6 +124,18 @@ class EDVService {
         const hmacKey = await HMAC.exportKey(await HMAC.generateKey());
         return { verificationKey, agreementKey, hmacKey };
     }
+    async deriveKeys(masterKey) {
+        await keyringService.initialize({
+            ss58Format: 22,
+        });
+        const pair = ed25519PairFromSeed(base64url__default.decode(masterKey));
+        const keyPair = await didService.deriveKeyDoc({ pair });
+        const verificationKey = await Ed25519VerificationKey2018.from(keyPair);
+        const verificationKey2020 = await Ed25519VerificationKey2020.fromEd25519VerificationKey2018({ keyPair });
+        const agreementKey = await X25519KeyAgreementKey2020.fromEd25519VerificationKey2020({ keyPair: verificationKey2020 });
+        const hmacKey = await HMAC.exportKey(await HMAC.deriveKey(masterKey));
+        return { verificationKey, agreementKey, hmacKey };
+    }
     find(params) {
         return this.storageInterface.find(params);
     }

package/lib/services/example/service.js

@@ -11,7 +11,9 @@ require('../../types.js');
 // @ts-nocheck
 class ExampleService {
     rpcMethods = [ExampleService.prototype.sum];
-    constructor() { }
+    constructor() {
+        this.name = 'example';
+    }
     sum(params) {
         services_example_configs.validation.sum(params);
         return params.number1 + params.number2;

package/lib/services/example/service.mjs

@@ -7,7 +7,9 @@ import '../../types.mjs';
 // @ts-nocheck
 class ExampleService {
     rpcMethods = [ExampleService.prototype.sum];
-    constructor() { }
+    constructor() {
+        this.name = 'example';
+    }
     sum(params) {
         validation.sum(params);
         return params.number1 + params.number2;