@docknetwork/wallet-sdk-wasm 1.5.8 → 1.5.9

package/lib/{account-e7156c51.js → account-357ab05d.js}

@@ -3,7 +3,6 @@ import { isAddressValid } from './core/validation.mjs';
 import { walletService } from './services/wallet/service.mjs';
 import { utilCryptoService } from './services/util-crypto/service.mjs';
 import { keyringService } from './services/keyring/service.mjs';
-import { substrateService } from './services/substrate/service.mjs';
 import { polkadotService } from './services/polkadot/service.mjs';
 import { v4 } from 'uuid';
 import { getStorage } from './core/storage.mjs';
@@ -362,7 +361,7 @@ class Wallet {
                 await blockchainService.disconnect();
             }
             await blockchainService.init({
-                address: networkInfo.substrateUrl,
+                cheqdApiUrl: networkInfo.cheqdApiUrl,
             });
             this.eventManager.emit(WalletEvents.networkConnected);
         }
@@ -546,27 +545,6 @@ class Accounts {
             password,
         });
     }
-    async fetchBalance(address) {
-        assert(isAddressValid(address), 'invalid address');
-        console.log('fetching balance from substrate');
-        let balance;
-        try {
-            balance = await substrateService.getAccountBalance({ address });
-            console.log('balance found', balance.toString());
-            console.log('updating cache');
-            const currency = await this.findCorrelationByType(address, 'Currency', true);
-            console.log('currency', currency);
-            if (currency.value !== balance) {
-                currency.value = balance;
-                await this.wallet.update(currency);
-            }
-        }
-        catch (err) {
-            console.log('Unable to update cache');
-            console.error(err);
-        }
-        return balance;
-    }
     async getBalance(address, skipFetch) {
         assert(isAddressValid(address), 'address is required');
         if (!skipFetch) {

package/lib/{account-8fa95046.js → account-399e6053.js}

@@ -5,7 +5,6 @@ var core_validation = require('./core/validation.js');
 var services_wallet_service = require('./services/wallet/service.js');
 var services_utilCrypto_service = require('./services/util-crypto/service.js');
 var services_keyring_service = require('./services/keyring/service.js');
-var services_substrate_service = require('./services/substrate/service.js');
 var services_polkadot_service = require('./services/polkadot/service.js');
 var uuid = require('uuid');
 var core_storage = require('./core/storage.js');
@@ -368,7 +367,7 @@ class Wallet {
                 await services_blockchain_service.blockchainService.disconnect();
             }
             await services_blockchain_service.blockchainService.init({
-                address: networkInfo.substrateUrl,
+                cheqdApiUrl: networkInfo.cheqdApiUrl,
             });
             this.eventManager.emit(WalletEvents.networkConnected);
         }
@@ -552,27 +551,6 @@ class Accounts {
             password,
         });
     }
