@docknetwork/wallet-sdk-wasm 1.5.9 → 1.5.10

package/lib/services/dids/index.mjs

@@ -2,16 +2,6 @@ import { didService } from './service.mjs';
 import '@docknetwork/wallet-sdk-dids/lib';
 import './config.mjs';
 import 'assert';
-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 '../blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -22,15 +12,22 @@ import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
+import '../util-crypto/service.mjs';
+import '@docknetwork/credential-sdk/utils';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
+import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import '../../core/polkadot-utils.mjs';
 import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
-import 'base58-universal';
-import '@docknetwork/universal-wallet/methods/keypairs';
 import 'base64url';
 import '../credential/utils.mjs';
+import 'base58-universal';
 import '@docknetwork/credential-sdk/vc/crypto';
+import '@digitalbazaar/x25519-key-agreement-key-2020';
+import '@digitalbazaar/x25519-key-agreement-key-2019';
+import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/ed25519-verification-key-2020';
+import './keypair-utils.mjs';
 
 const didServiceRPC = didService;
 

package/lib/services/dids/keypair-utils.js

@@ -0,0 +1,142 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var keypairs = require('@docknetwork/credential-sdk/keypairs');
+var utils = require('@docknetwork/credential-sdk/utils');
+var bs58 = require('base58-universal');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var bs58__namespace = /*#__PURE__*/_interopNamespace(bs58);
+
+/**
+ * This code is based on the implementation from truvera api
+ * https://github.com/docknetwork/web/blob/3c706c5dc5de4ae63f548c76ec6edeb17533a0c9/apps/api/src/utils/key-manager.js
+ */
+
+function getKeyPairType(key) {
+  const keyType = key.type || key.constructor.VerKeyType;
+  if (keyType) {
+    return keyType;
+  }
+
+  if (key instanceof keypairs.Ed25519Keypair) {
+    return 'Ed25519VerificationKey2018';
+  }
+
+  throw new Error(`Unknown key type for ${key.constructor.name}`);
+}
+
+const MULTIBASE_BASE58BTC_HEADER = 'z';
+const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+const MULTICODEC_ED25519_PRIV_HEADER = new Uint8Array([0x80, 0x26]);
+
+function encodeMbKey(header, key) {
+  const mbKey = new Uint8Array(header.length + key.length);
+  mbKey.set(header);
+  mbKey.set(key, header.length);
+  return MULTIBASE_BASE58BTC_HEADER + bs58__namespace.encode(mbKey);
+}
+
+function getKeyFingerprint(keyType, publicKey) {
+  if (keyType.startsWith('Ed25519')) {
+    return encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey);
+  } else {
+    throw new Error(`Cannot detect key type for fingerprint: ${keyType}`);
+  }
+}
+
+const keyTypeToDocType = {
+  bjj: 'BJJVerificationKey2021',
+  secp256k1: 'EcdsaSecp256k1VerificationKey2019',
+};
+
+function keypairToKeydoc(key, controller, id = undefined) {
+  const keyType = getKeyPairType(key);
+  let keyDoc;
+  if (
+    keyType === 'Ed25519VerificationKey2020' ||
+    keyType === 'Ed25519VerificationKey2018'
+  ) {
+    const publicKey = utils.u8aToU8a(
+      (key.keyPair &&
+        key.keyPair.publicKey &&
+        utils.u8aToU8a(key.keyPair.publicKey)) ||
+        key.publicKeyBuffer ||
+        (key.pk && key.pk.value),
+    );
+
+    if (!publicKey) {
+      throw new Error('Cannot find public key');
+    }
+
+    const pk = utils.u8aToU8a(
+      (key.keyPair && key.keyPair.secretKey) ||
+        key.privateKeyBuffer ||
+        (key.sk &&
+          (typeof key.sk === 'string'
+            ? utils.hexToU8a(key.sk)
+            : key.sk.value || key.sk)) ||
+        utils.hexToU8a(key.pk),
+    );
+
+    const publicKeyBase58 = bs58__namespace.encode(publicKey);
+    const privateKeyBase58 = bs58__namespace.encode(pk);
+
+    const fingerprint =
+      (key.fingerprint && key.fingerprint()) ||
+      getKeyFingerprint(keyType, publicKey);
+
+    // auto create controller
+    if (!controller) {
+      controller = `did:key:${fingerprint}`;
+      id = id || key.id || `${controller}#${fingerprint}`;
+    }
+
+    const keyId = id || key.id || `${controller}#${fingerprint}`;
+    const type = keyTypeToDocType[keyType] || keyType;
+    keyDoc = {
+      controller,
+      type,
+      id: keyId,
+      publicKeyMultibase: encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey),
+      privateKeyMultibase: encodeMbKey(MULTICODEC_ED25519_PRIV_HEADER, pk),
+      privateKeyBase58,
+      publicKeyBase58,
+    };
+
+    if (key.seed) {
+      keyDoc.seed = utils.u8aToHex(key.seed);
+    }
+  } else {
+    throw new Error(`Unknown keypairToKeydoc type: ${keyType}`);
+  }
+
+  keyDoc['@context'] = ['https://w3id.org/wallet/v1'];
+
+  return keyDoc;
+}
+
+exports.MULTIBASE_BASE58BTC_HEADER = MULTIBASE_BASE58BTC_HEADER;
+exports.MULTICODEC_ED25519_PRIV_HEADER = MULTICODEC_ED25519_PRIV_HEADER;
+exports.MULTICODEC_ED25519_PUB_HEADER = MULTICODEC_ED25519_PUB_HEADER;
+exports.encodeMbKey = encodeMbKey;
+exports.getKeyPairType = getKeyPairType;
+exports.keypairToKeydoc = keypairToKeydoc;

