@docknetwork/wallet-sdk-wasm 1.5.8 → 1.5.9

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/index.js

@@ -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

@@ -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.js

@@ -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/service.mjs

@@ -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/index.js

@@ -2,7 +2,6 @@
 
 var services_keyring_service = require('./keyring/service.js');
 var services_blockchain_service = require('./blockchain/service.js');
-var services_substrate_service = require('./substrate/service.js');
 var services_wallet_service = require('./wallet/service.js');
 var services_polkadot_service = require('./polkadot/service.js');
 var services_utilCrypto_service = require('./util-crypto/service.js');
@@ -11,7 +10,6 @@ var services_dids_service = require('./dids/service.js');
 var services_credential_service = require('./credential/service.js');
 var services_relayService_service = require('./relay-service/service.js');
 var services_pex_service = require('./pex/service.js');
-var services_trustRegistry_service = require('./trust-registry/service.js');
 var services_edv_service = require('./edv/service.js');
 require('@polkadot/keyring');
 require('@polkadot/util-crypto');
@@ -26,16 +24,10 @@ 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');
 require('@docknetwork/credential-sdk/types');
-require('bn.js');
-require('../core/format-utils.js');
-require('./substrate/api-utils.js');
-require('./substrate/configs.js');
 require('uuid');
 require('../wallet/memory-storage-wallet.js');
 require('@docknetwork/universal-wallet/storage-wallet');
@@ -72,8 +64,6 @@ require('./credential/bbs-revocation.js');
 require('./relay-service/configs.js');
 require('@docknetwork/wallet-sdk-relay-service/lib');
 require('./pex/config.js');
-require('./trust-registry/configs.js');
-require('crypto');
 require('./edv/configs.js');
 require('@docknetwork/universal-wallet/storage/edv-http-storage');
 require('./edv/hmac.js');
@@ -88,7 +78,6 @@ require('@docknetwork/wallet-sdk-wasm/lib/services/keyring');
 var services = [
   services_keyring_service.keyringService,
   services_blockchain_service.blockchainService,
-  services_substrate_service.substrateService,
   services_wallet_service.walletService,
   services_polkadot_service.polkadotService,
   services_utilCrypto_service.utilCryptoService,
@@ -97,7 +86,6 @@ var services = [
   services_credential_service.credentialService,
   services_relayService_service.relayService,
   services_pex_service.pexService,
-  services_trustRegistry_service.trustRegistryService,
   services_edv_service.edvService,
 ];
 

package/lib/services/index.mjs

@@ -1,6 +1,5 @@
 import { keyringService } from './keyring/service.mjs';
 import { blockchainService } from './blockchain/service.mjs';
-import { substrateService } from './substrate/service.mjs';
 import { walletService } from './wallet/service.mjs';
 import { polkadotService } from './polkadot/service.mjs';
 import { utilCryptoService } from './util-crypto/service.mjs';
@@ -9,7 +8,6 @@ import { didService } from './dids/service.mjs';
 import { credentialService } from './credential/service.mjs';
 import { relayService } from './relay-service/service.mjs';
 import { pexService } from './pex/service.mjs';
-import { trustRegistryService } from './trust-registry/service.mjs';
 import { edvService } from './edv/service.mjs';
 import '@polkadot/keyring';
 import '@polkadot/util-crypto';
@@ -24,16 +22,10 @@ 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';
 import '@docknetwork/credential-sdk/types';
-import 'bn.js';
-import '../core/format-utils.mjs';
-import './substrate/api-utils.mjs';
-import './substrate/configs.mjs';
 import 'uuid';
 import '../wallet/memory-storage-wallet.mjs';
 import '@docknetwork/universal-wallet/storage-wallet';
@@ -70,8 +62,6 @@ import './credential/bbs-revocation.mjs';
 import './relay-service/configs.mjs';
 import '@docknetwork/wallet-sdk-relay-service/lib';
 import './pex/config.mjs';
-import './trust-registry/configs.mjs';
-import 'crypto';
 import './edv/configs.mjs';
 import '@docknetwork/universal-wallet/storage/edv-http-storage';
 import './edv/hmac.mjs';
@@ -86,7 +76,6 @@ import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
 var services = [
   keyringService,
   blockchainService,
-  substrateService,
   walletService,
   polkadotService,
   utilCryptoService,
@@ -95,7 +84,6 @@ var services = [
   credentialService,
   relayService,
   pexService,
-  trustRegistryService,
   edvService,
 ];
 

package/lib/services/pex/service.js

@@ -73,7 +73,8 @@ class PEXService {
     }
     presentationFrom(params) {
         const { credentials, presentationDefinition, holderDID } = params;
-        const result = pex.presentationFrom(removeOptionalAttribute(presentationDefinition), credentials, holderDID);
+        const evaluateResult = pex.evaluateCredentials(removeOptionalAttribute(presentationDefinition), credentials, holderDID);
+        const result = pex.presentationFrom(presentationDefinition, evaluateResult.verifiableCredential, holderDID);
         return result;
     }
 }

package/lib/services/pex/service.mjs

@@ -69,7 +69,8 @@ class PEXService {
     }
     presentationFrom(params) {
         const { credentials, presentationDefinition, holderDID } = params;
-        const result = pex.presentationFrom(removeOptionalAttribute(presentationDefinition), credentials, holderDID);
+        const evaluateResult = pex.evaluateCredentials(removeOptionalAttribute(presentationDefinition), credentials, holderDID);
+        const result = pex.presentationFrom(presentationDefinition, evaluateResult.verifiableCredential, holderDID);
         return result;
     }
 }