-    async fetchBalance(address) {
-        assert__default["default"](core_validation.isAddressValid(address), 'invalid address');
-        console.log('fetching balance from substrate');
-        let balance;
-        try {
-            balance = await services_substrate_service.substrateService.getAccountBalance({ address });
-            console.log('balance found', balance.toString());
-            console.log('updating cache');
-            const currency = await this.findCorrelationByType(address, 'Currency', true);
-            console.log('currency', currency);
-            if (currency.value !== balance) {
-                currency.value = balance;
-                await this.wallet.update(currency);
-            }
-        }
-        catch (err) {
-            console.log('Unable to update cache');
-            console.error(err);
-        }
-        return balance;
-    }
     async getBalance(address, skipFetch) {
         assert__default["default"](core_validation.isAddressValid(address), 'address is required');
         if (!skipFetch) {

package/lib/index.js

@@ -25,19 +25,12 @@ 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('./modules/event-manager.js');
 require('./services/util-crypto/service.js');
 require('@polkadot/util');
 require('./services/util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
-require('./services/substrate/service.js');
-require('bn.js');
-require('./core/format-utils.js');
-require('./services/substrate/api-utils.js');
-require('./services/substrate/configs.js');
 require('./services/wallet/service.js');
 require('uuid');
 require('./wallet/memory-storage-wallet.js');
@@ -79,8 +72,6 @@ require('./services/relay-service/configs.js');
 require('@docknetwork/wallet-sdk-relay-service/lib');
 require('./services/pex/service.js');
 require('./services/pex/config.js');
-require('./services/trust-registry/service.js');
-require('./services/trust-registry/configs.js');
 require('./services/edv/service.js');
 require('./services/edv/configs.js');
 require('@docknetwork/universal-wallet/storage/edv-http-storage');

package/lib/index.mjs

@@ -23,19 +23,12 @@ 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 './modules/event-manager.mjs';
 import './services/util-crypto/service.mjs';
 import '@polkadot/util';
 import './services/util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import './services/substrate/service.mjs';
-import 'bn.js';
-import './core/format-utils.mjs';
-import './services/substrate/api-utils.mjs';
-import './services/substrate/configs.mjs';
 import './services/wallet/service.mjs';
 import 'uuid';
 import './wallet/memory-storage-wallet.mjs';
@@ -77,8 +70,6 @@ import './services/relay-service/configs.mjs';
 import '@docknetwork/wallet-sdk-relay-service/lib';
 import './services/pex/service.mjs';
 import './services/pex/config.mjs';
-import './services/trust-registry/service.mjs';
-import './services/trust-registry/configs.mjs';
 import './services/edv/service.mjs';
 import './services/edv/configs.mjs';
 import '@docknetwork/universal-wallet/storage/edv-http-storage';

package/lib/modules/account.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('assert');
 require('../core/validation.js');
-var modules_wallet = require('../account-8fa95046.js');
+var modules_wallet = require('../account-399e6053.js');
 require('bignumber.js');
 require('../types.js');
 require('../services/wallet/service.js');
@@ -25,9 +25,10 @@ require('../services/wallet/configs.js');
 require('../services/util-crypto/service.js');
 require('@polkadot/util');
 require('../services/util-crypto/configs.js');
-require('../services/substrate/service.js');
-require('bn.js');
-require('../core/format-utils.js');
+require('../services/polkadot/service.js');
+require('@polkadot/ui-shared/cjs/icons/index');
+require('../services/polkadot/configs.js');
+require('../core/storage.js');
 require('../services/blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -35,17 +36,9 @@ 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('./event-manager.js');
 require('@docknetwork/credential-sdk/types');
-require('../services/substrate/api-utils.js');
-require('../services/substrate/configs.js');
-require('../services/polkadot/service.js');
-require('@polkadot/ui-shared/cjs/icons/index');
-require('../services/polkadot/configs.js');
-require('../core/storage.js');
 require('./network-manager.js');
 require('./data-migration.js');
 require('../errors.js');

package/lib/modules/account.mjs

@@ -1,6 +1,6 @@
 import 'assert';
 import '../core/validation.mjs';
-export { c as Account } from '../account-e7156c51.js';
+export { c as Account } from '../account-357ab05d.js';
 import 'bignumber.js';
 import '../types.mjs';
 import '../services/wallet/service.mjs';
@@ -21,9 +21,10 @@ import '../services/wallet/configs.mjs';
 import '../services/util-crypto/service.mjs';
 import '@polkadot/util';
 import '../services/util-crypto/configs.mjs';
-import '../services/substrate/service.mjs';
-import 'bn.js';
-import '../core/format-utils.mjs';
+import '../services/polkadot/service.mjs';
+import '@polkadot/ui-shared/cjs/icons/index';
+import '../services/polkadot/configs.mjs';
+import '../core/storage.mjs';
 import '../services/blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -31,17 +32,9 @@ 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 './event-manager.mjs';
 import '@docknetwork/credential-sdk/types';
-import '../services/substrate/api-utils.mjs';
-import '../services/substrate/configs.mjs';
-import '../services/polkadot/service.mjs';
-import '@polkadot/ui-shared/cjs/icons/index';
-import '../services/polkadot/configs.mjs';
-import '../core/storage.mjs';
 import './network-manager.mjs';
 import './data-migration.mjs';
 import '../errors.mjs';

package/lib/modules/accounts.js

@@ -6,9 +6,8 @@ require('assert');
 require('../services/wallet/service.js');
 require('../services/util-crypto/service.js');
 require('../services/keyring/service.js');
-require('../services/substrate/service.js');
 require('../services/polkadot/service.js');
-var modules_wallet = require('../account-8fa95046.js');
+var modules_wallet = require('../account-399e6053.js');
 require('../errors.js');
 require('../types.js');
 require('./event-manager.js');
@@ -29,8 +28,9 @@ require('@polkadot/util-crypto');
 require('../services/keyring/configs.js');
 require('@polkadot/util');
 require('../services/util-crypto/configs.js');
-require('bn.js');
-require('../core/format-utils.js');
+require('@polkadot/ui-shared/cjs/icons/index');
+require('../services/polkadot/configs.js');
+require('../core/storage.js');
 require('../services/blockchain/service.js');
 require('@cosmjs/proto-signing');
 require('@docknetwork/cheqd-blockchain-api');
@@ -38,15 +38,8 @@ 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('@docknetwork/credential-sdk/types');
-require('../services/substrate/api-utils.js');
-require('../services/substrate/configs.js');
-require('@polkadot/ui-shared/cjs/icons/index');
-require('../services/polkadot/configs.js');
-require('../core/storage.js');
 require('./network-manager.js');
 require('./data-migration.js');
 

package/lib/modules/accounts.mjs

@@ -2,9 +2,8 @@ import 'assert';
 import '../services/wallet/service.mjs';
 import '../services/util-crypto/service.mjs';
 import '../services/keyring/service.mjs';
-import '../services/substrate/service.mjs';
 import '../services/polkadot/service.mjs';
-export { b as Accounts, A as AccountsEvents } from '../account-e7156c51.js';
+export { b as Accounts, A as AccountsEvents } from '../account-357ab05d.js';
 import '../errors.mjs';
 import '../types.mjs';
 import './event-manager.mjs';
@@ -25,8 +24,9 @@ import '@polkadot/util-crypto';
 import '../services/keyring/configs.mjs';
 import '@polkadot/util';
 import '../services/util-crypto/configs.mjs';
-import 'bn.js';
-import '../core/format-utils.mjs';
+import '@polkadot/ui-shared/cjs/icons/index';
+import '../services/polkadot/configs.mjs';
+import '../core/storage.mjs';
 import '../services/blockchain/service.mjs';
 import '@cosmjs/proto-signing';
 import '@docknetwork/cheqd-blockchain-api';
@@ -34,14 +34,7 @@ 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 '@docknetwork/credential-sdk/types';
-import '../services/substrate/api-utils.mjs';
-import '../services/substrate/configs.mjs';
-import '@polkadot/ui-shared/cjs/icons/index';
-import '../services/polkadot/configs.mjs';
-import '../core/storage.mjs';
 import './network-manager.mjs';
 import './data-migration.mjs';

package/lib/modules/wallet.js

@@ -9,7 +9,7 @@ require('../services/blockchain/service.js');
 require('../services/keyring/service.js');
 require('../services/util-crypto/service.js');
 require('../services/wallet/service.js');
-var modules_wallet = require('../account-8fa95046.js');
+var modules_wallet = require('../account-399e6053.js');
 require('./event-manager.js');
 require('./network-manager.js');
 require('./data-migration.js');
@@ -20,8 +20,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('@docknetwork/credential-sdk/types');
 require('@polkadot/keyring');
@@ -40,11 +38,6 @@ require('../wallet/rpc-storage-wallet.js');
 require('../wallet/rpc-storage-interface.js');
 require('../services/storage/service.js');
 require('../services/wallet/configs.js');
-require('../services/substrate/service.js');
-require('bn.js');
-require('../core/format-utils.js');
-require('../services/substrate/api-utils.js');
-require('../services/substrate/configs.js');
 require('../services/polkadot/service.js');
 require('@polkadot/ui-shared/cjs/icons/index');
 require('../services/polkadot/configs.js');

package/lib/modules/wallet.mjs

@@ -5,7 +5,7 @@ import '../services/blockchain/service.mjs';
 import '../services/keyring/service.mjs';
 import '../services/util-crypto/service.mjs';
 import '../services/wallet/service.mjs';
-export { W as Wallet, a as WalletEvents } from '../account-e7156c51.js';
+export { W as Wallet, a as WalletEvents } from '../account-357ab05d.js';
 import './event-manager.mjs';
 import './network-manager.mjs';
 import './data-migration.mjs';
@@ -16,8 +16,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 '@docknetwork/credential-sdk/types';
 import '@polkadot/keyring';
@@ -36,11 +34,6 @@ import '../wallet/rpc-storage-wallet.mjs';
 import '../wallet/rpc-storage-interface.mjs';
 import '../services/storage/service.mjs';
 import '../services/wallet/configs.mjs';
-import '../services/substrate/service.mjs';
-import 'bn.js';
-import '../core/format-utils.mjs';
-import '../services/substrate/api-utils.mjs';
-import '../services/substrate/configs.mjs';
 import '../services/polkadot/service.mjs';
 import '@polkadot/ui-shared/cjs/icons/index';
 import '../services/polkadot/configs.mjs';

package/lib/rpc-server.js

@@ -21,19 +21,12 @@ 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('./modules/event-manager.js');
 require('./services/util-crypto/service.js');
 require('@polkadot/util');
 require('./services/util-crypto/configs.js');
 require('@docknetwork/credential-sdk/types');
-require('./services/substrate/service.js');
-require('bn.js');
-require('./core/format-utils.js');
-require('./services/substrate/api-utils.js');
-require('./services/substrate/configs.js');
 require('./services/wallet/service.js');
 require('uuid');
 require('./wallet/memory-storage-wallet.js');
@@ -75,8 +68,6 @@ require('./services/relay-service/configs.js');
 require('@docknetwork/wallet-sdk-relay-service/lib');
 require('./services/pex/service.js');
 require('./services/pex/config.js');
-require('./services/trust-registry/service.js');
-require('./services/trust-registry/configs.js');
 require('./services/edv/service.js');
 require('./services/edv/configs.js');
 require('@docknetwork/universal-wallet/storage/edv-http-storage');

package/lib/rpc-server.mjs

@@ -19,19 +19,12 @@ 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 './modules/event-manager.mjs';
 import './services/util-crypto/service.mjs';
 import '@polkadot/util';
 import './services/util-crypto/configs.mjs';
 import '@docknetwork/credential-sdk/types';
-import './services/substrate/service.mjs';
-import 'bn.js';
-import './core/format-utils.mjs';
-import './services/substrate/api-utils.mjs';
-import './services/substrate/configs.mjs';
 import './services/wallet/service.mjs';
 import 'uuid';
 import './wallet/memory-storage-wallet.mjs';
@@ -73,8 +66,6 @@ import './services/relay-service/configs.mjs';
 import '@docknetwork/wallet-sdk-relay-service/lib';
 import './services/pex/service.mjs';
 import './services/pex/config.mjs';
-import './services/trust-registry/service.mjs';
-import './services/trust-registry/configs.mjs';
 import './services/edv/service.mjs';
 import './services/edv/configs.mjs';
 import '@docknetwork/universal-wallet/storage/edv-http-storage';

package/lib/services/blockchain/index.js

@@ -9,8 +9,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/blockchain/index.mjs

@@ -5,8 +5,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/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;