package/lib/services/dids/keypair-utils.mjs

@@ -0,0 +1,113 @@
+import { Ed25519Keypair } from '@docknetwork/credential-sdk/keypairs';
+import { u8aToU8a, hexToU8a, u8aToHex } from '@docknetwork/credential-sdk/utils';
+import * as bs58 from 'base58-universal';
+
+/**
+ * This code is based on the implementation from truvera api
+ * https://github.com/docknetwork/web/blob/3c706c5dc5de4ae63f548c76ec6edeb17533a0c9/apps/api/src/utils/key-manager.js
+ */
+
+function getKeyPairType(key) {
+  const keyType = key.type || key.constructor.VerKeyType;
+  if (keyType) {
+    return keyType;
+  }
+
+  if (key instanceof Ed25519Keypair) {
+    return 'Ed25519VerificationKey2018';
+  }
+
+  throw new Error(`Unknown key type for ${key.constructor.name}`);
+}
+
+const MULTIBASE_BASE58BTC_HEADER = 'z';
+const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+const MULTICODEC_ED25519_PRIV_HEADER = new Uint8Array([0x80, 0x26]);
+
+function encodeMbKey(header, key) {
+  const mbKey = new Uint8Array(header.length + key.length);
+  mbKey.set(header);
+  mbKey.set(key, header.length);
+  return MULTIBASE_BASE58BTC_HEADER + bs58.encode(mbKey);
+}
+
+function getKeyFingerprint(keyType, publicKey) {
+  if (keyType.startsWith('Ed25519')) {
+    return encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey);
+  } else {
+    throw new Error(`Cannot detect key type for fingerprint: ${keyType}`);
+  }
+}
+
+const keyTypeToDocType = {
+  bjj: 'BJJVerificationKey2021',
+  secp256k1: 'EcdsaSecp256k1VerificationKey2019',
+};
+
+function keypairToKeydoc(key, controller, id = undefined) {
+  const keyType = getKeyPairType(key);
+  let keyDoc;
+  if (
+    keyType === 'Ed25519VerificationKey2020' ||
+    keyType === 'Ed25519VerificationKey2018'
+  ) {
+    const publicKey = u8aToU8a(
+      (key.keyPair &&
+        key.keyPair.publicKey &&
+        u8aToU8a(key.keyPair.publicKey)) ||
+        key.publicKeyBuffer ||
+        (key.pk && key.pk.value),
+    );
+
+    if (!publicKey) {
+      throw new Error('Cannot find public key');
+    }
+
+    const pk = u8aToU8a(
+      (key.keyPair && key.keyPair.secretKey) ||
+        key.privateKeyBuffer ||
+        (key.sk &&
+          (typeof key.sk === 'string'
+            ? hexToU8a(key.sk)
+            : key.sk.value || key.sk)) ||
+        hexToU8a(key.pk),
+    );
+
+    const publicKeyBase58 = bs58.encode(publicKey);
+    const privateKeyBase58 = bs58.encode(pk);
+
+    const fingerprint =
+      (key.fingerprint && key.fingerprint()) ||
+      getKeyFingerprint(keyType, publicKey);
+
+    // auto create controller
+    if (!controller) {
+      controller = `did:key:${fingerprint}`;
+      id = id || key.id || `${controller}#${fingerprint}`;
+    }
+
+    const keyId = id || key.id || `${controller}#${fingerprint}`;
+    const type = keyTypeToDocType[keyType] || keyType;
+    keyDoc = {
+      controller,
+      type,
+      id: keyId,
+      publicKeyMultibase: encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, publicKey),
+      privateKeyMultibase: encodeMbKey(MULTICODEC_ED25519_PRIV_HEADER, pk),
+      privateKeyBase58,
+      publicKeyBase58,
+    };
+
+    if (key.seed) {
+      keyDoc.seed = u8aToHex(key.seed);
+    }
+  } else {
+    throw new Error(`Unknown keypairToKeydoc type: ${keyType}`);
+  }
+
+  keyDoc['@context'] = ['https://w3id.org/wallet/v1'];
+
+  return keyDoc;
+}
+
+export { MULTIBASE_BASE58BTC_HEADER, MULTICODEC_ED25519_PRIV_HEADER, MULTICODEC_ED25519_PUB_HEADER, encodeMbKey, getKeyPairType, keypairToKeydoc };

