@docknetwork/wallet-sdk-wasm 1.5.6 → 1.5.9

package/lib/services/blockchain/service.js

@@ -8,8 +8,6 @@ var cheqdBlockchainModules = require('@docknetwork/cheqd-blockchain-modules');
 var modules = require('@docknetwork/credential-sdk/modules');
 var resolver = require('@docknetwork/credential-sdk/resolver');
 var index = require('@docknetwork/crypto-wasm-ts/lib/index');
-var dockBlockchainApi = require('@docknetwork/dock-blockchain-api');
-var dockBlockchainModules = require('@docknetwork/dock-blockchain-modules');
 var events = require('events');
 var core_logger = require('../../core/logger.js');
 var modules_eventManager = require('../../modules/event-manager.js');
@@ -29,33 +27,16 @@ const universalResolverUrl = 'https://uniresolver.truvera.io';
 class AnyDIDResolver extends resolver.ResolverRouter {
     method = resolver.WILDCARD;
 }
-const { AccumulatorModule: AccumulatorModuleDock } = dockBlockchainModules.DockCoreModules;
-const { AccumulatorModule: AccumulatorModuleCheqd } = cheqdBlockchainModules.CheqdCoreModules;
-const TYPES_FOR_DID = {
-    dock: {
-        PublicKey: types.DockAccumulatorPublicKey,
-        AccumulatorId: types.DockAccumulatorId,
-        AccumulatorCommon: types.DockAccumulatorCommon,
-        AccumulatorModule: AccumulatorModuleDock,
-    },
-    cheqd: {
-        PublicKey: types.CheqdAccumulatorPublicKey,
-        AccumulatorId: types.CheqdAccumulatorId,
-        AccumulatorCommon: types.CheqdAccumulatorCommon,
-        AccumulatorModule: AccumulatorModuleCheqd,
-    },
-};
 /**
  *
  */
 class BlockchainService {
     dock;
     modules;
-    didModule;
     cheqdApi;
+    cheqdApiUrl;
     isBlockchainReady = false;
     resolver;
-    dockEnabled;
     static Events = {
         BLOCKCHAIN_READY: 'blockchain-ready',
     };
@@ -68,27 +49,19 @@ class BlockchainService {
     ];
     constructor() {
         this.name = 'blockchain';
-        this.dock = new dockBlockchainApi.DockAPI();
         this.cheqdApi = new cheqdBlockchainApi.CheqdAPI();
-        this.didModule = new dockBlockchainModules.DockDIDModule(this.dock);
-        this.dockModules = new dockBlockchainModules.DockCoreModules(this.dock);
         this.cheqdModules = new cheqdBlockchainModules.CheqdCoreModules(this.cheqdApi);
-        this.modules = new modules.MultiApiCoreModules(this.dockEnabled
-            ? [this.dockModules, this.cheqdModules]
-            : [this.cheqdModules]);
+        this.modules = new modules.MultiApiCoreModules([this.cheqdModules]);
         this.emitter = new events.EventEmitter();
         this.resolver = this.createDIDResolver();
     }
     getTypesForDIDOrAccumulator(didOrRegistryId) {
-        const didType = didOrRegistryId
-            .replace('dock:accumulator:', 'accumulator:dock:')
-            .split(':')[1];
-        const chainDidType = !this.dock && didType === 'dock' ? 'cheqd' : didType;
-        const types = TYPES_FOR_DID[chainDidType];
-        if (!types) {
-            throw new APIError(`Unable to use DID type ${didType} for this operation`);
-        }
-        return types;
+        return {
+            PublicKey: types.AccumulatorPublicKey,
+            AccumulatorId: types.AccumulatorId,
+            AccumulatorCommon: types.AccumulatorCommon,
+            AccumulatorModule: this.modules.accumulator,
+        };
     }
     /**
      *
@@ -113,48 +86,37 @@ class BlockchainService {
      * @returns
      */
     async init(params) {
-        if (this.dock.isConnected) {
-            await this.dock.disconnect();
+        if (!params?.cheqdApiUrl) {
+            throw new Error('cheqdApiUrl is required');
         }
         if (this.cheqdApi && this.cheqdApi.isInitialized()) {
             await this.cheqdApi.disconnect();
         }
-        core_logger.Logger.info(`Attempt to initialized substrate at: ${params.address}`);
-        this.dockEnabled = !!params.substrateUrl;
-        if (this.dockEnabled) {
-            await this.dock.init({
-                address: params.substrateUrl,
+        this.modules = new modules.MultiApiCoreModules([this.cheqdModules]);
+        const checkdApiUrl = params?.cheqdApiUrl;
+        const cheqdNetworkId = params?.networkId;
+        const cheqdMnemonic = params?.cheqdMnemonic || (await services_utilCrypto_service.utilCryptoService.mnemonicGenerate(12));
+        const wallet = await protoSigning.DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
+            prefix: 'cheqd',
+        });
+        const walletAccounts = await wallet.getAccounts();
+        const [{ address }] = walletAccounts;
+        console.log('Using cheqd account:', address);
+        core_logger.Logger.info(`Attempt to initialized cheqd at: ${checkdApiUrl} with networkId: ${cheqdNetworkId}`);
+        core_logger.Logger.info(`Using cheqd account: ${address}`);
+        try {
+            await this.cheqdApi.init({
+                wallet,
+                url: checkdApiUrl,
+                network: cheqdNetworkId,
             });
-            core_logger.Logger.info(`Substrate initialized at: ${params.address}`);
+            core_logger.Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
         }
-        this.modules = new modules.MultiApiCoreModules(this.dockEnabled
-            ? [this.dockModules, this.cheqdModules]
-            : [this.cheqdModules]);
-        if (params?.cheqdApiUrl) {
-            const checkdApiUrl = params?.cheqdApiUrl;
-            const cheqdNetworkId = params?.networkId;
-            const cheqdMnemonic = params?.cheqdMnemonic || (await services_utilCrypto_service.utilCryptoService.mnemonicGenerate(12));
-            const wallet = await protoSigning.DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
-                prefix: 'cheqd',
-            });
-            const walletAccounts = await wallet.getAccounts();
-            const [{ address }] = walletAccounts;
-            console.log('Using cheqd account:', address);
-            core_logger.Logger.info(`Attempt to initialized cheqd at: ${checkdApiUrl} with networkId: ${cheqdNetworkId}`);
-            core_logger.Logger.info(`Using cheqd account: ${address}`);
-            try {
-                await this.cheqdApi.init({
-                    wallet,
-                    url: checkdApiUrl,
-                    network: cheqdNetworkId,
-                });
-                core_logger.Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
-            }
-            catch (err) {
-                core_logger.Logger.error(`Failed to initialize cheqd at: ${checkdApiUrl}`);
-            }
+        catch (err) {
+            console.error(err);
+            debugger;
+            core_logger.Logger.error(`Failed to initialize cheqd at: ${checkdApiUrl}`);
         }
-        this.address = params.address;
         this.resolver = this.createDIDResolver();
         if (process.env.NODE_ENV !== 'test' ||
             process.env.API_MOCK_DISABLED === 'true') {
@@ -169,9 +131,6 @@ class BlockchainService {
      */
     async disconnect() {
         let result;
-        if (this.dockEnabled) {
-            result = await this.dock.disconnect();
-        }
         if (this.cheqdApi && this.cheqdApi.isInitialized()) {
             result = await this.cheqdApi.disconnect();
         }
@@ -196,7 +155,7 @@ class BlockchainService {
         return this.cheqdApi.isInitialized();
     }
     async getAddress() {
-        return this.dock.address;
+        return this.cheqdApiUrl;
     }
     _setBlockchainReady(isBlockchainReady) {
         this.isBlockchainReady = isBlockchainReady;

package/lib/services/blockchain/service.mjs

@@ -4,13 +4,11 @@ import { CheqdCoreModules } from '@docknetwork/cheqd-blockchain-modules';
 import { MultiApiCoreModules } from '@docknetwork/credential-sdk/modules';
 import { DIDKeyResolver, CoreResolver, UniversalResolver, ResolverRouter, WILDCARD } from '@docknetwork/credential-sdk/resolver';
 import { initializeWasm } from '@docknetwork/crypto-wasm-ts/lib/index';
-import { DockAPI } from '@docknetwork/dock-blockchain-api';
-import { DockDIDModule, DockCoreModules } from '@docknetwork/dock-blockchain-modules';
 import { EventEmitter } from 'events';
 import { Logger } from '../../core/logger.mjs';
 import { once } from '../../modules/event-manager.mjs';
 import { utilCryptoService } from '../util-crypto/service.mjs';
-import { DockAccumulatorPublicKey, DockAccumulatorId, DockAccumulatorCommon, CheqdAccumulatorPublicKey, CheqdAccumulatorId, CheqdAccumulatorCommon } from '@docknetwork/credential-sdk/types';
+import { AccumulatorPublicKey, AccumulatorId, AccumulatorCommon } from '@docknetwork/credential-sdk/types';
 import 'assert';
 import '@polkadot/keyring';
 import '@polkadot/util';
@@ -25,33 +23,16 @@ const universalResolverUrl = 'https://uniresolver.truvera.io';
 class AnyDIDResolver extends ResolverRouter {
     method = WILDCARD;
 }
-const { AccumulatorModule: AccumulatorModuleDock } = DockCoreModules;
-const { AccumulatorModule: AccumulatorModuleCheqd } = CheqdCoreModules;
-const TYPES_FOR_DID = {
-    dock: {
-        PublicKey: DockAccumulatorPublicKey,
-        AccumulatorId: DockAccumulatorId,
-        AccumulatorCommon: DockAccumulatorCommon,
-        AccumulatorModule: AccumulatorModuleDock,
-    },
-    cheqd: {
-        PublicKey: CheqdAccumulatorPublicKey,
-        AccumulatorId: CheqdAccumulatorId,
-        AccumulatorCommon: CheqdAccumulatorCommon,
-        AccumulatorModule: AccumulatorModuleCheqd,
-    },
-};
 /**
  *
  */
 class BlockchainService {
     dock;
     modules;
-    didModule;
     cheqdApi;
+    cheqdApiUrl;
     isBlockchainReady = false;
     resolver;
-    dockEnabled;
     static Events = {
         BLOCKCHAIN_READY: 'blockchain-ready',
     };
@@ -64,27 +45,19 @@ class BlockchainService {
     ];
     constructor() {
         this.name = 'blockchain';
-        this.dock = new DockAPI();
         this.cheqdApi = new CheqdAPI();
-        this.didModule = new DockDIDModule(this.dock);
-        this.dockModules = new DockCoreModules(this.dock);
         this.cheqdModules = new CheqdCoreModules(this.cheqdApi);
-        this.modules = new MultiApiCoreModules(this.dockEnabled
-            ? [this.dockModules, this.cheqdModules]
-            : [this.cheqdModules]);
+        this.modules = new MultiApiCoreModules([this.cheqdModules]);
         this.emitter = new EventEmitter();
         this.resolver = this.createDIDResolver();
     }
     getTypesForDIDOrAccumulator(didOrRegistryId) {
-        const didType = didOrRegistryId
-            .replace('dock:accumulator:', 'accumulator:dock:')
-            .split(':')[1];
-        const chainDidType = !this.dock && didType === 'dock' ? 'cheqd' : didType;
-        const types = TYPES_FOR_DID[chainDidType];
-        if (!types) {
-            throw new APIError(`Unable to use DID type ${didType} for this operation`);
-        }
-        return types;
+        return {
+            PublicKey: AccumulatorPublicKey,
+            AccumulatorId,
+            AccumulatorCommon,
+            AccumulatorModule: this.modules.accumulator,
+        };
     }
     /**
      *
@@ -109,48 +82,37 @@ class BlockchainService {
      * @returns
      */
     async init(params) {
-        if (this.dock.isConnected) {
-            await this.dock.disconnect();
+        if (!params?.cheqdApiUrl) {
+            throw new Error('cheqdApiUrl is required');
         }
         if (this.cheqdApi && this.cheqdApi.isInitialized()) {
             await this.cheqdApi.disconnect();
         }
-        Logger.info(`Attempt to initialized substrate at: ${params.address}`);
-        this.dockEnabled = !!params.substrateUrl;
-        if (this.dockEnabled) {
-            await this.dock.init({
-                address: params.substrateUrl,
+        this.modules = new MultiApiCoreModules([this.cheqdModules]);
+        const checkdApiUrl = params?.cheqdApiUrl;
+        const cheqdNetworkId = params?.networkId;
+        const cheqdMnemonic = params?.cheqdMnemonic || (await utilCryptoService.mnemonicGenerate(12));
+        const wallet = await DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
+            prefix: 'cheqd',
+        });
+        const walletAccounts = await wallet.getAccounts();
+        const [{ address }] = walletAccounts;
+        console.log('Using cheqd account:', address);
+        Logger.info(`Attempt to initialized cheqd at: ${checkdApiUrl} with networkId: ${cheqdNetworkId}`);
+        Logger.info(`Using cheqd account: ${address}`);
+        try {
+            await this.cheqdApi.init({
+                wallet,
+                url: checkdApiUrl,
+                network: cheqdNetworkId,
             });
-            Logger.info(`Substrate initialized at: ${params.address}`);
+            Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
         }
-        this.modules = new MultiApiCoreModules(this.dockEnabled
-            ? [this.dockModules, this.cheqdModules]
-            : [this.cheqdModules]);
-        if (params?.cheqdApiUrl) {
-            const checkdApiUrl = params?.cheqdApiUrl;
-            const cheqdNetworkId = params?.networkId;
-            const cheqdMnemonic = params?.cheqdMnemonic || (await utilCryptoService.mnemonicGenerate(12));
-            const wallet = await DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
-                prefix: 'cheqd',
-            });
-            const walletAccounts = await wallet.getAccounts();
-            const [{ address }] = walletAccounts;
-            console.log('Using cheqd account:', address);
-            Logger.info(`Attempt to initialized cheqd at: ${checkdApiUrl} with networkId: ${cheqdNetworkId}`);
-            Logger.info(`Using cheqd account: ${address}`);
-            try {
-                await this.cheqdApi.init({
-                    wallet,
-                    url: checkdApiUrl,
-                    network: cheqdNetworkId,
-                });
-                Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
-            }
-            catch (err) {
-                Logger.error(`Failed to initialize cheqd at: ${checkdApiUrl}`);
-            }
+        catch (err) {
+            console.error(err);
+            debugger;
+            Logger.error(`Failed to initialize cheqd at: ${checkdApiUrl}`);
         }
-        this.address = params.address;
         this.resolver = this.createDIDResolver();
         if (process.env.NODE_ENV !== 'test' ||
             process.env.API_MOCK_DISABLED === 'true') {
@@ -165,9 +127,6 @@ class BlockchainService {
      */
     async disconnect() {
         let result;
-        if (this.dockEnabled) {
-            result = await this.dock.disconnect();
-        }
         if (this.cheqdApi && this.cheqdApi.isInitialized()) {
             result = await this.cheqdApi.disconnect();
         }
@@ -192,7 +151,7 @@ class BlockchainService {
         return this.cheqdApi.isInitialized();
     }
     async getAddress() {
-        return this.dock.address;
+        return this.cheqdApiUrl;
     }
     _setBlockchainReady(isBlockchainReady) {
         this.isBlockchainReady = isBlockchainReady;

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

@@ -11,8 +11,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');

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

@@ -7,8 +7,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';

package/lib/services/credential/index.js

@@ -28,8 +28,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');

package/lib/services/credential/index.mjs

@@ -24,8 +24,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';

package/lib/services/credential/service.js

@@ -31,8 +31,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');

package/lib/services/credential/service.mjs

@@ -27,8 +27,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';

package/lib/services/dids/index.js

@@ -23,8 +23,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');

package/lib/services/dids/index.mjs

@@ -19,8 +19,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';

package/lib/services/dids/service.js

@@ -26,8 +26,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
@@ -135,7 +133,7 @@ class DIDService {
     async getDidDockDocument(did) {
         assert__default["default"](!!did, 'DID is required');
         services_blockchain_service.blockchainService.dock;
-        const result = await services_blockchain_service.blockchainService.didModule.getDocument(did);
+        const result = await services_blockchain_service.blockchainService.modules.did.getDocument(did);
         return result;
     }
 }

package/lib/services/dids/service.mjs

@@ -22,8 +22,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';
@@ -126,7 +124,7 @@ class DIDService {
     async getDidDockDocument(did) {
         assert(!!did, 'DID is required');
         blockchainService.dock;
-        const result = await blockchainService.didModule.getDocument(did);
+        const result = await blockchainService.modules.did.getDocument(did);
         return result;
     }
 }

package/lib/services/edv/hmac.js

@@ -2,7 +2,6 @@
 
 var base64url = require('base64url-universal');
 var crypto = require('@docknetwork/universal-wallet/crypto');
-var util = require('@polkadot/util');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -46,7 +45,7 @@ class HMAC {
         return key;
     }
     static async deriveKey(baseKey) {
-        const key = await crypto__default["default"].subtle.importKey('raw', util.hexToU8a(baseKey), { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
+        const key = await crypto__default["default"].subtle.importKey('raw', baseKey, { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
         return key;
     }
     static async exportKey(key) {

package/lib/services/edv/hmac.mjs

@@ -1,6 +1,5 @@
 import * as base64url from 'base64url-universal';
 import crypto from '@docknetwork/universal-wallet/crypto';
-import { hexToU8a } from '@polkadot/util';
 
 class HMAC {
     key;
@@ -21,7 +20,7 @@ class HMAC {
         return key;
     }
     static async deriveKey(baseKey) {
-        const key = await crypto.subtle.importKey('raw', hexToU8a(baseKey), { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
+        const key = await crypto.subtle.importKey('raw', baseKey, { name: 'HMAC', hash: { name: 'SHA-256' } }, true, ['sign', 'verify']);
         return key;
     }
     static async exportKey(key) {

package/lib/services/edv/index.js

@@ -9,7 +9,6 @@ require('@docknetwork/universal-wallet/storage/edv-http-storage');
 require('./hmac.js');
 require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
-require('@polkadot/util');
 require('@digitalbazaar/ed25519-verification-key-2018');
 require('@digitalbazaar/ed25519-verification-key-2020');
 require('@digitalbazaar/x25519-key-agreement-key-2020');
@@ -26,6 +25,7 @@ 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');
@@ -34,8 +34,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');

package/lib/services/edv/index.mjs

@@ -5,7 +5,6 @@ import '@docknetwork/universal-wallet/storage/edv-http-storage';
 import './hmac.mjs';
 import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
-import '@polkadot/util';
 import '@digitalbazaar/ed25519-verification-key-2018';
 import '@digitalbazaar/ed25519-verification-key-2020';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
@@ -22,6 +21,7 @@ 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';
@@ -30,8 +30,6 @@ import '@docknetwork/cheqd-blockchain-modules';
 import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
 import '@docknetwork/crypto-wasm-ts/lib/index';
-import '@docknetwork/dock-blockchain-api';
-import '@docknetwork/dock-blockchain-modules';
 import 'events';
 import '../../core/logger.mjs';
 import '../../modules/event-manager.mjs';

package/lib/services/edv/service-rpc.js

@@ -31,6 +31,10 @@ class EDVServiceRpc extends services_rpcServiceClient.RpcService {
     return this.call('deriveKeys');
   }
 
+  getController() {
+    return this.call('getController');
+  }
+
   find(params     ) {
     return this.call('find', params);
   }

package/lib/services/edv/service-rpc.mjs

@@ -27,6 +27,10 @@ class EDVServiceRpc extends RpcService {
     return this.call('deriveKeys');
   }
 
+  getController() {
+    return this.call('getController');
+  }
+
   find(params     ) {
     return this.call('find', params);
   }

package/lib/services/edv/service.js

@@ -13,10 +13,9 @@ 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 base64url = require('base64url-universal');
 require('assert');
+require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
-require('@polkadot/util');
 require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
 require('../keyring/service.js');
@@ -26,6 +25,7 @@ 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');
@@ -34,8 +34,6 @@ require('@docknetwork/cheqd-blockchain-modules');
 require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
 require('@docknetwork/crypto-wasm-ts/lib/index');
-require('@docknetwork/dock-blockchain-api');
-require('@docknetwork/dock-blockchain-modules');
 require('events');
 require('../../core/logger.js');
 require('../../modules/event-manager.js');
@@ -51,7 +49,6 @@ require('@docknetwork/credential-sdk/vc/crypto');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var EDVHTTPStorageInterface__default = /*#__PURE__*/_interopDefaultLegacy(EDVHTTPStorageInterface);
-var base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
 
 // @ts-nocheck
 /**
@@ -60,9 +57,11 @@ var base64url__default = /*#__PURE__*/_interopDefaultLegacy(base64url);
 class EDVService {
     storageInterface;
     insertQueue = Promise.resolve();
+    controller;
     rpcMethods = [
         EDVService.prototype.generateKeys,
         EDVService.prototype.deriveKeys,
+        EDVService.prototype.getController,
         EDVService.prototype.initialize,
         EDVService.prototype.find,
         EDVService.prototype.update,
@@ -82,6 +81,7 @@ class EDVService {
             hmac,
         };
         const { controller } = verificationKey;
+        this.controller = controller;
         const invocationSigner = keypairs.getKeypairFromDoc(verificationKey);
         invocationSigner.sign = invocationSigner.signer().sign;
         this.storageInterface = new EDVHTTPStorageInterface__default["default"]({
@@ -137,7 +137,7 @@ class EDVService {
         await keyring.keyringService.initialize({
             ss58Format: 22,
         });
-        const pair = utilCrypto.ed25519PairFromSeed(base64url__default["default"].decode(masterKey));
+        const pair = utilCrypto.ed25519PairFromSeed(masterKey);
         const keyPair = await services_dids_service.didService.deriveKeyDoc({ pair });
         const verificationKey = await ed25519VerificationKey2018.Ed25519VerificationKey2018.from(keyPair);
         const verificationKey2020 = await ed25519VerificationKey2020.Ed25519VerificationKey2020.fromEd25519VerificationKey2018({ keyPair });
@@ -145,6 +145,9 @@ class EDVService {
         const hmacKey = await services_edv_hmac.exportKey(await services_edv_hmac.deriveKey(masterKey));
         return { verificationKey, agreementKey, hmacKey };
     }
+    async getController() {
+        return this.controller;
+    }
     find(params) {
         return this.storageInterface.find(params);
     }