@docknetwork/wallet-sdk-wasm 1.4.0 → 1.5.0

package/lib/services/credential/service.js

@@ -6,57 +6,51 @@ var services_credential_config = require('./config.js');
 var cryptoWasmTs = require('@docknetwork/crypto-wasm-ts');
 var oid4vciClient = require('@sphereon/oid4vci-client');
 var oid4vciCommon = require('@sphereon/oid4vci-common');
-var VerifiableCredential = require('@docknetwork/sdk/verifiable-credential');
 var keypairs = require('@docknetwork/universal-wallet/methods/keypairs');
-var helpers = require('@docknetwork/sdk/utils/vc/helpers');
-var VerifiablePresentation = require('@docknetwork/sdk/verifiable-presentation');
-var Presentation = require('@docknetwork/sdk/presentation');
-var credentials = require('@docknetwork/sdk/utils/vc/credentials');
+var vc = require('@docknetwork/credential-sdk/vc');
 var pex$1 = require('@sphereon/pex');
 var services_credential_utils = require('./utils.js');
-var services_dock_service = require('../dock/service.js');
+var services_blockchain_service = require('../blockchain/service.js');
 var services_credential_boundCheck = require('./bound-check.js');
 var assert = require('assert');
 var services_credential_bbsRevocation = require('./bbs-revocation.js');
 var services_credential_pexHelpers = require('./pex-helpers.js');
 var services_dids_service = require('../dids/service.js');
 require('base58-universal');
-require('@docknetwork/sdk/utils/misc');
+require('@docknetwork/credential-sdk/vc/crypto');
+require('../keyring/service.js');
+require('@polkadot/keyring');
 require('@polkadot/util-crypto');
-require('@polkadot/util');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/dock-blockchain-api');
+require('../keyring/configs.js');
+require('../../core/validation.js');
+require('bignumber.js');
+require('../../types.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/dock-blockchain-modules');
 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('../util-crypto/service.js');
+require('@polkadot/util');
+require('../util-crypto/configs.js');
+require('@docknetwork/credential-sdk/types');
 require('@docknetwork/crypto-wasm-ts/lib/legosnark');
 require('base64url');
 require('@astronautlabs/jsonpath');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
-require('../keyring/service.js');
-require('@polkadot/keyring');
-require('../keyring/configs.js');
-require('../../core/validation.js');
-require('bignumber.js');
-require('../../types.js');
-require('../util-crypto/service.js');
-require('../util-crypto/configs.js');
-require('@docknetwork/credential-sdk/types');
-require('@docknetwork/credential-sdk/keypairs');
 require('../../core/polkadot-utils.js');
+require('@docknetwork/credential-sdk/keypairs');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/credential-sdk/vc/crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var VerifiableCredential__default = /*#__PURE__*/_interopDefaultLegacy(VerifiableCredential);
-var VerifiablePresentation__default = /*#__PURE__*/_interopDefaultLegacy(VerifiablePresentation);
-var Presentation__default = /*#__PURE__*/_interopDefaultLegacy(Presentation);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 
 // @ts-nocheck
