@docknetwork/wallet-sdk-relay-service 0.4.23 → 1.4.0

package/lib/did/dids.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../_rollupPluginBabelHelpers-4923c894.js');
 var did = require('@docknetwork/sdk/utils/did');
-var service = require('@docknetwork/wallet-sdk-wasm/src/services/dock/service');
+var service = require('@docknetwork/wallet-sdk-wasm/lib/services/dock/service');
 
 function resolveDID(_x) {
   return _resolveDID.apply(this, arguments);

package/lib/did/dids.mjs

@@ -1,6 +1,6 @@
 import { _ as _asyncToGenerator, a as _regeneratorRuntime } from '../_rollupPluginBabelHelpers-78739aa5.js';
 import { hexDIDToQualified } from '@docknetwork/sdk/utils/did';
-import { dockService } from '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
+import { dockService } from '@docknetwork/wallet-sdk-wasm/lib/services/dock/service';
 
 function resolveDID(_x) {
   return _resolveDID.apply(this, arguments);

package/lib/didcomm.js

@@ -8,13 +8,33 @@ var ed25519VerificationKey2020 = require('@digitalbazaar/ed25519-verification-ke
 var minimalCipher = require('@docknetwork/minimal-cipher');
 var uuid = require('uuid');
 var base64url = require('base64url');
+var bs58 = require('base58-universal');
 var did_dids = require('./did/dids.js');
 require('@docknetwork/sdk/utils/did');
-require('@docknetwork/wallet-sdk-wasm/src/services/dock/service');
+require('@docknetwork/wallet-sdk-wasm/lib/services/dock/service');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+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 base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
+var bs58__namespace = /*#__PURE__*/_interopNamespace(bs58);
 
 var DIDCOMM_TYPE_BASIC = 'https://didcomm.org/basicmessage/1.0/message';
 var DIDCOMM_TYPE_ISSUE_DIRECT = 'https://didcomm.org/issue-credential/2.0/issue-credential';
@@ -330,6 +350,9 @@ function isValidKeyAgreementDoc(keyDoc) {
 function isDerivableKey(keyDoc) {
   return keyDoc.type === 'Ed25519VerificationKey2018' || keyDoc.type === 'Ed25519VerificationKey2019' || keyDoc.type === 'Ed25519VerificationKey2020';
 }
+function getDIDKeydocsFromDIDDocument(didDocument) {
+  return [].concat(_rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.verificationMethod)), _rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.keyAgreement)), _rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.publicKey)));
+}
 function getAgreementKeydocFromDID(_x17) {
   return _getAgreementKeydocFromDID.apply(this, arguments);
 }
@@ -345,46 +368,52 @@ function _getAgreementKeydocFromDID() {
           }
           return _context9.abrupt("return", undefined);
         case 2:
+          if (!did.startsWith('did:polygon')) {
+            _context9.next = 4;
+            break;
+          }
+          throw new Error('PolygonID DIDs cannot be used for DIDComm purposes');
+        case 4:
           // Resolve actual DID document and get key agreement keys
           isDIDUrl = did.indexOf('#') !== -1;
-          _context9.next = 5;
+          _context9.next = 7;
           return did_dids.resolveDID(did);
-        case 5:
+        case 7:
           didDocument = _context9.sent;
           keyAgreements = didDocument.keyAgreement ? Array.isArray(didDocument.keyAgreement) ? didDocument.keyAgreement : [didDocument.keyAgreement] : []; // User supplied full URL, use that if possible
           // if not it may still require derivation to be valid (such as dock DIDs)
           if (!isDIDUrl) {
-            _context9.next = 11;
+            _context9.next = 13;
             break;
           }
           foundDoc = keyAgreements.filter(function (keyDoc) {
             return keyDoc.id === did && isValidKeyAgreementDoc(keyDoc);
           })[0];
           if (!foundDoc) {
-            _context9.next = 11;
+            _context9.next = 13;
             break;
           }
           return _context9.abrupt("return", foundDoc);
-        case 11:
+        case 13:
           // User supplied DID, find first supported keyagreement document
           firstKeyAgreement = keyAgreements.filter(isValidKeyAgreementDoc)[0];
           if (!firstKeyAgreement) {
-            _context9.next = 14;
+            _context9.next = 16;
             break;
           }
           return _context9.abrupt("return", firstKeyAgreement);