package/lib/services/dids/service.js

@@ -4,22 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var src = require('@docknetwork/wallet-sdk-dids/lib');
 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 services_blockchain_service = require('../blockchain/service.js');
-var core_polkadotUtils = require('../../core/polkadot-utils.js');
+var keypairs = require('@docknetwork/credential-sdk/keypairs');
 var base64url = require('base64url');
 var services_credential_utils = require('../credential/utils.js');
 var crypto = require('@docknetwork/credential-sdk/vc/crypto');
-require('@polkadot/keyring');
-require('@polkadot/util-crypto');
-require('../keyring/configs.js');
-require('../../core/validation.js');
-require('bignumber.js');
-require('../../types.js');
-require('@polkadot/util');
-require('../util-crypto/configs.js');
+var services_dids_keypairUtils = require('./keypair-utils.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
 require('@docknetwork/cheqd-blockchain-modules');
@@ -29,11 +20,17 @@ require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
+require('../util-crypto/service.js');
+require('@docknetwork/credential-sdk/utils');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
+require('../util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
-require('@docknetwork/credential-sdk/keypairs');
-require('@polkadot/keyring/pair/decode');
 require('base58-universal');
-require('@docknetwork/universal-wallet/methods/keypairs');
+require('@digitalbazaar/x25519-key-agreement-key-2020');
+require('@digitalbazaar/x25519-key-agreement-key-2019');
+require('@digitalbazaar/ed25519-verification-key-2018');
+require('@digitalbazaar/ed25519-verification-key-2020');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -88,30 +85,14 @@ class DIDService {
     }
     async generateKeyDoc(params) {
         services_dids_config.validation.generateKeyDoc(params);
-        const { derivePath = '', type = 'ed25519', keyPairJSON } = params;
-        let keyring;
-        if (keyPairJSON) {
-            keyring = services_keyring_service.keyringService.keyring.addFromJson(keyPairJSON);
-            keyring.unlock('');
-        }
-        else {
-            const mnemonic = await services_utilCrypto_service.utilCryptoService.mnemonicGenerate(12);
-            keyring = services_keyring_service.keyringService.getKeyringPair({
-                mnemonic,
-                derivePath,
-                type,
-            });
-        }
-        return core_polkadotUtils.polkadotToKeydoc(keyring, params.controller);
+        const keyPair = keypairs.Ed25519Keypair.random();
+        return services_dids_keypairUtils.keypairToKeydoc(keyPair, 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);
+        const keyPair = new keypairs.Ed25519Keypair(pair.secretKey, 'private');
+        return services_dids_keypairUtils.keypairToKeydoc(keyPair, params.controller);
     }
     async createSignedJWT({ payload, privateKeyDoc, headerInput }) {
         const privateKey = await getSignerKeypair(privateKeyDoc);

package/lib/services/dids/service.mjs

@@ -1,21 +1,12 @@
 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 { blockchainService } from '../blockchain/service.mjs';
-import { polkadotToKeydoc } from '../../core/polkadot-utils.mjs';
+import { Ed25519Keypair } from '@docknetwork/credential-sdk/keypairs';
 import base64url from 'base64url';
 import { keyDocToKeypair } from '../credential/utils.mjs';
 import { Ed25519Signature2020, EcdsaSecp256k1Signature2019 } from '@docknetwork/credential-sdk/vc/crypto';
-import '@polkadot/keyring';
-import '@polkadot/util-crypto';
-import '../keyring/configs.mjs';
-import '../../core/validation.mjs';
-import 'bignumber.js';
-import '../../types.mjs';
-import '@polkadot/util';
-import '../util-crypto/configs.mjs';
+import { keypairToKeydoc } from './keypair-utils.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
 import '@docknetwork/cheqd-blockchain-modules';
@@ -25,11 +16,17 @@ import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
+import '../util-crypto/service.mjs';
+import '@docknetwork/credential-sdk/utils';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
+import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
 import 'base58-universal';
-import '@docknetwork/universal-wallet/methods/keypairs';
+import '@digitalbazaar/x25519-key-agreement-key-2020';
+import '@digitalbazaar/x25519-key-agreement-key-2019';
+import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/ed25519-verification-key-2020';
 
 // @ts-nocheck
 async function getSignerKeypair(privateKeyDoc) {
@@ -79,30 +76,14 @@ class DIDService {
     }
     async generateKeyDoc(params) {
         validation.generateKeyDoc(params);
-        const { derivePath = '', type = 'ed25519', keyPairJSON } = params;
-        let keyring;
-        if (keyPairJSON) {
-            keyring = keyringService.keyring.addFromJson(keyPairJSON);
-            keyring.unlock('');
-        }
-        else {
-            const mnemonic = await utilCryptoService.mnemonicGenerate(12);
-            keyring = keyringService.getKeyringPair({
-                mnemonic,
-                derivePath,
-                type,
-            });
-        }
-        return polkadotToKeydoc(keyring, params.controller);
+        const keyPair = Ed25519Keypair.random();
+        return keypairToKeydoc(keyPair, params.controller);
     }
     async deriveKeyDoc(params) {
         validation.deriveKeyDoc(params);
         const { pair, type = 'ed25519' } = params;
-        const keyring = keyringService.createFromPair({
-            pair,
-            type,
-        });
-        return polkadotToKeydoc(keyring, params.controller);
+        const keyPair = new Ed25519Keypair(pair.secretKey, 'private');
+        return keypairToKeydoc(keyPair, params.controller);
     }
     async createSignedJWT({ payload, privateKeyDoc, headerInput }) {
         const privateKey = await getSignerKeypair(privateKeyDoc);

package/lib/services/edv/index.js

@@ -17,16 +17,6 @@ require('@docknetwork/wallet-sdk-data-store/lib/logger');
 require('../dids/service.js');
 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('../blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -37,15 +27,19 @@ require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
+require('../util-crypto/service.js');
+require('@docknetwork/credential-sdk/utils');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
+require('../util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
-require('../../core/polkadot-utils.js');
 require('@docknetwork/credential-sdk/keypairs');
-require('@polkadot/keyring/pair/decode');
-require('base58-universal');
 require('base64url');
 require('../credential/utils.js');
+require('base58-universal');
 require('@docknetwork/credential-sdk/vc/crypto');
-require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
+require('@digitalbazaar/x25519-key-agreement-key-2019');
+require('../dids/keypair-utils.js');
 
 
 

package/lib/services/edv/index.mjs

@@ -13,16 +13,6 @@ import '@docknetwork/wallet-sdk-data-store/lib/logger';
 import '../dids/service.mjs';
 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 '../blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -33,12 +23,16 @@ import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
+import '../util-crypto/service.mjs';
+import '@docknetwork/credential-sdk/utils';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
+import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import '../../core/polkadot-utils.mjs';
 import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
-import 'base58-universal';
 import 'base64url';
 import '../credential/utils.mjs';
+import 'base58-universal';
 import '@docknetwork/credential-sdk/vc/crypto';
-import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
+import '@digitalbazaar/x25519-key-agreement-key-2019';
+import '../dids/keypair-utils.mjs';

package/lib/services/edv/service.js

@@ -11,22 +11,12 @@ var x25519KeyAgreementKey2020 = require('@digitalbazaar/x25519-key-agreement-key
 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 keypairs$1 = require('@docknetwork/credential-sdk/keypairs');
 require('assert');
 require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
 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('@polkadot/util');
-require('../util-crypto/configs.js');
 require('../blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -37,14 +27,18 @@ require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
+require('../util-crypto/service.js');
+require('@docknetwork/credential-sdk/utils');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
+require('../util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
-require('../../core/polkadot-utils.js');
-require('@docknetwork/credential-sdk/keypairs');
-require('@polkadot/keyring/pair/decode');
-require('base58-universal');
 require('base64url');
 require('../credential/utils.js');
+require('base58-universal');
 require('@docknetwork/credential-sdk/vc/crypto');
+require('@digitalbazaar/x25519-key-agreement-key-2019');
+require('../dids/keypair-utils.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -119,9 +113,6 @@ class EDVService {
         });
     }
     async generateKeys() {
-        await keyring.keyringService.initialize({
-            ss58Format: 22,
-        });
         const keyPair = await services_dids_service.didService.generateKeyDoc({});
         const verificationKey = await ed25519VerificationKey2018.Ed25519VerificationKey2018.generate({
             controller: keyPair.controller,
@@ -134,10 +125,7 @@ class EDVService {
         return { verificationKey, agreementKey, hmacKey };
     }
     async deriveKeys(masterKey) {
-        await keyring.keyringService.initialize({
-            ss58Format: 22,
-        });
-        const pair = utilCrypto.ed25519PairFromSeed(masterKey);
+        const { keyPair: pair } = new keypairs$1.Ed25519Keypair(masterKey, 'seed');
         const keyPair = await services_dids_service.didService.deriveKeyDoc({ pair });
         const verificationKey = await ed25519VerificationKey2018.Ed25519VerificationKey2018.from(keyPair);
         const verificationKey2020 = await ed25519VerificationKey2020.Ed25519VerificationKey2020.fromEd25519VerificationKey2018({ keyPair });

package/lib/services/edv/service.mjs

@@ -7,22 +7,12 @@ import { X25519KeyAgreementKey2020 } from '@digitalbazaar/x25519-key-agreement-k
 import { getKeypairFromDoc } from '@docknetwork/universal-wallet/methods/keypairs';
 import { logger } from '@docknetwork/wallet-sdk-data-store/lib/logger';
 import { didService } from '../dids/service.mjs';
-import { keyringService } from '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
-import { ed25519PairFromSeed } from '@polkadot/util-crypto';
+import { Ed25519Keypair } from '@docknetwork/credential-sdk/keypairs';
 import 'assert';
 import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
 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 '@polkadot/util';
-import '../util-crypto/configs.mjs';
 import '../blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -33,14 +23,18 @@ import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
+import '../util-crypto/service.mjs';
+import '@docknetwork/credential-sdk/utils';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
+import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import '../../core/polkadot-utils.mjs';
-import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
-import 'base58-universal';
 import 'base64url';
 import '../credential/utils.mjs';
+import 'base58-universal';
 import '@docknetwork/credential-sdk/vc/crypto';
+import '@digitalbazaar/x25519-key-agreement-key-2019';
+import '../dids/keypair-utils.mjs';
 
 // @ts-nocheck
 /**
@@ -111,9 +105,6 @@ class EDVService {
         });
     }
     async generateKeys() {
-        await keyringService.initialize({
-            ss58Format: 22,
-        });
         const keyPair = await didService.generateKeyDoc({});
         const verificationKey = await Ed25519VerificationKey2018.generate({
             controller: keyPair.controller,
@@ -126,10 +117,7 @@ class EDVService {
         return { verificationKey, agreementKey, hmacKey };
     }
     async deriveKeys(masterKey) {
-        await keyringService.initialize({
-            ss58Format: 22,
-        });
-        const pair = ed25519PairFromSeed(masterKey);
+        const { keyPair: pair } = new Ed25519Keypair(masterKey, 'seed');
         const keyPair = await didService.deriveKeyDoc({ pair });
         const verificationKey = await Ed25519VerificationKey2018.from(keyPair);
         const verificationKey2020 = await Ed25519VerificationKey2020.fromEd25519VerificationKey2018({ keyPair });