@@ -92,28 +86,28 @@ class CredentialService {
     generateCredential(params = {}) {
         services_credential_config.validation.generateCredential(params);
         const { subject } = params;
-        const vc = new VerifiableCredential__default["default"]();
-        vc.addType('DockAuthCredential');
-        vc.addContext({
+        const vc$1 = new vc.VerifiableCredential();
+        vc$1.addType('DockAuthCredential');
+        vc$1.addContext({
             dk: 'https://ld.dock.io/credentials#',
             DockAuthCredential: 'dk:DockAuthCredential',
         });
         if (subject) {
-            vc.setSubject(subject);
-            vc.addContext({
+            vc$1.setSubject(subject);
+            vc$1.addContext({
                 state: 'dk:state',
             });
         }
-        return vc;
+        return vc$1;
     }
     async signCredential(params) {
         services_credential_config.validation.signCredential(params);
         const { vcJson, keyDoc } = params;
-        const verifiableCredential = new VerifiableCredential__default["default"]();
+        const verifiableCredential = new vc.VerifiableCredential();
         verifiableCredential.setFromJSON(vcJson);
         const kp = keypairs.getKeypairFromDoc(keyDoc);
         kp.signer = kp.signer();
-        const suite = await helpers.getSuiteFromKeyDoc(kp);
+        const suite = await vc.getSuiteFromKeyDoc(kp);
         verifiableCredential.setIssuer(keyDoc.controller);
         await verifiableCredential.sign(suite);
         return verifiableCredential;
@@ -121,7 +115,7 @@ class CredentialService {
     async createPresentation(params) {
         services_credential_config.validation.createPresentation(params);
         const { credentials, keyDoc, challenge, id, domain } = params;
-        const vp = new VerifiablePresentation__default["default"](id);
+        const vp = new vc.VerifiablePresentation(id);
         let shouldSkipSigning = false;
         for (const signedVC of credentials) {
             vp.addCredential(signedVC);
@@ -130,18 +124,21 @@ class CredentialService {
         if (!shouldSkipSigning) {
             vp.setHolder(keyDoc.controller);
         }
-        keyDoc.keypair = services_credential_utils.keyDocToKeypair(keyDoc, services_dock_service.getDock());
+        keyDoc.keypair = services_credential_utils.keyDocToKeypair(keyDoc, services_blockchain_service.blockchainService.dock);
         if (shouldSkipSigning) {
             return vp.toJSON();
         }
-        return vp.sign(keyDoc, challenge, domain, services_dock_service.dockService.resolver);
+        return vp.sign(keyDoc, challenge, domain, services_blockchain_service.blockchainService.resolver);
+    }
+    async verifyPresentation({ presentation, options }) {
+        return vc.verifyPresentation(presentation, options);
     }
     async verifyCredential(params) {
         services_credential_config.validation.verifyCredential(params);
         const { credential, membershipWitness } = params;
-        const result = await credentials.verifyCredential(credential, {
-            resolver: services_dock_service.dockService.resolver,
-            revocationApi: { dock: services_dock_service.getDock() },
+        const result = await vc.verifyCredential(credential, {
+            resolver: services_blockchain_service.blockchainService.resolver,
+            revocationApi: { dock: services_blockchain_service.blockchainService.dock },
         });
         const { credentialStatus } = credential;
         if (result.verified && credentialStatus?.id) {
@@ -179,22 +176,19 @@ class CredentialService {
     }
     async acquireOIDCredential({ uri, authorizationCode, holderKeyDocument, }) {
         const searchParams = new URL(uri).searchParams;
-        const params = new URLSearchParams(searchParams);
-        const credentialOfferEncoded = params.get('credential_offer');
-        const credentialOfferDecoded = decodeURIComponent(credentialOfferEncoded);
-        const credentialOffer = JSON.parse(credentialOfferDecoded);
-        const scope = credentialOffer.credentials[0];
-        const format = 'ldp_vc';
-        const credentialTypes = scope.replace('ldp_vc:', '');
+        new URLSearchParams(searchParams);
         const client = await oid4vciClient.OpenID4VCIClientV1_0_13.fromURI({
             uri: uri,
             clientId: 'dock.wallet',
             authorizationRequest: {
                 redirectUri: 'dock-wallet://credentials/callback',
                 clientId: 'dock.wallet',
-                scope: credentialOffer.credentials[0],
             },
         });
+        const format = 'ldp_vc';
+        const { scope } = client.getCredentialsSupported()[0];
+        const scopeSplit = scope.split(':');
+        const credentialTypes = scopeSplit[scopeSplit.length - 1];
         let code;
         if (client.credentialOffer?.preAuthorizedCode) {
             code = client.credentialOffer?.preAuthorizedCode;
@@ -226,6 +220,7 @@ class CredentialService {
                         return jwt;
                     },
                 },
+                context: 'truverawallet',
                 format: format,
                 alg: oid4vciCommon.Alg.EdDSA,
                 kid: holderKeyDocument.id,
@@ -241,10 +236,10 @@ class CredentialService {
     async createBBSPresentation(params) {
         services_credential_config.validation.createBBSPresentation(params);
         const { credentials } = params;
-        const bbsPlusPresentation = new Presentation__default["default"]();
+        const bbsPlusPresentation = new vc.Presentation();
         for (const { credential, attributesToReveal } of credentials) {
             const idx = await bbsPlusPresentation.addCredentialToPresent(credential, {
-                resolver: services_dock_service.dockService.resolver,
+                resolver: services_blockchain_service.blockchainService.resolver,
             });
             if (Array.isArray(attributesToReveal) && attributesToReveal.length > 0) {
                 await bbsPlusPresentation.addAttributeToReveal(idx, attributesToReveal);
@@ -257,7 +252,7 @@ class CredentialService {
         if (!credential?.credentialStatus) {
             return null;
         }
-        return credential?.credentialStatus.id.replace('dock:accumulator:', '');
+        return credential?.credentialStatus.id;
     }
     async getAccumulatorData({ credential }) {
         assert__default["default"](!!credential, `credential is required`);
@@ -265,7 +260,7 @@ class CredentialService {
         if (!accumulatorId) {
             return null;
         }
-        return services_dock_service.getDock().accumulatorModule.getAccumulator(accumulatorId, false);
+        return services_blockchain_service.blockchainService.dock.accumulatorModule.getAccumulator(accumulatorId, false);
     }
     /**
      * Fetch the latest accumulator witness updates for a given credential and membership witness
@@ -311,12 +306,12 @@ class CredentialService {
     async deriveVCFromPresentation(params) {
         services_credential_config.validation.deriveVCFromPresentation(params);
         const { credentials, options = {}, proofRequest } = params;
-        const presentation = new Presentation__default["default"]();
+        const presentation = new vc.Presentation();
         const selectedCredentials = credentials.map(({ credential }) => credential);
         let descriptorBounds = [];
         for (const { credential } of credentials) {
             await presentation.addCredentialToPresent(credential, {
-                resolver: services_dock_service.dockService.resolver,
+                resolver: services_blockchain_service.blockchainService.resolver,
             });
         }
         if (proofRequest && services_credential_boundCheck.hasProvingKey(proofRequest)) {
@@ -350,7 +345,11 @@ class CredentialService {
             }
             if (witness) {
                 const details = await services_credential_bbsRevocation.getWitnessDetails(credential, witness);
-                presentation.presBuilder.addAccumInfoForCredStatus(idx, details.membershipWitness, details.accumulator.accumulated, details.pk, details.params);
+                const chainModule = credential.credentialStatus.id.indexOf('dock:accumulator') === 0
+                    ? services_blockchain_service.blockchainService.modules.accumulator.modules[0]
+                    : services_blockchain_service.blockchainService.modules.accumulator.modules[services_blockchain_service.blockchainService.modules.accumulator.modules.length - 1];
+                const accumulatorModuleClass = chainModule.constructor;
+                presentation.presBuilder.addAccumInfoForCredStatus(idx, details.membershipWitness, accumulatorModuleClass.accumulatedFromHex(details.accumulator.accumulated, cryptoWasmTs.VB_ACCUMULATOR_22.VBPos), details.pk, details.params);
             }
             idx++;
         }

package/lib/services/credential/service.mjs

@@ -1,52 +1,49 @@
 import { serviceName, validation } from './config.mjs';
-import { Accumulator, WitnessUpdatePublicInfo, MembershipWitness } from '@docknetwork/crypto-wasm-ts';
+import { Accumulator, WitnessUpdatePublicInfo, MembershipWitness, VB_ACCUMULATOR_22 } from '@docknetwork/crypto-wasm-ts';
 import { OpenID4VCIClientV1_0_13 } from '@sphereon/oid4vci-client';
 import { Alg } from '@sphereon/oid4vci-common';
-import VerifiableCredential from '@docknetwork/sdk/verifiable-credential';
 import { getKeypairFromDoc } from '@docknetwork/universal-wallet/methods/keypairs';
-import { getSuiteFromKeyDoc } from '@docknetwork/sdk/utils/vc/helpers';
-import VerifiablePresentation from '@docknetwork/sdk/verifiable-presentation';
-import Presentation from '@docknetwork/sdk/presentation';
-import { verifyCredential } from '@docknetwork/sdk/utils/vc/credentials';
+import { VerifiableCredential, getSuiteFromKeyDoc, VerifiablePresentation, verifyPresentation, verifyCredential, Presentation } from '@docknetwork/credential-sdk/vc';
 import { PEX } from '@sphereon/pex';
 import { keyDocToKeypair } from './utils.mjs';
-import { getDock, dockService } from '../dock/service.mjs';
+import { blockchainService } from '../blockchain/service.mjs';
 import { hasProvingKey, fetchProvingKey, applyEnforceBounds } from './bound-check.mjs';
 import assert from 'assert';
 import { getIsRevoked, getWitnessDetails } from './bbs-revocation.mjs';
 import { getPexRequiredAttributes } from './pex-helpers.mjs';
 import { didService } from '../dids/service.mjs';
 import 'base58-universal';
-import '@docknetwork/sdk/utils/misc';
+import '@docknetwork/credential-sdk/vc/crypto';
+import '../keyring/service.mjs';
+import '@polkadot/keyring';
 import '@polkadot/util-crypto';
-import '@polkadot/util';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/dock-blockchain-api';
+import '../keyring/configs.mjs';
+import '../../core/validation.mjs';
+import 'bignumber.js';
+import '../../types.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/dock-blockchain-modules';
 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 '../util-crypto/service.mjs';
+import '@polkadot/util';
+import '../util-crypto/configs.mjs';
+import '@docknetwork/credential-sdk/types';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
 import 'base64url';
 import '@astronautlabs/jsonpath';
 import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
-import '../keyring/service.mjs';
-import '@polkadot/keyring';
-import '../keyring/configs.mjs';
-import '../../core/validation.mjs';
-import 'bignumber.js';
-import '../../types.mjs';
-import '../util-crypto/service.mjs';
-import '../util-crypto/configs.mjs';
-import '@docknetwork/credential-sdk/types';
-import '@docknetwork/credential-sdk/keypairs';
 import '../../core/polkadot-utils.mjs';
+import '@docknetwork/credential-sdk/keypairs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/credential-sdk/vc/crypto';
 
 // @ts-nocheck
 const pex = new PEX();
@@ -119,18 +116,21 @@ class CredentialService {
         if (!shouldSkipSigning) {
             vp.setHolder(keyDoc.controller);
         }
-        keyDoc.keypair = keyDocToKeypair(keyDoc, getDock());
+        keyDoc.keypair = keyDocToKeypair(keyDoc, blockchainService.dock);
         if (shouldSkipSigning) {
             return vp.toJSON();
         }
-        return vp.sign(keyDoc, challenge, domain, dockService.resolver);
+        return vp.sign(keyDoc, challenge, domain, blockchainService.resolver);
+    }
+    async verifyPresentation({ presentation, options }) {
+        return verifyPresentation(presentation, options);
     }
     async verifyCredential(params) {
         validation.verifyCredential(params);
         const { credential, membershipWitness } = params;
         const result = await verifyCredential(credential, {
-            resolver: dockService.resolver,
-            revocationApi: { dock: getDock() },
+            resolver: blockchainService.resolver,
+            revocationApi: { dock: blockchainService.dock },
         });
         const { credentialStatus } = credential;
         if (result.verified && credentialStatus?.id) {
@@ -168,22 +168,19 @@ class CredentialService {
     }
     async acquireOIDCredential({ uri, authorizationCode, holderKeyDocument, }) {
         const searchParams = new URL(uri).searchParams;
-        const params = new URLSearchParams(searchParams);
-        const credentialOfferEncoded = params.get('credential_offer');
-        const credentialOfferDecoded = decodeURIComponent(credentialOfferEncoded);
-        const credentialOffer = JSON.parse(credentialOfferDecoded);
-        const scope = credentialOffer.credentials[0];
-        const format = 'ldp_vc';
-        const credentialTypes = scope.replace('ldp_vc:', '');
+        new URLSearchParams(searchParams);
         const client = await OpenID4VCIClientV1_0_13.fromURI({
             uri: uri,
             clientId: 'dock.wallet',
             authorizationRequest: {
                 redirectUri: 'dock-wallet://credentials/callback',
                 clientId: 'dock.wallet',
-                scope: credentialOffer.credentials[0],
             },
         });
+        const format = 'ldp_vc';
+        const { scope } = client.getCredentialsSupported()[0];
+        const scopeSplit = scope.split(':');
+        const credentialTypes = scopeSplit[scopeSplit.length - 1];
         let code;
         if (client.credentialOffer?.preAuthorizedCode) {
             code = client.credentialOffer?.preAuthorizedCode;
@@ -215,6 +212,7 @@ class CredentialService {
                         return jwt;
                     },
                 },
+                context: 'truverawallet',
                 format: format,
                 alg: Alg.EdDSA,
                 kid: holderKeyDocument.id,
@@ -233,7 +231,7 @@ class CredentialService {
         const bbsPlusPresentation = new Presentation();
         for (const { credential, attributesToReveal } of credentials) {
             const idx = await bbsPlusPresentation.addCredentialToPresent(credential, {
-                resolver: dockService.resolver,
+                resolver: blockchainService.resolver,
             });
             if (Array.isArray(attributesToReveal) && attributesToReveal.length > 0) {
                 await bbsPlusPresentation.addAttributeToReveal(idx, attributesToReveal);
@@ -246,7 +244,7 @@ class CredentialService {
         if (!credential?.credentialStatus) {
             return null;
         }
-        return credential?.credentialStatus.id.replace('dock:accumulator:', '');
+        return credential?.credentialStatus.id;
     }
     async getAccumulatorData({ credential }) {
         assert(!!credential, `credential is required`);
@@ -254,7 +252,7 @@ class CredentialService {
         if (!accumulatorId) {
             return null;
         }
-        return getDock().accumulatorModule.getAccumulator(accumulatorId, false);
+        return blockchainService.dock.accumulatorModule.getAccumulator(accumulatorId, false);
     }
     /**
      * Fetch the latest accumulator witness updates for a given credential and membership witness
@@ -305,7 +303,7 @@ class CredentialService {
         let descriptorBounds = [];
         for (const { credential } of credentials) {
             await presentation.addCredentialToPresent(credential, {
-                resolver: dockService.resolver,
+                resolver: blockchainService.resolver,
             });
         }
         if (proofRequest && hasProvingKey(proofRequest)) {
@@ -339,7 +337,11 @@ class CredentialService {
             }
             if (witness) {
                 const details = await getWitnessDetails(credential, witness);
-                presentation.presBuilder.addAccumInfoForCredStatus(idx, details.membershipWitness, details.accumulator.accumulated, details.pk, details.params);
+                const chainModule = credential.credentialStatus.id.indexOf('dock:accumulator') === 0
+                    ? blockchainService.modules.accumulator.modules[0]
+                    : blockchainService.modules.accumulator.modules[blockchainService.modules.accumulator.modules.length - 1];
+                const accumulatorModuleClass = chainModule.constructor;
+                presentation.presBuilder.addAccumInfoForCredStatus(idx, details.membershipWitness, accumulatorModuleClass.accumulatedFromHex(details.accumulator.accumulated, VB_ACCUMULATOR_22.VBPos), details.pk, details.params);
             }
             idx++;
         }

package/lib/services/credential/utils.js

@@ -3,12 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var bs58 = require('base58-universal');
-var misc = require('@docknetwork/sdk/utils/misc');
-var utilCrypto = require('@polkadot/util-crypto');
-var util = require('@polkadot/util');
-var Bls12381G2KeyPairDock2022 = require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+var crypto = require('@docknetwork/credential-sdk/vc/crypto');
+var services_keyring_service = require('../keyring/service.js');
+require('@polkadot/keyring');
+require('@polkadot/util-crypto');
+require('../keyring/configs.js');
+require('assert');
+require('../../core/validation.js');
+require('bignumber.js');
+require('../../types.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -29,14 +32,7 @@ function _interopNamespace(e) {
 }
 
 var bs58__namespace = /*#__PURE__*/_interopNamespace(bs58);
-var Bls12381G2KeyPairDock2022__default = /*#__PURE__*/_interopDefaultLegacy(Bls12381G2KeyPairDock2022);
 
-function createSecp256k1Keypair(privateKeyHex) {
-  const pk = privateKeyHex || utilCrypto.randomAsHex(32);
-  const kp = misc.generateEcdsaSecp256k1Keypair(pk);
-  kp.pk = pk;
-  return kp;
-}
 const docToKeyMap = {
   Sr25519VerificationKey2020: 'sr25519',
   Ed25519VerificationKey2018: 'ed25519',
@@ -53,10 +49,8 @@ function keyDocToKeypair(keyDoc, dock) {
   const privateKeyEncoded = privateKeyBase58 || privateKeyMultibase.substr(1);
   const privateKeyBytes = bs58__namespace.decode(privateKeyEncoded);
 
-  if (type === 'EcdsaSecp256k1VerificationKey2019') {
-    return createSecp256k1Keypair(util.u8aToHex(privateKeyBytes));
-  } else if (type === 'Bls12381G2VerificationKeyDock2022') {
-    return new Bls12381G2KeyPairDock2022__default["default"](keyDoc);
+  if (type === 'Bls12381G2VerificationKeyDock2022') {
+    return new crypto.Bls12381G2KeyPairDock2022(keyDoc);
   } else {
     const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
     const keyType = docToKeyMap[type];
@@ -64,7 +58,7 @@ function keyDocToKeypair(keyDoc, dock) {
       throw new Error(`Unsupported key type: ${type}`);
     }
 
-    return dock.keyring.createFromPair(
+    return services_keyring_service.getKeyring().createFromPair(
       {
         publicKey: bs58__namespace.decode(publicKeyEncoded),
         secretKey: privateKeyBytes,

package/lib/services/credential/utils.mjs

@@ -1,15 +1,14 @@
 import * as bs58 from 'base58-universal';
-import { generateEcdsaSecp256k1Keypair } from '@docknetwork/sdk/utils/misc';
-import { randomAsHex } from '@polkadot/util-crypto';
-import { u8aToHex } from '@polkadot/util';
-import Bls12381G2KeyPairDock2022 from '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
+import { Bls12381G2KeyPairDock2022 } from '@docknetwork/credential-sdk/vc/crypto';
+import { getKeyring } from '../keyring/service.mjs';
+import '@polkadot/keyring';
+import '@polkadot/util-crypto';
+import '../keyring/configs.mjs';
+import 'assert';
+import '../../core/validation.mjs';
+import 'bignumber.js';
+import '../../types.mjs';
 
-function createSecp256k1Keypair(privateKeyHex) {
-  const pk = privateKeyHex || randomAsHex(32);
-  const kp = generateEcdsaSecp256k1Keypair(pk);
-  kp.pk = pk;
-  return kp;
-}
 const docToKeyMap = {
   Sr25519VerificationKey2020: 'sr25519',
   Ed25519VerificationKey2018: 'ed25519',
@@ -26,9 +25,7 @@ function keyDocToKeypair(keyDoc, dock) {
   const privateKeyEncoded = privateKeyBase58 || privateKeyMultibase.substr(1);
   const privateKeyBytes = bs58.decode(privateKeyEncoded);
 
-  if (type === 'EcdsaSecp256k1VerificationKey2019') {
-    return createSecp256k1Keypair(u8aToHex(privateKeyBytes));
-  } else if (type === 'Bls12381G2VerificationKeyDock2022') {
+  if (type === 'Bls12381G2VerificationKeyDock2022') {
     return new Bls12381G2KeyPairDock2022(keyDoc);
   } else {
     const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
@@ -37,7 +34,7 @@ function keyDocToKeypair(keyDoc, dock) {
       throw new Error(`Unsupported key type: ${type}`);
     }
 
-    return dock.keyring.createFromPair(
+    return getKeyring().createFromPair(
       {
         publicKey: bs58.decode(publicKeyEncoded),
         secretKey: privateKeyBytes,

package/lib/services/dids/config.js

@@ -26,6 +26,14 @@ const validation = {
             assert__default["default"](typeof type === 'string', 'invalid type');
         }
     },
+    deriveKeyDoc: ({ pair, type }) => {
+        assert__default["default"](typeof pair === 'object', 'invalid pair');
+        assert__default["default"](pair.publicKey instanceof Uint8Array, 'invalid publicKey');
+        assert__default["default"](pair.secretKey instanceof Uint8Array, 'invalid secretKey');
+        if (type) {
+            assert__default["default"](typeof type === 'string', 'invalid type');
+        }
+    },
 };
 
 exports.serviceName = serviceName;

package/lib/services/dids/config.mjs

@@ -18,6 +18,14 @@ const validation = {
             assert(typeof type === 'string', 'invalid type');
         }
     },
+    deriveKeyDoc: ({ pair, type }) => {
+        assert(typeof pair === 'object', 'invalid pair');
+        assert(pair.publicKey instanceof Uint8Array, 'invalid publicKey');
+        assert(pair.secretKey instanceof Uint8Array, 'invalid secretKey');
+        if (type) {
+            assert(typeof type === 'string', 'invalid type');
+        }
+    },
 };
 
 export { serviceName, validation };

package/lib/services/dids/index.js

@@ -16,25 +16,26 @@ require('../../types.js');
 require('../util-crypto/service.js');
 require('@polkadot/util');
 require('../util-crypto/configs.js');
-require('../dock/service.js');
-require('@docknetwork/dock-blockchain-api');
+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/dock-blockchain-modules');
 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('../../core/polkadot-utils.js');
+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('base64url');
 require('../credential/utils.js');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
 require('@docknetwork/credential-sdk/vc/crypto');
 
 const didServiceRPC = services_dids_service.didService;

package/lib/services/dids/index.mjs

@@ -12,25 +12,26 @@ import '../../types.mjs';
 import '../util-crypto/service.mjs';
 import '@polkadot/util';
 import '../util-crypto/configs.mjs';
-import '../dock/service.mjs';
-import '@docknetwork/dock-blockchain-api';
+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/dock-blockchain-modules';
 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 '../../core/polkadot-utils.mjs';
+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 'base64url';
 import '../credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 import '@docknetwork/credential-sdk/vc/crypto';
 
 const didServiceRPC = didService;

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);