-        case 14:
+        case 16:
           // No valid key agreement found on resolution, lets derive one from a ED25519 key if we can
-          publicKeys = didDocument.publicKey ? Array.isArray(didDocument.publicKey) ? didDocument.publicKey : [didDocument.publicKey] : []; // See if DID document has any derivable keys
+          publicKeys = getDIDKeydocsFromDIDDocument(didDocument); // See if DID document has any derivable keys
           derivableKey = publicKeys.filter(isDerivableKey)[0];
           if (!derivableKey) {
-            _context9.next = 18;
+            _context9.next = 20;
             break;
           }
           return _context9.abrupt("return", getDerivedAgreementKey(derivableKey));
-        case 18:
+        case 20:
           throw new Error("Unable to find or derive X25519 key agreement for DID: ".concat(did));
-        case 19:
+        case 21:
         case "end":
           return _context9.stop();
       }
@@ -392,12 +421,21 @@ function _getAgreementKeydocFromDID() {
   }));
   return _getAgreementKeydocFromDID.apply(this, arguments);
 }
+var MULTIBASE_BASE58BTC_HEADER = 'z';
+var MULTICODEC_ED25519_PRIV_HEADER = new Uint8Array([0x80, 0x26]);
+var MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+function encodeMbKey(header, key) {
+  var mbKey = new Uint8Array(header.length + key.length);
+  mbKey.set(header);
+  mbKey.set(key, header.length);
+  return MULTIBASE_BASE58BTC_HEADER + bs58__namespace.encode(mbKey);
+}
 function getDerivedAgreementKey(_x18) {
   return _getDerivedAgreementKey.apply(this, arguments);
 }
 function _getDerivedAgreementKey() {
   _getDerivedAgreementKey = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee10(derivableKey) {
-    var ed2020VerificationKey, derivedKeyAgreement;
+    var publicKeyMultibase, privateKeyMultibase, derivedKeyAgreement;
     return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee10$(_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
@@ -407,23 +445,17 @@ function _getDerivedAgreementKey() {
           }
           throw new Error("Cannot derive X25519 KAK from type: ".concat(derivableKey.type));
         case 2:
-          if (!derivableKey.publicKeyMultibase) {
-            derivableKey.publicKeyMultibase = derivableKey.publicKeyBase58;
-          }
-
-          // Convert derivable key into latest 2020 format
-          _context10.next = 5;
-          return ed25519VerificationKey2020.Ed25519VerificationKey2020.from(_rollupPluginBabelHelpers._objectSpread2({
-            keyPair: derivableKey
-          }, derivableKey));
-        case 5:
-          ed2020VerificationKey = _context10.sent;
-          // Convert ed25519 2020 verification key into a key agreement key
-          derivedKeyAgreement = x25519KeyAgreementKey2020.X25519KeyAgreementKey2020.fromEd25519VerificationKey2020(_rollupPluginBabelHelpers._objectSpread2({
-            keyPair: ed2020VerificationKey
-          }, ed2020VerificationKey));
+          publicKeyMultibase = derivableKey.publicKeyBase58 ? encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, bs58__namespace.decode(derivableKey.publicKeyBase58)) : derivableKey.publicKeyMultibase;
+          privateKeyMultibase = (derivableKey.privateKeyBase58 ? encodeMbKey(MULTICODEC_ED25519_PRIV_HEADER, bs58__namespace.decode(derivableKey.privateKeyBase58)) : undefined) || derivableKey.privateKeyMultibase; // Convert ed25519 2020 verification key into a key agreement key
+          derivedKeyAgreement = x25519KeyAgreementKey2020.X25519KeyAgreementKey2020.fromEd25519VerificationKey2020({
+            keyPair: {
+              publicKeyMultibase: publicKeyMultibase,
+              privateKeyMultibase: privateKeyMultibase,
+              controller: derivableKey.controller
+            }
+          });
           return _context10.abrupt("return", derivedKeyAgreement);
-        case 8:
+        case 6:
         case "end":
           return _context10.stop();
       }
@@ -583,6 +615,9 @@ function _didcommCreateEncrypted() {
 exports.DIDCOMM_TYPE_BASIC = DIDCOMM_TYPE_BASIC;
 exports.DIDCOMM_TYPE_ISSUE_DIRECT = DIDCOMM_TYPE_ISSUE_DIRECT;
 exports.DIDCOMM_TYPE_REQUEST_ISSUE_WITH_DATA = DIDCOMM_TYPE_REQUEST_ISSUE_WITH_DATA;
+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.defaultKaKResolver = defaultKaKResolver;
 exports.defaultVerificationKeyResolver = defaultVerificationKeyResolver;
 exports.didcommCreateEncrypted = didcommCreateEncrypted;
@@ -591,6 +626,7 @@ exports.didcommDecodeSignedJWT = didcommDecodeSignedJWT;
 exports.didcommDecrypt = didcommDecrypt;
 exports.didcommEncrypt = didcommEncrypt;
 exports.didcommSendMessage = didcommSendMessage;
+exports.encodeMbKey = encodeMbKey;
 exports.formatPayloadToDIDComm = formatPayloadToDIDComm;
 exports.getAgreementKeydocFromDID = getAgreementKeydocFromDID;
 exports.getDerivedAgreementKey = getDerivedAgreementKey;

package/lib/didcomm.mjs

@@ -4,9 +4,10 @@ import { Ed25519VerificationKey2020 } from '@digitalbazaar/ed25519-verification-
 import { Cipher } from '@docknetwork/minimal-cipher';
 import { v1 } from 'uuid';
 import base64url from 'base64url';
+import * as bs58 from 'base58-universal';
 import { resolveDID } from './did/dids.mjs';
 import '@docknetwork/sdk/utils/did';
-import '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
+import '@docknetwork/wallet-sdk-wasm/lib/services/dock/service';
 
 var DIDCOMM_TYPE_BASIC = 'https://didcomm.org/basicmessage/1.0/message';
 var DIDCOMM_TYPE_ISSUE_DIRECT = 'https://didcomm.org/issue-credential/2.0/issue-credential';
@@ -322,6 +323,9 @@ function isValidKeyAgreementDoc(keyDoc) {
 function isDerivableKey(keyDoc) {
   return keyDoc.type === 'Ed25519VerificationKey2018' || keyDoc.type === 'Ed25519VerificationKey2019' || keyDoc.type === 'Ed25519VerificationKey2020';
 }
+function getDIDKeydocsFromDIDDocument(didDocument) {
+  return [].concat(_toConsumableArray(potentialToArray(didDocument.verificationMethod)), _toConsumableArray(potentialToArray(didDocument.keyAgreement)), _toConsumableArray(potentialToArray(didDocument.publicKey)));
+}
 function getAgreementKeydocFromDID(_x17) {
   return _getAgreementKeydocFromDID.apply(this, arguments);
 }
@@ -337,46 +341,52 @@ function _getAgreementKeydocFromDID() {
           }
           return _context9.abrupt("return", undefined);
         case 2:
+          if (!did.startsWith('did:polygon')) {
+            _context9.next = 4;
+            break;
+          }
+          throw new Error('PolygonID DIDs cannot be used for DIDComm purposes');
+        case 4:
           // Resolve actual DID document and get key agreement keys
           isDIDUrl = did.indexOf('#') !== -1;
-          _context9.next = 5;
+          _context9.next = 7;
           return resolveDID(did);
-        case 5:
+        case 7:
           didDocument = _context9.sent;
           keyAgreements = didDocument.keyAgreement ? Array.isArray(didDocument.keyAgreement) ? didDocument.keyAgreement : [didDocument.keyAgreement] : []; // User supplied full URL, use that if possible
           // if not it may still require derivation to be valid (such as dock DIDs)
           if (!isDIDUrl) {
-            _context9.next = 11;
+            _context9.next = 13;
             break;
           }
           foundDoc = keyAgreements.filter(function (keyDoc) {
             return keyDoc.id === did && isValidKeyAgreementDoc(keyDoc);
           })[0];
           if (!foundDoc) {
-            _context9.next = 11;
+            _context9.next = 13;
             break;
           }
           return _context9.abrupt("return", foundDoc);
-        case 11:
+        case 13:
           // User supplied DID, find first supported keyagreement document
           firstKeyAgreement = keyAgreements.filter(isValidKeyAgreementDoc)[0];
           if (!firstKeyAgreement) {
-            _context9.next = 14;
+            _context9.next = 16;
             break;
           }
           return _context9.abrupt("return", firstKeyAgreement);
-        case 14:
+        case 16:
           // No valid key agreement found on resolution, lets derive one from a ED25519 key if we can
-          publicKeys = didDocument.publicKey ? Array.isArray(didDocument.publicKey) ? didDocument.publicKey : [didDocument.publicKey] : []; // See if DID document has any derivable keys
+          publicKeys = getDIDKeydocsFromDIDDocument(didDocument); // See if DID document has any derivable keys
           derivableKey = publicKeys.filter(isDerivableKey)[0];
           if (!derivableKey) {
-            _context9.next = 18;
+            _context9.next = 20;
             break;
           }
           return _context9.abrupt("return", getDerivedAgreementKey(derivableKey));
-        case 18:
+        case 20:
           throw new Error("Unable to find or derive X25519 key agreement for DID: ".concat(did));
-        case 19:
+        case 21:
         case "end":
           return _context9.stop();
       }
@@ -384,12 +394,21 @@ function _getAgreementKeydocFromDID() {
   }));
   return _getAgreementKeydocFromDID.apply(this, arguments);
 }
