@docknetwork/wallet-sdk-wasm 0.4.21 → 1.4.0

package/lib/index.js

@@ -19,8 +19,9 @@ require('./core/validation.js');
 require('bignumber.js');
 require('./types.js');
 require('./services/dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('./modules/event-manager.js');
@@ -47,10 +48,10 @@ require('./services/util-crypto/service.js');
 require('@polkadot/util');
 require('./services/util-crypto/configs.js');
 require('./services/dids/service.js');
-require('@docknetwork/wallet-sdk-dids/src');
+require('@docknetwork/wallet-sdk-dids/lib');
 require('./services/dids/config.js');
-require('@docknetwork/sdk/utils/did');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
+require('@docknetwork/credential-sdk/keypairs');
 require('./core/polkadot-utils.js');
 require('@polkadot/keyring/pair/decode');
 require('@docknetwork/sdk/utils/misc');
@@ -59,8 +60,7 @@ require('@docknetwork/universal-wallet/methods/keypairs');
 require('base64url');
 require('./services/credential/utils.js');
 require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 require('./services/credential/service.js');
 require('./services/credential/config.js');
 require('@docknetwork/crypto-wasm-ts');
@@ -79,7 +79,7 @@ require('@astronautlabs/jsonpath');
 require('./services/credential/bbs-revocation.js');
 require('./services/relay-service/service.js');
 require('./services/relay-service/configs.js');
-require('@docknetwork/wallet-sdk-relay-service/src');
+require('@docknetwork/wallet-sdk-relay-service/lib');
 require('./services/pex/service.js');
 require('./services/pex/config.js');
 require('./services/trust-registry/service.js');
@@ -93,8 +93,8 @@ require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
 require('@digitalbazaar/ed25519-verification-key-2018');
 require('@digitalbazaar/x25519-key-agreement-key-2020');
-require('@docknetwork/wallet-sdk-data-store/src/logger');
-require('@docknetwork/wallet-sdk-wasm/src/services/keyring');
+require('@docknetwork/wallet-sdk-data-store/lib/logger');
+require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
 require('winston-transport');
 
 rpcClient.initRpcClient(jsonRPCRequest => {

package/lib/index.mjs

@@ -17,8 +17,9 @@ import './core/validation.mjs';
 import 'bignumber.js';
 import './types.mjs';
 import './services/dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import './modules/event-manager.mjs';
@@ -45,10 +46,10 @@ import './services/util-crypto/service.mjs';
 import '@polkadot/util';
 import './services/util-crypto/configs.mjs';
 import './services/dids/service.mjs';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@docknetwork/wallet-sdk-dids/lib';
 import './services/dids/config.mjs';
-import '@docknetwork/sdk/utils/did';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
+import '@docknetwork/credential-sdk/keypairs';
 import './core/polkadot-utils.mjs';
 import '@polkadot/keyring/pair/decode';
 import '@docknetwork/sdk/utils/misc';
@@ -57,8 +58,7 @@ import '@docknetwork/universal-wallet/methods/keypairs';
 import 'base64url';
 import './services/credential/utils.mjs';
 import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import '@docknetwork/credential-sdk/vc/crypto';
 import './services/credential/service.mjs';
 import './services/credential/config.mjs';
 import '@docknetwork/crypto-wasm-ts';
@@ -77,7 +77,7 @@ import '@astronautlabs/jsonpath';
 import './services/credential/bbs-revocation.mjs';
 import './services/relay-service/service.mjs';
 import './services/relay-service/configs.mjs';
-import '@docknetwork/wallet-sdk-relay-service/src';
+import '@docknetwork/wallet-sdk-relay-service/lib';
 import './services/pex/service.mjs';
 import './services/pex/config.mjs';
 import './services/trust-registry/service.mjs';
@@ -91,8 +91,8 @@ import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
 import '@digitalbazaar/ed25519-verification-key-2018';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
-import '@docknetwork/wallet-sdk-data-store/src/logger';
-import '@docknetwork/wallet-sdk-wasm/src/services/keyring';
+import '@docknetwork/wallet-sdk-data-store/lib/logger';
+import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
 import 'winston-transport';
 
 initRpcClient(jsonRPCRequest => {

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-ee524484.js');
+var modules_wallet = require('../account-8f5cbc4d.js');
 require('bignumber.js');
 require('../types.js');
 require('../services/wallet/service.js');
@@ -29,8 +29,9 @@ require('../services/substrate/service.js');
 require('bn.js');
 require('../core/format-utils.js');
 require('../services/dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('./event-manager.js');

package/lib/modules/account.mjs

@@ -1,6 +1,6 @@
 import 'assert';
 import '../core/validation.mjs';
-export { c as Account } from '../account-614e6414.js';
+export { c as Account } from '../account-3c88155a.js';
 import 'bignumber.js';
 import '../types.mjs';
 import '../services/wallet/service.mjs';
@@ -25,8 +25,9 @@ import '../services/substrate/service.mjs';
 import 'bn.js';
 import '../core/format-utils.mjs';
 import '../services/dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import './event-manager.mjs';

package/lib/modules/accounts.js

@@ -8,7 +8,7 @@ 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-ee524484.js');
+var modules_wallet = require('../account-8f5cbc4d.js');
 require('../errors.js');
 require('../types.js');
 require('./event-manager.js');
@@ -32,8 +32,9 @@ require('../services/util-crypto/configs.js');
 require('bn.js');
 require('../core/format-utils.js');
 require('../services/dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../services/dock/configs.js');

package/lib/modules/accounts.mjs

@@ -4,7 +4,7 @@ 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-614e6414.js';
+export { b as Accounts, A as AccountsEvents } from '../account-3c88155a.js';
 import '../errors.mjs';
 import '../types.mjs';
 import './event-manager.mjs';
@@ -28,8 +28,9 @@ import '../services/util-crypto/configs.mjs';
 import 'bn.js';
 import '../core/format-utils.mjs';
 import '../services/dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../services/dock/configs.mjs';

package/lib/modules/wallet.js

@@ -9,13 +9,14 @@ require('../services/dock/service.js');
 require('../services/keyring/service.js');
 require('../services/util-crypto/service.js');
 require('../services/wallet/service.js');
-var modules_wallet = require('../account-ee524484.js');
+var modules_wallet = require('../account-8f5cbc4d.js');
 require('./event-manager.js');
 require('./network-manager.js');
 require('./data-migration.js');
 require('../core/logger.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../services/dock/configs.js');

package/lib/modules/wallet.mjs

@@ -5,13 +5,14 @@ import '../services/dock/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-614e6414.js';
+export { W as Wallet, a as WalletEvents } from '../account-3c88155a.js';
 import './event-manager.mjs';
 import './network-manager.mjs';
 import './data-migration.mjs';
 import '../core/logger.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../services/dock/configs.mjs';

package/lib/rpc-server.js

@@ -15,8 +15,9 @@ require('./core/validation.js');
 require('bignumber.js');
 require('./types.js');
 require('./services/dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('./modules/event-manager.js');
@@ -43,10 +44,10 @@ require('./services/util-crypto/service.js');
 require('@polkadot/util');
 require('./services/util-crypto/configs.js');
 require('./services/dids/service.js');
-require('@docknetwork/wallet-sdk-dids/src');
+require('@docknetwork/wallet-sdk-dids/lib');
 require('./services/dids/config.js');
-require('@docknetwork/sdk/utils/did');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
+require('@docknetwork/credential-sdk/keypairs');
 require('./core/polkadot-utils.js');
 require('@polkadot/keyring/pair/decode');
 require('@docknetwork/sdk/utils/misc');
@@ -55,8 +56,7 @@ require('@docknetwork/universal-wallet/methods/keypairs');
 require('base64url');
 require('./services/credential/utils.js');
 require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 require('./services/credential/service.js');
 require('./services/credential/config.js');
 require('@docknetwork/crypto-wasm-ts');
@@ -75,7 +75,7 @@ require('@astronautlabs/jsonpath');
 require('./services/credential/bbs-revocation.js');
 require('./services/relay-service/service.js');
 require('./services/relay-service/configs.js');
-require('@docknetwork/wallet-sdk-relay-service/src');
+require('@docknetwork/wallet-sdk-relay-service/lib');
 require('./services/pex/service.js');
 require('./services/pex/config.js');
 require('./services/trust-registry/service.js');
@@ -89,8 +89,8 @@ require('base64url-universal');
 require('@docknetwork/universal-wallet/crypto');
 require('@digitalbazaar/ed25519-verification-key-2018');
 require('@digitalbazaar/x25519-key-agreement-key-2020');
-require('@docknetwork/wallet-sdk-data-store/src/logger');
-require('@docknetwork/wallet-sdk-wasm/src/services/keyring');
+require('@docknetwork/wallet-sdk-data-store/lib/logger');
+require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
 
 const rpcServer = new jsonRpc2_0.JSONRPCServer();
 

package/lib/rpc-server.mjs

@@ -13,8 +13,9 @@ import './core/validation.mjs';
 import 'bignumber.js';
 import './types.mjs';
 import './services/dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import './modules/event-manager.mjs';
@@ -41,10 +42,10 @@ import './services/util-crypto/service.mjs';
 import '@polkadot/util';
 import './services/util-crypto/configs.mjs';
 import './services/dids/service.mjs';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@docknetwork/wallet-sdk-dids/lib';
 import './services/dids/config.mjs';
-import '@docknetwork/sdk/utils/did';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
+import '@docknetwork/credential-sdk/keypairs';
 import './core/polkadot-utils.mjs';
 import '@polkadot/keyring/pair/decode';
 import '@docknetwork/sdk/utils/misc';
@@ -53,8 +54,7 @@ import '@docknetwork/universal-wallet/methods/keypairs';
 import 'base64url';
 import './services/credential/utils.mjs';
 import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import '@docknetwork/credential-sdk/vc/crypto';
 import './services/credential/service.mjs';
 import './services/credential/config.mjs';
 import '@docknetwork/crypto-wasm-ts';
@@ -73,7 +73,7 @@ import '@astronautlabs/jsonpath';
 import './services/credential/bbs-revocation.mjs';
 import './services/relay-service/service.mjs';
 import './services/relay-service/configs.mjs';
-import '@docknetwork/wallet-sdk-relay-service/src';
+import '@docknetwork/wallet-sdk-relay-service/lib';
 import './services/pex/service.mjs';
 import './services/pex/config.mjs';
 import './services/trust-registry/service.mjs';
@@ -87,8 +87,8 @@ import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
 import '@digitalbazaar/ed25519-verification-key-2018';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
-import '@docknetwork/wallet-sdk-data-store/src/logger';
-import '@docknetwork/wallet-sdk-wasm/src/services/keyring';
+import '@docknetwork/wallet-sdk-data-store/lib/logger';
+import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
 
 const rpcServer = new JSONRPCServer();
 

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

@@ -3,12 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var cryptoWasmTs = require('@docknetwork/crypto-wasm-ts');
-var dock = require('@docknetwork/sdk');
 var util = require('@polkadot/util');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var dock__default = /*#__PURE__*/_interopDefaultLegacy(dock);
+var services_dock_service = require('../dock/service.js');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
+require('@docknetwork/crypto-wasm-ts/lib/index');
+require('events');
+require('../../core/logger.js');
+require('../../modules/event-manager.js');
+require('assert');
+require('../dock/configs.js');
 
 // "-32000: Client error: UnknownBlock: State already discarded for BlockId::Hash(<hash>)"
 // This means that the node has discarded old blocks to preserve space. This should not happen with a full node
@@ -18,7 +23,9 @@ async function updateMembershipWitness({ credential, membershipWitness, registry
     const member = cryptoWasmTs.Accumulator.encodePositiveNumberAsAccumulatorMember(Number(revocationId));
     let updates = [];
     try {
-        updates = await dock__default["default"].accumulatorModule.getUpdatesFromBlock(registryId, blockNo);
+        // TODO: Ensure it will for cheqd 
+        // Will be handled on https://dock-team.atlassian.net/browse/DCKW-572
+        updates = await services_dock_service.dockService.modules.accumulator.dockOnly.getUpdatesFromBlock(registryId, blockNo);
     }
     catch (err) {
         if (err.code === UnknownBlockErrorCode) {
@@ -41,9 +48,11 @@ async function updateMembershipWitness({ credential, membershipWitness, registry
             removals.push(util.hexToU8a(a));
         }
     }
-    const queriedWitnessInfo = new cryptoWasmTs.VBWitnessUpdateInfo(util.hexToU8a(updates[0].witnessUpdateInfo));
     const witness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(membershipWitness));
-    witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
+    if (updates.length) {
+        const queriedWitnessInfo = new cryptoWasmTs.VBWitnessUpdateInfo(util.hexToU8a(updates[0].witnessUpdateInfo));
+        witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
+    }
     return witness;
 }
 const getWitnessDetails = async (credential, _membershipWitness) => {
@@ -58,15 +67,15 @@ const getWitnessDetails = async (credential, _membershipWitness) => {
     const { credentialStatus } = credential;
     const registryId = credentialStatus?.id.replace('dock:accumulator:', '');
     const revocationIndex = credentialStatus.revocationId;
-    const queriedAccumulator = await dock__default["default"].accumulatorModule.getAccumulator(registryId, false);
+    const queriedAccumulator = await services_dock_service.dockService.modules.accumulator.getAccumulator(registryId, false);
     if (!queriedAccumulator) {
         throw new Error('Accumulator not found');
     }
-    const accumulator = cryptoWasmTs.PositiveAccumulator.fromAccumulated(util.hexToU8a(queriedAccumulator.accumulated));
+    const accumulator = cryptoWasmTs.PositiveAccumulator.fromAccumulated(queriedAccumulator.accumulated.bytes);
     const encodedRevId = cryptoWasmTs.Encoder.defaultEncodeFunc()(revocationIndex.toString());
-    const publicKey = await dock__default["default"].accumulatorModule.getPublicKeyByHexDid(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
+    const publicKey = await services_dock_service.dockService.modules.accumulator.getPublicKey(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
     const params = cryptoWasmTs.dockAccumulatorParams();
-    const pk = new cryptoWasmTs.AccumulatorPublicKey(util.hexToU8a(publicKey.bytes));
+    const pk = new cryptoWasmTs.AccumulatorPublicKey(publicKey.bytes);
     let membershipWitness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(witness));
     if (blockNo) {
         try {

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

@@ -1,6 +1,15 @@
 import { PositiveAccumulator, Encoder, dockAccumulatorParams, AccumulatorPublicKey, VBMembershipWitness, Accumulator, VBWitnessUpdateInfo } from '@docknetwork/crypto-wasm-ts';
-import dock from '@docknetwork/sdk';
 import { hexToU8a } from '@polkadot/util';
+import { dockService } from '../dock/service.mjs';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
+import '@docknetwork/crypto-wasm-ts/lib/index';
+import 'events';
+import '../../core/logger.mjs';
+import '../../modules/event-manager.mjs';
+import 'assert';
+import '../dock/configs.mjs';
 
 // "-32000: Client error: UnknownBlock: State already discarded for BlockId::Hash(<hash>)"
 // This means that the node has discarded old blocks to preserve space. This should not happen with a full node
@@ -10,7 +19,9 @@ async function updateMembershipWitness({ credential, membershipWitness, registry
     const member = Accumulator.encodePositiveNumberAsAccumulatorMember(Number(revocationId));
     let updates = [];
     try {
-        updates = await dock.accumulatorModule.getUpdatesFromBlock(registryId, blockNo);
+        // TODO: Ensure it will for cheqd 
+        // Will be handled on https://dock-team.atlassian.net/browse/DCKW-572
+        updates = await dockService.modules.accumulator.dockOnly.getUpdatesFromBlock(registryId, blockNo);
     }
     catch (err) {
         if (err.code === UnknownBlockErrorCode) {
@@ -33,9 +44,11 @@ async function updateMembershipWitness({ credential, membershipWitness, registry
             removals.push(hexToU8a(a));
         }
     }
-    const queriedWitnessInfo = new VBWitnessUpdateInfo(hexToU8a(updates[0].witnessUpdateInfo));
     const witness = new VBMembershipWitness(hexToU8a(membershipWitness));
-    witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
+    if (updates.length) {
+        const queriedWitnessInfo = new VBWitnessUpdateInfo(hexToU8a(updates[0].witnessUpdateInfo));
+        witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
+    }
     return witness;
 }
 const getWitnessDetails = async (credential, _membershipWitness) => {
@@ -50,15 +63,15 @@ const getWitnessDetails = async (credential, _membershipWitness) => {
     const { credentialStatus } = credential;
     const registryId = credentialStatus?.id.replace('dock:accumulator:', '');
     const revocationIndex = credentialStatus.revocationId;
-    const queriedAccumulator = await dock.accumulatorModule.getAccumulator(registryId, false);
+    const queriedAccumulator = await dockService.modules.accumulator.getAccumulator(registryId, false);
     if (!queriedAccumulator) {
         throw new Error('Accumulator not found');
     }
-    const accumulator = PositiveAccumulator.fromAccumulated(hexToU8a(queriedAccumulator.accumulated));
+    const accumulator = PositiveAccumulator.fromAccumulated(queriedAccumulator.accumulated.bytes);
     const encodedRevId = Encoder.defaultEncodeFunc()(revocationIndex.toString());
-    const publicKey = await dock.accumulatorModule.getPublicKeyByHexDid(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
+    const publicKey = await dockService.modules.accumulator.getPublicKey(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
     const params = dockAccumulatorParams();
-    const pk = new AccumulatorPublicKey(hexToU8a(publicKey.bytes));
+    const pk = new AccumulatorPublicKey(publicKey.bytes);
     let membershipWitness = new VBMembershipWitness(hexToU8a(witness));
     if (blockNo) {
         try {

package/lib/services/credential/index.js

@@ -22,8 +22,9 @@ require('@polkadot/util-crypto');
 require('@polkadot/util');
 require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
 require('../dock/service.js');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../../core/logger.js');
@@ -36,7 +37,7 @@ require('./pex-helpers.js');
 require('@astronautlabs/jsonpath');
 require('./bbs-revocation.js');
 require('../dids/service.js');
-require('@docknetwork/wallet-sdk-dids/src');
+require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
 require('../keyring/service.js');
 require('@polkadot/keyring');
@@ -46,12 +47,11 @@ require('bignumber.js');
 require('../../types.js');
 require('../util-crypto/service.js');
 require('../util-crypto/configs.js');
-require('@docknetwork/sdk/utils/did');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
+require('@docknetwork/credential-sdk/keypairs');
 require('../../core/polkadot-utils.js');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

package/lib/services/credential/index.mjs

@@ -18,8 +18,9 @@ import '@polkadot/util-crypto';
 import '@polkadot/util';
 import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 import '../dock/service.mjs';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
@@ -32,7 +33,7 @@ import './pex-helpers.mjs';
 import '@astronautlabs/jsonpath';
 import './bbs-revocation.mjs';
 import '../dids/service.mjs';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
 import '../keyring/service.mjs';
 import '@polkadot/keyring';
@@ -42,12 +43,11 @@ import 'bignumber.js';
 import '../../types.mjs';
 import '../util-crypto/service.mjs';
 import '../util-crypto/configs.mjs';
-import '@docknetwork/sdk/utils/did';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
+import '@docknetwork/credential-sdk/keypairs';
 import '../../core/polkadot-utils.mjs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import '@docknetwork/credential-sdk/vc/crypto';
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

package/lib/services/credential/service.js

@@ -25,8 +25,9 @@ require('@docknetwork/sdk/utils/misc');
 require('@polkadot/util-crypto');
 require('@polkadot/util');
 require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
-require('@docknetwork/sdk');
-require('@docknetwork/sdk/resolver');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/credential-sdk/resolver');
+require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
 require('events');
 require('../../core/logger.js');
@@ -35,7 +36,7 @@ require('../dock/configs.js');
 require('@docknetwork/crypto-wasm-ts/lib/legosnark');
 require('base64url');
 require('@astronautlabs/jsonpath');
-require('@docknetwork/wallet-sdk-dids/src');
+require('@docknetwork/wallet-sdk-dids/lib');
 require('../dids/config.js');
 require('../keyring/service.js');
 require('@polkadot/keyring');
@@ -45,12 +46,11 @@ require('bignumber.js');
 require('../../types.js');
 require('../util-crypto/service.js');
 require('../util-crypto/configs.js');
-require('@docknetwork/sdk/utils/did');
-require('@docknetwork/sdk/public-keys');
+require('@docknetwork/credential-sdk/types');
+require('@docknetwork/credential-sdk/keypairs');
 require('../../core/polkadot-utils.js');
 require('@polkadot/keyring/pair/decode');
-require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
-require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
+require('@docknetwork/credential-sdk/vc/crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/lib/services/credential/service.mjs

@@ -21,8 +21,9 @@ import '@docknetwork/sdk/utils/misc';
 import '@polkadot/util-crypto';
 import '@polkadot/util';
 import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
-import '@docknetwork/sdk';
-import '@docknetwork/sdk/resolver';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/credential-sdk/resolver';
+import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
 import 'events';
 import '../../core/logger.mjs';
@@ -31,7 +32,7 @@ import '../dock/configs.mjs';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
 import 'base64url';
 import '@astronautlabs/jsonpath';
-import '@docknetwork/wallet-sdk-dids/src';
+import '@docknetwork/wallet-sdk-dids/lib';
 import '../dids/config.mjs';
 import '../keyring/service.mjs';
 import '@polkadot/keyring';
@@ -41,12 +42,11 @@ import 'bignumber.js';
 import '../../types.mjs';
 import '../util-crypto/service.mjs';
 import '../util-crypto/configs.mjs';
-import '@docknetwork/sdk/utils/did';
-import '@docknetwork/sdk/public-keys';
+import '@docknetwork/credential-sdk/types';
+import '@docknetwork/credential-sdk/keypairs';
 import '../../core/polkadot-utils.mjs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import '@docknetwork/credential-sdk/vc/crypto';
 
 // @ts-nocheck
 const pex = new PEX();