@docknetwork/wallet-sdk-relay-service 1.4.1 → 1.5.0

package/lib/didcomm.js

@@ -9,8 +9,7 @@ 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/wallet-sdk-wasm/lib/services/dock/service');
+var service = require('@docknetwork/wallet-sdk-wasm/lib/services/blockchain/service');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -62,7 +61,7 @@ function _getKeydocFromDID() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return did_dids.resolveDID(didUrl);
+          return service.blockchainService.resolver.resolve(didUrl);
         case 2:
           didDocument = _context.sent;
           possibleKeys = [].concat(_rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.verificationMethod)), _rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.keyAgreement)), _rollupPluginBabelHelpers._toConsumableArray(potentialToArray(didDocument.publicKey)));
@@ -376,7 +375,7 @@ function _getAgreementKeydocFromDID() {
           // Resolve actual DID document and get key agreement keys
           isDIDUrl = did.indexOf('#') !== -1;
           _context9.next = 7;
-          return did_dids.resolveDID(did);
+          return service.blockchainService.resolver.resolve(did);
         case 7:
           didDocument = _context9.sent;
           keyAgreements = didDocument.keyAgreement ? Array.isArray(didDocument.keyAgreement) ? didDocument.keyAgreement : [didDocument.keyAgreement] : []; // User supplied full URL, use that if possible

package/lib/didcomm.mjs

@@ -5,8 +5,7 @@ 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/wallet-sdk-wasm/lib/services/dock/service';
+import { blockchainService } from '@docknetwork/wallet-sdk-wasm/lib/services/blockchain/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';
@@ -35,7 +34,7 @@ function _getKeydocFromDID() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return resolveDID(didUrl);
+          return blockchainService.resolver.resolve(didUrl);
         case 2:
           didDocument = _context.sent;
           possibleKeys = [].concat(_toConsumableArray(potentialToArray(didDocument.verificationMethod)), _toConsumableArray(potentialToArray(didDocument.keyAgreement)), _toConsumableArray(potentialToArray(didDocument.publicKey)));
@@ -349,7 +348,7 @@ function _getAgreementKeydocFromDID() {
           // Resolve actual DID document and get key agreement keys
           isDIDUrl = did.indexOf('#') !== -1;
           _context9.next = 7;
-          return resolveDID(did);
+          return blockchainService.resolver.resolve(did);
         case 7:
           didDocument = _context9.sent;
           keyAgreements = didDocument.keyAgreement ? Array.isArray(didDocument.keyAgreement) ? didDocument.keyAgreement : [didDocument.keyAgreement] : []; // User supplied full URL, use that if possible

package/lib/index.js

@@ -10,16 +10,14 @@ 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/lib/services/dock/service');
+var service = require('@docknetwork/wallet-sdk-wasm/lib/services/blockchain/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/verifiable-credential');
-require('@docknetwork/sdk/utils/vc/helpers');
+require('@docknetwork/credential-sdk/vc');
 require('@docknetwork/universal-wallet/methods/keypairs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,7 +26,7 @@ var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var jwtDecode__default = /*#__PURE__*/_interopDefaultLegacy(jwtDecode);
 
-var serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.dock.io';
+var serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.truvera.io';
 var didcomm = {
   encrypt: didcomm$1.didcommCreateEncrypted,
   decrypt: didcomm$1.didcommDecrypt
@@ -100,7 +98,7 @@ var getMessages = /*#__PURE__*/function () {
           assert__default["default"](Array.isArray(keyPairDocs), 'keyPairDocs must be an array');
           assert__default["default"](!!keyPairDocs.length, 'keyPairDocs must not be empty');
           _context3.next = 6;
-          return service.dockService.waitDockReady();
+          return service.blockchainService.waitBlockchainReady();
         case 6:
           _context3.next = 8;
           return payloads.generateSignedPayloadFromList(keyPairDocs, {

package/lib/index.mjs

@@ -6,19 +6,17 @@ 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/lib/services/dock/service';
+import { blockchainService } from '@docknetwork/wallet-sdk-wasm/lib/services/blockchain/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/verifiable-credential';
-import '@docknetwork/sdk/utils/vc/helpers';
+import '@docknetwork/credential-sdk/vc';
 import '@docknetwork/universal-wallet/methods/keypairs';
 
-var serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.dock.io';
+var serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.truvera.io';
 var didcomm = {
   encrypt: didcommCreateEncrypted,
   decrypt: didcommDecrypt
@@ -90,7 +88,7 @@ var getMessages = /*#__PURE__*/function () {
           assert(Array.isArray(keyPairDocs), 'keyPairDocs must be an array');
           assert(!!keyPairDocs.length, 'keyPairDocs must not be empty');
           _context3.next = 6;
-          return dockService.waitDockReady();
+          return blockchainService.waitBlockchainReady();
         case 6:
           _context3.next = 8;
           return generateSignedPayloadFromList(keyPairDocs, {

package/lib/payloads.js

@@ -3,16 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4923c894.js');
-var VerifiableCredential = require('@docknetwork/sdk/verifiable-credential');
+var vc = require('@docknetwork/credential-sdk/vc');
 var utilCrypto = require('@polkadot/util-crypto');
-var helpers = require('@docknetwork/sdk/utils/vc/helpers');
 var keypairs = require('@docknetwork/universal-wallet/methods/keypairs');
 var assert = require('assert');
 var base64url = require('base64url');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var VerifiableCredential__default = /*#__PURE__*/_interopDefaultLegacy(VerifiableCredential);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 var base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
 
@@ -42,7 +40,7 @@ function _generateSignedPayload() {
           return utilCrypto.cryptoWaitReady();
         case 4:
           keyPairDoc = ensureDIDDockFragment(keyPairDoc);
-          cred = new VerifiableCredential__default["default"]('dock:relay');
+          cred = new vc.VerifiableCredential('dock:relay');
           cred.setContext(['https://www.w3.org/2018/credentials/v1', {
             dk: 'https://ld.dock.io/credentials#',
             RelayAuthCredential: 'dk:RelayAuthCredential',
@@ -59,7 +57,7 @@ function _generateSignedPayload() {
           keyPair = keypairs.getKeypairFromDoc(keyPairDoc);
           keyPair.signer = keyPair.signer();
           _context.next = 16;
-          return helpers.getSuiteFromKeyDoc(keyPair);
+          return vc.getSuiteFromKeyDoc(keyPair);
         case 16:
           suite = _context.sent;
           _context.next = 19;

package/lib/payloads.mjs

@@ -1,7 +1,6 @@
 import { _ as _asyncToGenerator, a as _regeneratorRuntime, d as _createForOfIteratorHelper } from './_rollupPluginBabelHelpers-78739aa5.js';
-import VerifiableCredential from '@docknetwork/sdk/verifiable-credential';
+import { VerifiableCredential, getSuiteFromKeyDoc } from '@docknetwork/credential-sdk/vc';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
-import { getSuiteFromKeyDoc } from '@docknetwork/sdk/utils/vc/helpers';
 import { getKeypairFromDoc } from '@docknetwork/universal-wallet/methods/keypairs';
 import assert from 'assert';
 import base64url from 'base64url';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-relay-service",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",
@@ -13,8 +13,7 @@
     "dependencies": {
         "uuid": "^9.0.0",
         "@docknetwork/minimal-cipher": "^5.2.1",
-        "@docknetwork/sdk": "8.6.0",
-        "@docknetwork/wallet-sdk-wasm": "1.4.0"
+        "@docknetwork/wallet-sdk-wasm": "^1.5.0"
     },
     "devDependencies": {
         "jest": "29.1.0",

package/src/didcomm.js

@@ -6,7 +6,7 @@ import {v1 as uuidv1} from 'uuid';
 import base64url from 'base64url';
 import * as bs58 from 'base58-universal';
 
-import {resolveDID} from './did/dids';
+import {blockchainService} from '@docknetwork/wallet-sdk-wasm/src/services/blockchain/service';
 
 export const DIDCOMM_TYPE_BASIC =
   'https://didcomm.org/basicmessage/1.0/message';
@@ -34,7 +34,7 @@ function potentialToArray(a) {
 }
 
 export async function getKeydocFromDID(didUrl) {
-  const didDocument = await resolveDID(didUrl);
+  const didDocument = await blockchainService.resolver.resolve(didUrl);
   const possibleKeys = [
     ...potentialToArray(didDocument.verificationMethod),
     ...potentialToArray(didDocument.keyAgreement),
@@ -201,7 +201,7 @@ export async function getAgreementKeydocFromDID(did) {
 
   // Resolve actual DID document and get key agreement keys
   const isDIDUrl = did.indexOf('#') !== -1;
-  const didDocument = await resolveDID(did);
+  const didDocument = await blockchainService.resolver.resolve(did);
   const keyAgreements = didDocument.keyAgreement
     ? Array.isArray(didDocument.keyAgreement)
       ? didDocument.keyAgreement

package/src/index.js

@@ -16,9 +16,9 @@ import {
   toBase64,
 } from './payloads';
 import jwtDecode from 'jwt-decode';
-import {dockService} from '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
+import {blockchainService} from '@docknetwork/wallet-sdk-wasm/src/services/blockchain/service';
 
-let serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.dock.io';
+let serviceURL = process.env.RELAY_SERVICE_URL || 'https://relay.truvera.io';
 
 export const didcomm = {
   encrypt: didcommCreateEncrypted,
@@ -68,7 +68,7 @@ const getMessages = async ({
   assert(Array.isArray(keyPairDocs), 'keyPairDocs must be an array');
   assert(!!keyPairDocs.length, 'keyPairDocs must not be empty');
 
-  await dockService.waitDockReady();
+  await blockchainService.waitBlockchainReady();
 
   const {payload, dids} = await generateSignedPayloadFromList(keyPairDocs, {
     limit,

package/src/payloads.js

@@ -1,6 +1,8 @@
-import VerifiableCredential from '@docknetwork/sdk/verifiable-credential';
+import {
+  VerifiableCredential,
+  getSuiteFromKeyDoc,
+} from '@docknetwork/credential-sdk/vc';
 import {cryptoWaitReady} from '@polkadot/util-crypto';
-import {getSuiteFromKeyDoc} from '@docknetwork/sdk/utils/vc/helpers';
 import {getKeypairFromDoc} from '@docknetwork/universal-wallet/methods/keypairs';
 import assert from 'assert';
 import base64url from 'base64url';

package/tests/didcomm.test.js

@@ -5,15 +5,12 @@ import {
   getDerivedAgreementKey,
 } from '../lib/didcomm';
 import {ALICE_KEY_PAIR_DOC, BOB_KEY_PAIR_DOC} from './mock-data';
-import {dockService} from '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
-import {WildcardMultiResolver} from '@docknetwork/sdk/resolver';
+import {blockchainService} from '@docknetwork/wallet-sdk-wasm/src/services/blockchain/service';
+// import {ResolverRouter} from '@docknetwork/credential-sdk/resolver';
 
 const didList = [ALICE_KEY_PAIR_DOC, BOB_KEY_PAIR_DOC];
 
-class WalletSDKResolver extends WildcardMultiResolver {
-  static PREFIX = WildcardMultiResolver.PREFIX;
-  static METHOD = WildcardMultiResolver.METHOD;
-
+const mockDIDResolver = {
   async resolve(did) {
     const trimmedDID = did.split('#')[0];
     const document = didList.find(
@@ -25,21 +22,15 @@ class WalletSDKResolver extends WildcardMultiResolver {
     }
 
     return document;
-  }
-}
-
-const mockDIDResolver = new WalletSDKResolver([
-  // new DockResolver(dock),
-  // new DIDKeyResolver(),
-  // new UniversalResolver(universalResolverUrl),
-]);
+  },
+};
 
-dockService.createDIDResolver = () => mockDIDResolver;
-dockService.resolver = mockDIDResolver;
+blockchainService.createDIDResolver = () => mockDIDResolver;
+blockchainService.resolver = mockDIDResolver;
 
 describe('DIDComm', () => {
   it('expect to decrypt didcomm message', async () => {
-    dockService.resolver = mockDIDResolver;
+    blockchainService.resolver = mockDIDResolver;
 
     const keyAgreementKey = await getDerivedAgreementKey(ALICE_KEY_PAIR_DOC);
 

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

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

package/lib/did/dids.js

@@ -1,47 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _rollupPluginBabelHelpers = require('../_rollupPluginBabelHelpers-4923c894.js');
-var service = require('@docknetwork/wallet-sdk-wasm/lib/services/dock/service');
-
-var hexDIDToQualified = function hexDIDToQualified(did) {
-  return "did:dock:".concat(did);
-};
-function resolveDID(_x) {
-  return _resolveDID.apply(this, arguments);
-}
-function _resolveDID() {
-  _resolveDID = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee(did) {
-    var disableCache,
-      qualifiedDID,
-      _args = arguments;
-    return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          disableCache = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-          // Check if string has no qualifier, if so assume its hex format
-          qualifiedDID = did;
-          if (did.substr(0, 4) !== 'did:') {
-            if (did.substr(0, 2) !== '0x') {
-              // Ensure to prepend 0x to hex string
-              qualifiedDID = hexDIDToQualified("0x".concat(did));
-            } else {
-              // Resolve hex DIDs to qualified (did:dock:xyz)
-              qualifiedDID = hexDIDToQualified(did);
-            }
-          }
-          _context.next = 5;
-          return service.dockService.resolver.resolve(qualifiedDID, disableCache);
-        case 5:
-          return _context.abrupt("return", _context.sent);
-        case 6:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _resolveDID.apply(this, arguments);
-}
-
-exports.resolveDID = resolveDID;

package/lib/did/dids.mjs

@@ -1,43 +0,0 @@
-import { _ as _asyncToGenerator, a as _regeneratorRuntime } from '../_rollupPluginBabelHelpers-78739aa5.js';
-import { dockService } from '@docknetwork/wallet-sdk-wasm/lib/services/dock/service';
-
-var hexDIDToQualified = function hexDIDToQualified(did) {
-  return "did:dock:".concat(did);
-};
-function resolveDID(_x) {
-  return _resolveDID.apply(this, arguments);
-}
-function _resolveDID() {
-  _resolveDID = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(did) {
-    var disableCache,
-      qualifiedDID,
-      _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          disableCache = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-          // Check if string has no qualifier, if so assume its hex format
-          qualifiedDID = did;
-          if (did.substr(0, 4) !== 'did:') {
-            if (did.substr(0, 2) !== '0x') {
-              // Ensure to prepend 0x to hex string
-              qualifiedDID = hexDIDToQualified("0x".concat(did));
-            } else {
-              // Resolve hex DIDs to qualified (did:dock:xyz)
-              qualifiedDID = hexDIDToQualified(did);
-            }
-          }
-          _context.next = 5;
-          return dockService.resolver.resolve(qualifiedDID, disableCache);
-        case 5:
-          return _context.abrupt("return", _context.sent);
-        case 6:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _resolveDID.apply(this, arguments);
-}
-
-export { resolveDID };

package/src/did/dids.js

@@ -1,19 +0,0 @@
-import {dockService} from '@docknetwork/wallet-sdk-wasm/src/services/dock/service';
-
-const hexDIDToQualified = did => `did:dock:${did}`;
-
-export async function resolveDID(did, disableCache = false) {
-  // Check if string has no qualifier, if so assume its hex format
-  let qualifiedDID = did;
-  if (did.substr(0, 4) !== 'did:') {
-    if (did.substr(0, 2) !== '0x') {
-      // Ensure to prepend 0x to hex string
-      qualifiedDID = hexDIDToQualified(`0x${did}`);
-    } else {
-      // Resolve hex DIDs to qualified (did:dock:xyz)
-      qualifiedDID = hexDIDToQualified(did);
-    }
-  }
-
-  return await dockService.resolver.resolve(qualifiedDID, disableCache);
-}