+var MULTIBASE_BASE58BTC_HEADER = 'z';
+var MULTICODEC_ED25519_PRIV_HEADER = new Uint8Array([0x80, 0x26]);
+var MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+function encodeMbKey(header, key) {
+  var mbKey = new Uint8Array(header.length + key.length);
+  mbKey.set(header);
+  mbKey.set(key, header.length);
+  return MULTIBASE_BASE58BTC_HEADER + bs58.encode(mbKey);
+}
 function getDerivedAgreementKey(_x18) {
   return _getDerivedAgreementKey.apply(this, arguments);
 }
 function _getDerivedAgreementKey() {
   _getDerivedAgreementKey = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(derivableKey) {
-    var ed2020VerificationKey, derivedKeyAgreement;
+    var publicKeyMultibase, privateKeyMultibase, derivedKeyAgreement;
     return _regeneratorRuntime().wrap(function _callee10$(_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
@@ -399,23 +418,17 @@ function _getDerivedAgreementKey() {
           }
           throw new Error("Cannot derive X25519 KAK from type: ".concat(derivableKey.type));
         case 2:
-          if (!derivableKey.publicKeyMultibase) {
-            derivableKey.publicKeyMultibase = derivableKey.publicKeyBase58;
-          }
-
-          // Convert derivable key into latest 2020 format
-          _context10.next = 5;
-          return Ed25519VerificationKey2020.from(_objectSpread2({
-            keyPair: derivableKey
-          }, derivableKey));
-        case 5:
-          ed2020VerificationKey = _context10.sent;
-          // Convert ed25519 2020 verification key into a key agreement key
-          derivedKeyAgreement = X25519KeyAgreementKey2020.fromEd25519VerificationKey2020(_objectSpread2({
-            keyPair: ed2020VerificationKey
-          }, ed2020VerificationKey));
+          publicKeyMultibase = derivableKey.publicKeyBase58 ? encodeMbKey(MULTICODEC_ED25519_PUB_HEADER, bs58.decode(derivableKey.publicKeyBase58)) : derivableKey.publicKeyMultibase;
+          privateKeyMultibase = (derivableKey.privateKeyBase58 ? encodeMbKey(MULTICODEC_ED25519_PRIV_HEADER, bs58.decode(derivableKey.privateKeyBase58)) : undefined) || derivableKey.privateKeyMultibase; // Convert ed25519 2020 verification key into a key agreement key
+          derivedKeyAgreement = X25519KeyAgreementKey2020.fromEd25519VerificationKey2020({
+            keyPair: {
+              publicKeyMultibase: publicKeyMultibase,
+              privateKeyMultibase: privateKeyMultibase,
+              controller: derivableKey.controller
+            }
+          });
           return _context10.abrupt("return", derivedKeyAgreement);
-        case 8:
+        case 6:
         case "end":
           return _context10.stop();
       }
@@ -572,4 +585,4 @@ function _didcommCreateEncrypted() {
   return _didcommCreateEncrypted.apply(this, arguments);
 }
 
-export { DIDCOMM_TYPE_BASIC, DIDCOMM_TYPE_ISSUE_DIRECT, DIDCOMM_TYPE_REQUEST_ISSUE_WITH_DATA, defaultKaKResolver, defaultVerificationKeyResolver, didcommCreateEncrypted, didcommCreateSignedJWT, didcommDecodeSignedJWT, didcommDecrypt, didcommEncrypt, didcommSendMessage, formatPayloadToDIDComm, getAgreementKeydocFromDID, getDerivedAgreementKey, getJWERecipientFromDocument, getKaKInstanceFromDocument, getKeydocFromDID, isDerivableKey, isValidDID, isValidKeyAgreementDoc, userFriendlyTypeMap };
+export { DIDCOMM_TYPE_BASIC, DIDCOMM_TYPE_ISSUE_DIRECT, DIDCOMM_TYPE_REQUEST_ISSUE_WITH_DATA, MULTIBASE_BASE58BTC_HEADER, MULTICODEC_ED25519_PRIV_HEADER, MULTICODEC_ED25519_PUB_HEADER, defaultKaKResolver, defaultVerificationKeyResolver, didcommCreateEncrypted, didcommCreateSignedJWT, didcommDecodeSignedJWT, didcommDecrypt, didcommEncrypt, didcommSendMessage, encodeMbKey, formatPayloadToDIDComm, getAgreementKeydocFromDID, getDerivedAgreementKey, getJWERecipientFromDocument, getKaKInstanceFromDocument, getKeydocFromDID, isDerivableKey, isValidDID, isValidKeyAgreementDoc, userFriendlyTypeMap };

package/lib/index.js

@@ -6,16 +6,17 @@ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4923c894.js
 var utilCrypto = require('@polkadot/util-crypto');
 var assert = require('assert');
 var axios = require('axios');
-var logger = require('@docknetwork/wallet-sdk-wasm/src/core/logger');
+var logger = require('@docknetwork/wallet-sdk-wasm/lib/core/logger');
 var didcomm$1 = require('./didcomm.js');
 var payloads = require('./payloads.js');
 var jwtDecode = require('jwt-decode');
-var service = require('@docknetwork/wallet-sdk-wasm/src/services/dock/service');
+var service = require('@docknetwork/wallet-sdk-wasm/lib/services/dock/service');
 require('@digitalbazaar/x25519-key-agreement-key-2020');
 require('@digitalbazaar/ed25519-verification-key-2020');
 require('@docknetwork/minimal-cipher');
 require('uuid');
 require('base64url');
+require('base58-universal');
 require('./did/dids.js');
 require('@docknetwork/sdk/utils/did');
 require('@docknetwork/sdk/verifiable-credential');

package/lib/index.mjs

@@ -2,16 +2,17 @@ import { _ as _asyncToGenerator, a as _regeneratorRuntime, d as _createForOfIter
 import { isBase64 } from '@polkadot/util-crypto';
 import assert from 'assert';
 import axios from 'axios';
-import { Logger } from '@docknetwork/wallet-sdk-wasm/src/core/logger';
+import { Logger } from '@docknetwork/wallet-sdk-wasm/lib/core/logger';
 import { didcommCreateEncrypted, didcommDecrypt, getDerivedAgreementKey, didcommCreateSignedJWT, DIDCOMM_TYPE_ISSUE_DIRECT } from './didcomm.mjs';
 import { toBase64, generateSignedPayload, generateSignedPayloadFromList, fromBase64 } from './payloads.mjs';
 import jwtDecode from 'jwt-decode';
-import { dockService } from '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
+import { dockService } from '@docknetwork/wallet-sdk-wasm/lib/services/dock/service';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
 import '@digitalbazaar/ed25519-verification-key-2020';
 import '@docknetwork/minimal-cipher';
 import 'uuid';
 import 'base64url';
+import 'base58-universal';
 import './did/dids.mjs';
 import '@docknetwork/sdk/utils/did';
 import '@docknetwork/sdk/verifiable-credential';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-relay-service",
-    "version": "0.4.23",
+    "version": "1.4.0",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",

package/src/didcomm.js

@@ -4,6 +4,7 @@ import {Ed25519VerificationKey2020} from '@digitalbazaar/ed25519-verification-ke
 import {Cipher} from '@docknetwork/minimal-cipher';
 import {v1 as uuidv1} from 'uuid';
 import base64url from 'base64url';
+import * as bs58 from 'base58-universal';
 
 import {resolveDID} from './did/dids';
 
@@ -180,15 +181,27 @@ export function isDerivableKey(keyDoc) {
   );
 }
 
+function getDIDKeydocsFromDIDDocument(didDocument) {
+  return [
+    ...potentialToArray(didDocument.verificationMethod),
+    ...potentialToArray(didDocument.keyAgreement),
+    ...potentialToArray(didDocument.publicKey),
+  ];
+}
+
 export async function getAgreementKeydocFromDID(did) {
   if (!did) {
     return undefined;
   }
 
+  // Early out for polygon DIDs as they dont support this
+  if (did.startsWith('did:polygon')) {
+    throw new Error('PolygonID DIDs cannot be used for DIDComm purposes');
+  }
+
   // Resolve actual DID document and get key agreement keys
   const isDIDUrl = did.indexOf('#') !== -1;
   const didDocument = await resolveDID(did);
-
   const keyAgreements = didDocument.keyAgreement
     ? Array.isArray(didDocument.keyAgreement)
       ? didDocument.keyAgreement
@@ -214,11 +227,7 @@ export async function getAgreementKeydocFromDID(did) {
   }
 
   // No valid key agreement found on resolution, lets derive one from a ED25519 key if we can
-  const publicKeys = didDocument.publicKey
-    ? Array.isArray(didDocument.publicKey)
-      ? didDocument.publicKey
-      : [didDocument.publicKey]
-    : [];
+  const publicKeys = getDIDKeydocsFromDIDDocument(didDocument);
 
   // See if DID document has any derivable keys
   const derivableKey = publicKeys.filter(isDerivableKey)[0];
@@ -231,26 +240,43 @@ export async function getAgreementKeydocFromDID(did) {
   );
 }
 
+export const MULTIBASE_BASE58BTC_HEADER = 'z';
+export const MULTICODEC_ED25519_PRIV_HEADER = new Uint8Array([0x80, 0x26]);
+export const MULTICODEC_ED25519_PUB_HEADER = new Uint8Array([0xed, 0x01]);
+export 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);
+}
+
 export async function getDerivedAgreementKey(derivableKey) {
   if (!isDerivableKey(derivableKey)) {
     throw new Error(`Cannot derive X25519 KAK from type: ${derivableKey.type}`);
   }
 
-  if (!derivableKey.publicKeyMultibase) {
-    derivableKey.publicKeyMultibase = derivableKey.publicKeyBase58;
-  }
-
-  // Convert derivable key into latest 2020 format
-  const ed2020VerificationKey = await Ed25519VerificationKey2020.from({
-    keyPair: derivableKey,
-    ...derivableKey,
-  });
+  const publicKeyMultibase = derivableKey.publicKeyBase58
+    ? encodeMbKey(
+        MULTICODEC_ED25519_PUB_HEADER,
+        bs58.decode(derivableKey.publicKeyBase58),
+      )
+    : derivableKey.publicKeyMultibase;
+  const privateKeyMultibase =
+    (derivableKey.privateKeyBase58
+      ? encodeMbKey(
+          MULTICODEC_ED25519_PRIV_HEADER,
+          bs58.decode(derivableKey.privateKeyBase58),
+        )
+      : undefined) || derivableKey.privateKeyMultibase;
 
   // Convert ed25519 2020 verification key into a key agreement key
   const derivedKeyAgreement =
     X25519KeyAgreementKey2020.fromEd25519VerificationKey2020({
-      keyPair: ed2020VerificationKey,
-      ...ed2020VerificationKey,
+      keyPair: {
+        publicKeyMultibase,
+        privateKeyMultibase,
+        controller: derivableKey.controller,
+      },
     });
   return derivedKeyAgreement;
 }

package/tests/relay-service.e2e.test.js

@@ -1,12 +1,12 @@
+import {dockService} from '@docknetwork/wallet-sdk-wasm/src/services/dock';
 import {RelayService} from '../lib';
-import {dock} from '../lib/did/did-resolver';
 import {ALICE_KEY_PAIR_DOC, BOB_KEY_PAIR_DOC} from './mock-data';
 
 describe('Relay service', () => {
   const messageContent = `Test message ${Date.now()}`;
 
   beforeAll(async () => {
-    await dock.init({
+    await dockService.init({
       address: 'wss://knox-1.dock.io',
     });
   });

package/lib/did/did-resolver.js

@@ -1,38 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var resolver$1 = require('@docknetwork/sdk/resolver');
-var dock = require('@docknetwork/sdk');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var dock__default = /*#__PURE__*/_interopDefaultLegacy(dock);
-
-// Create a resolver in order to lookup DIDs for verifying
-var universalResolverUrl = 'https://uniresolver.io';
-
-// class WalletSDKResolver extends WildcardMultiResolver {
-//   static PREFIX = WILDCARD;
-//   static METHOD = WILDCARD;
-
-//   async resolve(did) {
-//     const trimmedDID = did.split('#')[0];
-//     const document = await super.resolve(trimmedDID);
-//     return document;
-//   }
-// }
-
-var resolver = new resolver$1.WildcardMultiResolver(
-// {
-//   dock: new DockResolver(dock), // Prebuilt resolver
-//   key: new DIDKeyResolver(), // did:key resolution
-// },
-[new resolver$1.DockResolver(dock__default["default"]), new resolver$1.DIDKeyResolver(), new resolver$1.UniversalResolver(universalResolverUrl)]);
-
-Object.defineProperty(exports, 'dock', {
-  enumerable: true,
-  get: function () { return dock__default["default"]; }
-});
-exports.resolver = resolver;
-exports.universalResolverUrl = universalResolverUrl;

package/lib/did/did-resolver.mjs

@@ -1,26 +0,0 @@
-import { WildcardMultiResolver, DockResolver, DIDKeyResolver, UniversalResolver } from '@docknetwork/sdk/resolver';
-import dock from '@docknetwork/sdk';
-export { default as dock } from '@docknetwork/sdk';
-
-// Create a resolver in order to lookup DIDs for verifying
-var universalResolverUrl = 'https://uniresolver.io';
-
-// class WalletSDKResolver extends WildcardMultiResolver {
-//   static PREFIX = WILDCARD;
-//   static METHOD = WILDCARD;
-
-//   async resolve(did) {
-//     const trimmedDID = did.split('#')[0];
-//     const document = await super.resolve(trimmedDID);
-//     return document;
-//   }
-// }
-
-var resolver = new WildcardMultiResolver(
-// {
-//   dock: new DockResolver(dock), // Prebuilt resolver
-//   key: new DIDKeyResolver(), // did:key resolution
-// },
-[new DockResolver(dock), new DIDKeyResolver(), new UniversalResolver(universalResolverUrl)]);
-
-export { resolver, universalResolverUrl };

package/src/did/did-resolver.js

@@ -1,35 +0,0 @@
-import {
-  DockResolver,
-  DIDKeyResolver,
-  WildcardMultiResolver,
-  UniversalResolver,
-} from '@docknetwork/sdk/resolver';
-import dock from '@docknetwork/sdk';
-
-// Create a resolver in order to lookup DIDs for verifying
-export const universalResolverUrl = 'https://uniresolver.io';
-
-// class WalletSDKResolver extends WildcardMultiResolver {
-//   static PREFIX = WILDCARD;
-//   static METHOD = WILDCARD;
-
-//   async resolve(did) {
-//     const trimmedDID = did.split('#')[0];
-//     const document = await super.resolve(trimmedDID);
-//     return document;
-//   }
-// }
-
-export const resolver = new WildcardMultiResolver(
-  // {
-  //   dock: new DockResolver(dock), // Prebuilt resolver
-  //   key: new DIDKeyResolver(), // did:key resolution
-  // },
-  [
-    new DockResolver(dock),
-    new DIDKeyResolver(),
-    new UniversalResolver(universalResolverUrl),
-  ],
-);
-
-export {dock};