@docknetwork/wallet-sdk-wasm 1.5.9 → 1.5.10

package/lib/services/credential/bbs-revocation.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var cryptoWasmTs = require('@docknetwork/crypto-wasm-ts');
-var util = require('@polkadot/util');
+var utils = require('@docknetwork/credential-sdk/utils');
 var services_blockchain_service = require('../blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -16,12 +16,9 @@ require('../../core/logger.js');
 require('../../modules/event-manager.js');
 require('assert');
 require('../util-crypto/service.js');
-require('@polkadot/keyring');
-require('@polkadot/util-crypto');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
 require('../util-crypto/configs.js');
-require('../../core/validation.js');
-require('bignumber.js');
-require('../../types.js');
 require('@docknetwork/credential-sdk/types');
 
 const getWitnessDetails = async (credential, _membershipWitness) => {
@@ -45,7 +42,7 @@ const getWitnessDetails = async (credential, _membershipWitness) => {
     const publicKey = await services_blockchain_service.blockchainService.modules.accumulator.getPublicKey(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
     const params = cryptoWasmTs.dockAccumulatorParams();
     const pk = new cryptoWasmTs.AccumulatorPublicKey(publicKey.bytes);
-    const membershipWitness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(witness));
+    const membershipWitness = new cryptoWasmTs.VBMembershipWitness(utils.hexToU8a(witness));
     try {
         const credentialStatusId = credential.credentialStatus.id;
         const accumulatorId = services_blockchain_service.blockchainService

package/lib/services/credential/bbs-revocation.mjs

@@ -1,5 +1,5 @@
 import { PositiveAccumulator, Encoder, dockAccumulatorParams, AccumulatorPublicKey, VBMembershipWitness } from '@docknetwork/crypto-wasm-ts';
-import { hexToU8a } from '@polkadot/util';
+import { hexToU8a } from '@docknetwork/credential-sdk/utils';
 import { blockchainService } from '../blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -12,12 +12,9 @@ import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
 import 'assert';
 import '../util-crypto/service.mjs';
-import '@polkadot/keyring';
-import '@polkadot/util-crypto';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
 import '../util-crypto/configs.mjs';
-import '../../core/validation.mjs';
-import 'bignumber.js';
-import '../../types.mjs';
 import '@docknetwork/credential-sdk/types';
 
 const getWitnessDetails = async (credential, _membershipWitness) => {

package/lib/services/credential/bound-check.js

@@ -3,10 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var legosnark = require('@docknetwork/crypto-wasm-ts/lib/legosnark');
-var utilCrypto = require('@polkadot/util-crypto');
 var base64url = require('base64url');
 var services_credential_pexHelpers = require('./pex-helpers.js');
+var services_utilCrypto_service = require('../util-crypto/service.js');
 require('@astronautlabs/jsonpath');
+require('@docknetwork/credential-sdk/utils');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
+require('../util-crypto/configs.js');
+require('assert');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -45,13 +50,13 @@ function blobFromBase64(base64String) {
     const cleanedBase64 = base64String.replace(/^data:application\/octet-stream;base64,/, '');
     return base64url__default["default"].toBuffer(cleanedBase64);
 }
-function isBase64OrDataUrl(str) {
-    return (utilCrypto.isBase64(str) ||
+async function isBase64OrDataUrl(str) {
+    return ((await services_utilCrypto_service.utilCryptoService.isBase64(str)) ||
         str.indexOf('data:application/octet-stream') > -1);
 }
 async function fetchProvingKey(proofRequest) {
     let blob;
-    if (isBase64OrDataUrl(proofRequest.boundCheckSnarkKey)) {
+    if (await isBase64OrDataUrl(proofRequest.boundCheckSnarkKey)) {
         console.log('Is base64');
         blob = blobFromBase64(proofRequest.boundCheckSnarkKey);
     }

package/lib/services/credential/bound-check.mjs

@@ -1,8 +1,13 @@
 import { LegoProvingKey } from '@docknetwork/crypto-wasm-ts/lib/legosnark';
-import { isBase64 } from '@polkadot/util-crypto';
 import base64url from 'base64url';
 import { pexToBounds } from './pex-helpers.mjs';
+import { utilCryptoService } from '../util-crypto/service.mjs';
 import '@astronautlabs/jsonpath';
+import '@docknetwork/credential-sdk/utils';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
+import '../util-crypto/configs.mjs';
+import 'assert';
 
 /**
  * Receive a presentation builder and a proof request template
@@ -37,13 +42,13 @@ function blobFromBase64(base64String) {
     const cleanedBase64 = base64String.replace(/^data:application\/octet-stream;base64,/, '');
     return base64url.toBuffer(cleanedBase64);
 }
-function isBase64OrDataUrl(str) {
-    return (isBase64(str) ||
+async function isBase64OrDataUrl(str) {
+    return ((await utilCryptoService.isBase64(str)) ||
         str.indexOf('data:application/octet-stream') > -1);
 }
 async function fetchProvingKey(proofRequest) {
     let blob;
-    if (isBase64OrDataUrl(proofRequest.boundCheckSnarkKey)) {
+    if (await isBase64OrDataUrl(proofRequest.boundCheckSnarkKey)) {
         console.log('Is base64');
         blob = blobFromBase64(proofRequest.boundCheckSnarkKey);
     }

package/lib/services/credential/index.js

@@ -9,18 +9,9 @@ require('@docknetwork/crypto-wasm-ts');
 require('@sphereon/oid4vci-client');
 require('@sphereon/oid4vci-common');
 require('@docknetwork/universal-wallet/methods/keypairs');
+require('@docknetwork/credential-sdk/utils');
 require('@docknetwork/credential-sdk/vc');
 require('@sphereon/pex');
-require('./utils.js');
-require('base58-universal');
-require('@docknetwork/credential-sdk/vc/crypto');
-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('../blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -32,7 +23,8 @@ require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
 require('../util-crypto/service.js');
-require('@polkadot/util');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
 require('../util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
 require('./bound-check.js');
@@ -44,9 +36,15 @@ require('./bbs-revocation.js');
 require('../dids/service.js');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
-require('../../core/polkadot-utils.js');
 require('@docknetwork/credential-sdk/keypairs');
-require('@polkadot/keyring/pair/decode');
+require('./utils.js');
+require('base58-universal');
+require('@docknetwork/credential-sdk/vc/crypto');
+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');
+require('../dids/keypair-utils.js');
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

package/lib/services/credential/index.mjs

@@ -5,18 +5,9 @@ import '@docknetwork/crypto-wasm-ts';
 import '@sphereon/oid4vci-client';
 import '@sphereon/oid4vci-common';
 import '@docknetwork/universal-wallet/methods/keypairs';
+import '@docknetwork/credential-sdk/utils';
 import '@docknetwork/credential-sdk/vc';
 import '@sphereon/pex';
-import './utils.mjs';
-import 'base58-universal';
-import '@docknetwork/credential-sdk/vc/crypto';
-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 '../blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -28,7 +19,8 @@ import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
 import '../util-crypto/service.mjs';
-import '@polkadot/util';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
 import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
 import './bound-check.mjs';
@@ -40,9 +32,15 @@ import './bbs-revocation.mjs';
 import '../dids/service.mjs';
 import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
-import '../../core/polkadot-utils.mjs';
 import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
+import './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 '../dids/keypair-utils.mjs';
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

package/lib/services/credential/service.js

@@ -7,24 +7,15 @@ var cryptoWasmTs = require('@docknetwork/crypto-wasm-ts');
 var oid4vciClient = require('@sphereon/oid4vci-client');
 var oid4vciCommon = require('@sphereon/oid4vci-common');
 var keypairs = require('@docknetwork/universal-wallet/methods/keypairs');
+var utils = require('@docknetwork/credential-sdk/utils');
 var vc = require('@docknetwork/credential-sdk/vc');
 var pex$1 = require('@sphereon/pex');
-var services_credential_utils = require('./utils.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/credential-sdk/vc/crypto');
-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('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
 require('@docknetwork/cheqd-blockchain-modules');
@@ -35,7 +26,8 @@ require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
 require('../util-crypto/service.js');
-require('@polkadot/util');
+require('@scure/bip39');
+require('@scure/bip39/wordlists/english');
 require('../util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
 require('@docknetwork/crypto-wasm-ts/lib/legosnark');
@@ -43,9 +35,15 @@ require('base64url');
 require('@astronautlabs/jsonpath');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
-require('../../core/polkadot-utils.js');
 require('@docknetwork/credential-sdk/keypairs');
-require('@polkadot/keyring/pair/decode');
+require('./utils.js');
+require('base58-universal');
+require('@docknetwork/credential-sdk/vc/crypto');
+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');
+require('../dids/keypair-utils.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -122,11 +120,13 @@ class CredentialService {
         if (!shouldSkipSigning) {
             vp.setHolder(keyDoc.controller);
         }
-        keyDoc.keypair = services_credential_utils.keyDocToKeypair(keyDoc, services_blockchain_service.blockchainService.dock);
+        const keyPair = keypairs.getKeypairFromDoc(keyDoc);
+        keyPair.signer = keyPair.signer();
+        const suite = await vc.getSuiteFromKeyDoc(keyPair);
         if (shouldSkipSigning) {
             return vp.toJSON();
         }
-        return vp.sign(keyDoc, challenge, domain, services_blockchain_service.blockchainService.resolver);
+        return vp.sign(suite, challenge, domain, services_blockchain_service.blockchainService.resolver);
     }
     async verifyPresentation({ presentation, options }) {
         return vc.verifyPresentation(presentation, options);
@@ -288,15 +288,15 @@ class CredentialService {
         const removals = [];
         if (updates.length && updates[0].additions !== null) {
             for (const a of updates[0].additions) {
-                additions.push(hexToU8a(a));
+                additions.push(utils.hexToU8a(a));
             }
         }
         if (updates.length && updates[0].removals !== null) {
             for (const a of updates[0].removals) {
-                removals.push(hexToU8a(a));
+                removals.push(utils.hexToU8a(a));
             }
         }
-        const queriedWitnessInfo = new cryptoWasmTs.WitnessUpdatePublicInfo(hexToU8a(updates[0].witnessUpdateInfo));
+        const queriedWitnessInfo = new cryptoWasmTs.WitnessUpdatePublicInfo(utils.hexToU8a(updates[0].witnessUpdateInfo));
         const witness = cryptoWasmTs.MembershipWitness.fromJSON(membershipWitnessJSON);
         witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
         return witness.toJSON();

package/lib/services/credential/service.mjs

@@ -3,24 +3,15 @@ import { Accumulator, WitnessUpdatePublicInfo, MembershipWitness, VB_ACCUMULATOR
 import { OpenID4VCIClientV1_0_13 } from '@sphereon/oid4vci-client';
 import { Alg } from '@sphereon/oid4vci-common';
 import { getKeypairFromDoc } from '@docknetwork/universal-wallet/methods/keypairs';
+import { hexToU8a } from '@docknetwork/credential-sdk/utils';
 import { VerifiableCredential, getSuiteFromKeyDoc, VerifiablePresentation, verifyPresentation, verifyCredential, Presentation } from '@docknetwork/credential-sdk/vc';
 import { PEX } from '@sphereon/pex';
-import { keyDocToKeypair } from './utils.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/credential-sdk/vc/crypto';
-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 '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
 import '@docknetwork/cheqd-blockchain-modules';
@@ -31,7 +22,8 @@ import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
 import '../util-crypto/service.mjs';
-import '@polkadot/util';
+import '@scure/bip39';
+import '@scure/bip39/wordlists/english';
 import '../util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
@@ -39,9 +31,15 @@ import 'base64url';
 import '@astronautlabs/jsonpath';
 import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
-import '../../core/polkadot-utils.mjs';
 import '@docknetwork/credential-sdk/keypairs';
-import '@polkadot/keyring/pair/decode';
+import './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 '../dids/keypair-utils.mjs';
 
 // @ts-nocheck
 const pex = new PEX();
@@ -114,11 +112,13 @@ class CredentialService {
         if (!shouldSkipSigning) {
             vp.setHolder(keyDoc.controller);
         }
-        keyDoc.keypair = keyDocToKeypair(keyDoc, blockchainService.dock);
+        const keyPair = getKeypairFromDoc(keyDoc);
+        keyPair.signer = keyPair.signer();
+        const suite = await getSuiteFromKeyDoc(keyPair);
         if (shouldSkipSigning) {
             return vp.toJSON();
         }
-        return vp.sign(keyDoc, challenge, domain, blockchainService.resolver);
+        return vp.sign(suite, challenge, domain, blockchainService.resolver);
     }
     async verifyPresentation({ presentation, options }) {
         return verifyPresentation(presentation, options);

package/lib/services/credential/utils.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var bs58 = require('base58-universal');
 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');
+var utils = require('@docknetwork/credential-sdk/utils');
+var x25519KeyAgreementKey2020 = require('@digitalbazaar/x25519-key-agreement-key-2020');
+var x25519KeyAgreementKey2019 = require('@digitalbazaar/x25519-key-agreement-key-2019');
+var ed25519VerificationKey2018 = require('@digitalbazaar/ed25519-verification-key-2018');
+var ed25519VerificationKey2020 = require('@digitalbazaar/ed25519-verification-key-2020');
+var keypairs = require('@docknetwork/credential-sdk/keypairs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -32,13 +32,16 @@ function _interopNamespace(e) {
 }
 
 var bs58__namespace = /*#__PURE__*/_interopNamespace(bs58);
+var x25519KeyAgreementKey2020__default = /*#__PURE__*/_interopDefaultLegacy(x25519KeyAgreementKey2020);
+var x25519KeyAgreementKey2019__default = /*#__PURE__*/_interopDefaultLegacy(x25519KeyAgreementKey2019);
+var ed25519VerificationKey2018__default = /*#__PURE__*/_interopDefaultLegacy(ed25519VerificationKey2018);
+var ed25519VerificationKey2020__default = /*#__PURE__*/_interopDefaultLegacy(ed25519VerificationKey2020);
+
+async function keyDocToKeypair(keyDoc) {
+  if (keyDoc.keypair) {
+    return keyDoc;
+  }
 
-const docToKeyMap = {
-  Sr25519VerificationKey2020: 'sr25519',
-  Ed25519VerificationKey2018: 'ed25519',
-};
-function keyDocToKeypair(keyDoc, dock) {
-  // For now we expect multibase to just be b58, this needs fixing later if/when we support more keys
   const {
     type,
     privateKeyBase58,
@@ -46,27 +49,61 @@ function keyDocToKeypair(keyDoc, dock) {
     privateKeyMultibase,
     publicKeyMultibase,
   } = keyDoc;
-  const privateKeyEncoded = privateKeyBase58 || privateKeyMultibase.substr(1);
+
+  const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
+  const privateKeyEncoded =
+    privateKeyBase58 || (privateKeyMultibase && privateKeyMultibase.substr(1));
+  if (!privateKeyEncoded) {
+    throw new Error(
+      `No private key in document found, this should not happen. Got: ${JSON.stringify(
+        keyDoc,
+        null,
+        2,
+      )}`,
+    );
+  }
+
   const privateKeyBytes = bs58__namespace.decode(privateKeyEncoded);
+  const publicKeyBytes = bs58__namespace.decode(publicKeyEncoded);
 
   if (type === 'Bls12381G2VerificationKeyDock2022') {
     return new crypto.Bls12381G2KeyPairDock2022(keyDoc);
+  } else if (type === 'Bls12381BBSVerificationKeyDock2023') {
+    return new crypto.Bls12381BBSKeyPairDock2023(keyDoc);
+  } else if (type === 'Bls12381BBDT16VerificationKeyDock2024') {
+    return new crypto.Bls12381BBDT16KeyPairDock2024(keyDoc);
+  } else if (
+    type === 'Ed25519VerificationKey2020' ||
+    type === 'Ed25519VerificationKey2018'
+  ) {
+    const key = new keypairs.Ed25519Keypair(utils.randomAsHex(32));
+    key.keyPair.publicKey = publicKeyBytes;
+    key.keyPair.secretKey = privateKeyBytes;
+    return key;
   } else {
-    const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
-    const keyType = docToKeyMap[type];
-    if (!keyType) {
-      throw new Error(`Unsupported key type: ${type}`);
-    }
+    throw new Error(`Unsupported key type: ${type}`);
+  }
+}
 
-    return services_keyring_service.getKeyring().createFromPair(
-      {
-        publicKey: bs58__namespace.decode(publicKeyEncoded),
-        secretKey: privateKeyBytes,
-      },
-      {},
-      keyType,
-    );
+const keyConstructors = {
+  Ed25519VerificationKey2018: keypairOptions =>
+    new ed25519VerificationKey2018__default["default"].Ed25519VerificationKey2018(keypairOptions),
+  Ed25519VerificationKey2020: keypairOptions =>
+    new ed25519VerificationKey2020__default["default"].Ed25519VerificationKey2020(keypairOptions),
+  X25519KeyAgreementKey2019: keypairOptions =>
+    new x25519KeyAgreementKey2019__default["default"].X25519KeyAgreementKey2019(keypairOptions),
+  X25519KeyAgreementKey2020: keypairOptions =>
+    new x25519KeyAgreementKey2020__default["default"].X25519KeyAgreementKey2020(keypairOptions),
+};
+
+function getKeypairFromDoc(keypairOptions) {
+  const {type} = keypairOptions;
+  const keyConstructor = keyConstructors[type];
+  if (!keyConstructor) {
+    throw new Error(`Unrecognized keypair type to construct: ${type}`);
   }
+  return keyConstructor(keypairOptions);
 }
 
+exports.getKeypairFromDoc = getKeypairFromDoc;
 exports.keyDocToKeypair = keyDocToKeypair;

package/lib/services/credential/utils.mjs

@@ -1,20 +1,17 @@
 import * as bs58 from 'base58-universal';
-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';
-
-const docToKeyMap = {
-  Sr25519VerificationKey2020: 'sr25519',
-  Ed25519VerificationKey2018: 'ed25519',
-};
-function keyDocToKeypair(keyDoc, dock) {
-  // For now we expect multibase to just be b58, this needs fixing later if/when we support more keys
+import { Bls12381G2KeyPairDock2022, Bls12381BBSKeyPairDock2023, Bls12381BBDT16KeyPairDock2024 } from '@docknetwork/credential-sdk/vc/crypto';
+import { randomAsHex } from '@docknetwork/credential-sdk/utils';
+import x25519KeyAgreementKey2020 from '@digitalbazaar/x25519-key-agreement-key-2020';
+import x25519KeyAgreementKey2019 from '@digitalbazaar/x25519-key-agreement-key-2019';
+import ed25519VerificationKey2018 from '@digitalbazaar/ed25519-verification-key-2018';
+import ed25519VerificationKey2020 from '@digitalbazaar/ed25519-verification-key-2020';
+import { Ed25519Keypair } from '@docknetwork/credential-sdk/keypairs';
+
+async function keyDocToKeypair(keyDoc) {
+  if (keyDoc.keypair) {
+    return keyDoc;
+  }
+
   const {
     type,
     privateKeyBase58,
@@ -22,27 +19,60 @@ function keyDocToKeypair(keyDoc, dock) {
     privateKeyMultibase,
     publicKeyMultibase,
   } = keyDoc;
-  const privateKeyEncoded = privateKeyBase58 || privateKeyMultibase.substr(1);
+
+  const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
+  const privateKeyEncoded =
+    privateKeyBase58 || (privateKeyMultibase && privateKeyMultibase.substr(1));
+  if (!privateKeyEncoded) {
+    throw new Error(
+      `No private key in document found, this should not happen. Got: ${JSON.stringify(
+        keyDoc,
+        null,
+        2,
+      )}`,
+    );
+  }
+
   const privateKeyBytes = bs58.decode(privateKeyEncoded);
+  const publicKeyBytes = bs58.decode(publicKeyEncoded);
 
   if (type === 'Bls12381G2VerificationKeyDock2022') {
     return new Bls12381G2KeyPairDock2022(keyDoc);
+  } else if (type === 'Bls12381BBSVerificationKeyDock2023') {
+    return new Bls12381BBSKeyPairDock2023(keyDoc);
+  } else if (type === 'Bls12381BBDT16VerificationKeyDock2024') {
+    return new Bls12381BBDT16KeyPairDock2024(keyDoc);
+  } else if (
+    type === 'Ed25519VerificationKey2020' ||
+    type === 'Ed25519VerificationKey2018'
+  ) {
+    const key = new Ed25519Keypair(randomAsHex(32));
+    key.keyPair.publicKey = publicKeyBytes;
+    key.keyPair.secretKey = privateKeyBytes;
+    return key;
   } else {
-    const publicKeyEncoded = publicKeyBase58 || publicKeyMultibase.substr(1);
-    const keyType = docToKeyMap[type];
-    if (!keyType) {
-      throw new Error(`Unsupported key type: ${type}`);
-    }
-
-    return getKeyring().createFromPair(
-      {
-        publicKey: bs58.decode(publicKeyEncoded),
-        secretKey: privateKeyBytes,
-      },
-      {},
-      keyType,
-    );
+    throw new Error(`Unsupported key type: ${type}`);
+  }
+}
+
+const keyConstructors = {
+  Ed25519VerificationKey2018: keypairOptions =>
+    new ed25519VerificationKey2018.Ed25519VerificationKey2018(keypairOptions),
+  Ed25519VerificationKey2020: keypairOptions =>
+    new ed25519VerificationKey2020.Ed25519VerificationKey2020(keypairOptions),
+  X25519KeyAgreementKey2019: keypairOptions =>
+    new x25519KeyAgreementKey2019.X25519KeyAgreementKey2019(keypairOptions),
+  X25519KeyAgreementKey2020: keypairOptions =>
+    new x25519KeyAgreementKey2020.X25519KeyAgreementKey2020(keypairOptions),
+};
+
+function getKeypairFromDoc(keypairOptions) {
+  const {type} = keypairOptions;
+  const keyConstructor = keyConstructors[type];
+  if (!keyConstructor) {
+    throw new Error(`Unrecognized keypair type to construct: ${type}`);
   }
+  return keyConstructor(keypairOptions);
 }
 
-export { keyDocToKeypair };
+export { getKeypairFromDoc, keyDocToKeypair };

package/lib/services/dids/index.js

@@ -6,16 +6,6 @@ var services_dids_service = require('./service.js');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('./config.js');
 require('assert');
-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');
@@ -26,15 +16,22 @@ 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('@docknetwork/universal-wallet/methods/keypairs');
 require('base64url');
 require('../credential/utils.js');
+require('base58-universal');
 require('@docknetwork/credential-sdk/vc/crypto');
+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');
+require('./keypair-utils.js');
 
 const didServiceRPC = services_dids_service.didService;