@docknetwork/wallet-sdk-wasm 1.4.0 → 1.5.0

package/lib/services/index.mjs

@@ -1,5 +1,5 @@
 import { keyringService } from './keyring/service.mjs';
-import { dockService } from './dock/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';
@@ -18,14 +18,18 @@ import 'assert';
 import '../core/validation.mjs';
 import 'bignumber.js';
 import '../types.mjs';
-import '@docknetwork/dock-blockchain-api';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
-import '@docknetwork/dock-blockchain-modules';
 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 './dock/configs.mjs';
+import '@docknetwork/credential-sdk/types';
 import 'bn.js';
 import '../core/format-utils.mjs';
 import './substrate/api-utils.mjs';
@@ -44,26 +48,19 @@ import '@polkadot/util';
 import './util-crypto/configs.mjs';
 import '@docknetwork/wallet-sdk-dids/lib';
 import './dids/config.mjs';
-import '@docknetwork/credential-sdk/types';
-import '@docknetwork/credential-sdk/keypairs';
 import '../core/polkadot-utils.mjs';
+import '@docknetwork/credential-sdk/keypairs';
 import '@polkadot/keyring/pair/decode';
-import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import '@docknetwork/universal-wallet/methods/keypairs';
 import 'base64url';
 import './credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 import '@docknetwork/credential-sdk/vc/crypto';
 import './credential/config.mjs';
 import '@docknetwork/crypto-wasm-ts';
 import '@sphereon/oid4vci-client';
 import '@sphereon/oid4vci-common';
-import '@docknetwork/sdk/verifiable-credential';
-import '@docknetwork/sdk/utils/vc/helpers';
-import '@docknetwork/sdk/verifiable-presentation';
-import '@docknetwork/sdk/presentation';
-import '@docknetwork/sdk/utils/vc/credentials';
+import '@docknetwork/credential-sdk/vc';
 import '@sphereon/pex';
 import './credential/bound-check.mjs';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
@@ -74,7 +71,6 @@ import './relay-service/configs.mjs';
 import '@docknetwork/wallet-sdk-relay-service/lib';
 import './pex/config.mjs';
 import './trust-registry/configs.mjs';
-import '@docknetwork/sdk/utils/did/typed-did/helpers';
 import 'crypto';
 import './edv/configs.mjs';
 import '@docknetwork/universal-wallet/storage/edv-http-storage';
@@ -82,13 +78,14 @@ import './edv/hmac.mjs';
 import 'base64url-universal';
 import '@docknetwork/universal-wallet/crypto';
 import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/ed25519-verification-key-2020';
 import '@digitalbazaar/x25519-key-agreement-key-2020';
 import '@docknetwork/wallet-sdk-data-store/lib/logger';
 import '@docknetwork/wallet-sdk-wasm/lib/services/keyring';
 
 var services = [
   keyringService,
-  dockService,
+  blockchainService,
   substrateService,
   walletService,
   polkadotService,

package/lib/services/keyring/configs.js

@@ -46,6 +46,18 @@ const validation = {
             assert__default["default"](typeof meta === 'object', 'invalid meta');
         }
     },
+    createFromPair(params) {
+        const { pair, meta, type } = params;
+        assert__default["default"](typeof pair === 'object', 'invalid pair');
+        assert__default["default"](pair.publicKey instanceof Uint8Array, 'invalid publicKey');
+        assert__default["default"](pair.secretKey instanceof Uint8Array, 'invalid secretKey');
+        if (type) {
+            core_validation.assertKeyType(type);
+        }
+        if (meta) {
+            assert__default["default"](typeof meta === 'object', 'invalid meta');
+        }
+    },
     signData(params) {
         assert__default["default"](!!params.keyPair, 'invalid keypair');
         assert__default["default"](!!params.data, 'invalid data');

package/lib/services/keyring/configs.mjs

@@ -38,6 +38,18 @@ const validation = {
             assert(typeof meta === 'object', 'invalid meta');
         }
     },
+    createFromPair(params) {
+        const { pair, meta, type } = params;
+        assert(typeof pair === 'object', 'invalid pair');
+        assert(pair.publicKey instanceof Uint8Array, 'invalid publicKey');
+        assert(pair.secretKey instanceof Uint8Array, 'invalid secretKey');
+        if (type) {
+            assertKeyType(type);
+        }
+        if (meta) {
+            assert(typeof meta === 'object', 'invalid meta');
+        }
+    },
     signData(params) {
         assert(!!params.keyPair, 'invalid keypair');
         assert(!!params.data, 'invalid data');

package/lib/services/keyring/service.js

@@ -65,6 +65,11 @@ class KeyringService {
         const { mnemonic, meta, type, derivePath = '' } = params;
         return this.keyring.createFromUri(`${mnemonic.trim()}${derivePath}`, meta, type);
     }
+    createFromPair(params) {
+        services_keyring_configs.validation.createFromPair(params);
+        const { pair, meta, type } = params;
+        return this.keyring.createFromPair(pair, meta, type);
+    }
     getKeyringPairJSON(params) {
         return this.getKeyringPair(params).toJson();
     }

package/lib/services/keyring/service.mjs

@@ -57,6 +57,11 @@ class KeyringService {
         const { mnemonic, meta, type, derivePath = '' } = params;
         return this.keyring.createFromUri(`${mnemonic.trim()}${derivePath}`, meta, type);
     }
+    createFromPair(params) {
+        validation.createFromPair(params);
+        const { pair, meta, type } = params;
+        return this.keyring.createFromPair(pair, meta, type);
+    }
     getKeyringPairJSON(params) {
         return this.getKeyringPair(params).toJson();
     }

package/lib/services/pex/service.js

@@ -16,36 +16,38 @@ const pex = new pex$1.PEX();
  * This is a temporary workaround until the issue is fixed in the @sphereon/pex library
  **/
 function removeOptionalAttribute(presentationDefinition) {
-    presentationDefinition.input_descriptors.forEach(inputDescriptor => {
+    // Deep clone the presentationDefinition to avoid mutating the original
+    const clonedPresentationDefinition = JSON.parse(JSON.stringify(presentationDefinition));
+    clonedPresentationDefinition.input_descriptors.forEach(inputDescriptor => {
         if (!inputDescriptor.constraints?.fields?.length) {
             return;
         }
         // Filter the optional fields
-        // If we include those fields, it might exclude few credentials from the resulsts
-        // e.g: Expiration date as optional, a credenntial without expiration date should be included
         inputDescriptor.constraints.fields =
             inputDescriptor.constraints.fields.filter(field => field.optional !== true);
-        // Removes the optinal attributes from the fields
-        // It applies in case optional: false
-        // The field is required, but pex doesn't support the attribute
-        inputDescriptor.constraints.fields.forEach(field => {
-            if (field.optional !== undefined) {
-                delete field.optional;
+        inputDescriptor.constraints.fields = inputDescriptor.constraints.fields.map(field => {
+            const updatedField = { ...field };
+            // Remove the optional attribute if it exists
+            if (updatedField.optional !== undefined) {
+                delete updatedField.optional;
             }
+            // Remove the did format attribute if it exists
+            if (updatedField.filter?.format === 'did') {
+                delete updatedField.filter.format;
+            }
+            return updatedField;
         });
-        // There is a case where ALL fields are optional
-        // If we remove all fields, it will cause an error with PEX
-        // So, we add a placeholder field to avoid the error
+        // Handle case where all fields are optional
         if (inputDescriptor.constraints.fields.length === 0) {
             inputDescriptor.constraints.fields.push({
                 path: ['$.id'],
             });
         }
     });
-    if (!presentationDefinition.id) {
-        presentationDefinition.id = 'id';
+    if (!clonedPresentationDefinition.id) {
+        clonedPresentationDefinition.id = 'id';
     }
-    return presentationDefinition;
+    return clonedPresentationDefinition;
 }
 class PEXService {
     name;

package/lib/services/pex/service.mjs

@@ -12,36 +12,38 @@ const pex = new PEX();
  * This is a temporary workaround until the issue is fixed in the @sphereon/pex library
  **/
 function removeOptionalAttribute(presentationDefinition) {
-    presentationDefinition.input_descriptors.forEach(inputDescriptor => {
+    // Deep clone the presentationDefinition to avoid mutating the original
+    const clonedPresentationDefinition = JSON.parse(JSON.stringify(presentationDefinition));
+    clonedPresentationDefinition.input_descriptors.forEach(inputDescriptor => {
         if (!inputDescriptor.constraints?.fields?.length) {
             return;
         }
         // Filter the optional fields
-        // If we include those fields, it might exclude few credentials from the resulsts
-        // e.g: Expiration date as optional, a credenntial without expiration date should be included
         inputDescriptor.constraints.fields =
             inputDescriptor.constraints.fields.filter(field => field.optional !== true);
-        // Removes the optinal attributes from the fields
-        // It applies in case optional: false
-        // The field is required, but pex doesn't support the attribute
-        inputDescriptor.constraints.fields.forEach(field => {
-            if (field.optional !== undefined) {
-                delete field.optional;
+        inputDescriptor.constraints.fields = inputDescriptor.constraints.fields.map(field => {
+            const updatedField = { ...field };
+            // Remove the optional attribute if it exists
+            if (updatedField.optional !== undefined) {
+                delete updatedField.optional;
             }
+            // Remove the did format attribute if it exists
+            if (updatedField.filter?.format === 'did') {
+                delete updatedField.filter.format;
+            }
+            return updatedField;
         });
-        // There is a case where ALL fields are optional
-        // If we remove all fields, it will cause an error with PEX
-        // So, we add a placeholder field to avoid the error
+        // Handle case where all fields are optional
         if (inputDescriptor.constraints.fields.length === 0) {
             inputDescriptor.constraints.fields.push({
                 path: ['$.id'],
             });
         }
     });
-    if (!presentationDefinition.id) {
-        presentationDefinition.id = 'id';
+    if (!clonedPresentationDefinition.id) {
+        clonedPresentationDefinition.id = 'id';
     }
-    return presentationDefinition;
+    return clonedPresentationDefinition;
 }
 class PEXService {
     name;

package/lib/services/substrate/api-utils.js

@@ -5,13 +5,25 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var assert = require('assert');
 var events = require('events');
 var core_logger = require('../../core/logger.js');
-var services_dock_service = require('../dock/service.js');
-require('@docknetwork/dock-blockchain-api');
+var services_blockchain_service = require('../blockchain/service.js');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
-require('@docknetwork/dock-blockchain-modules');
 require('@docknetwork/crypto-wasm-ts/lib/index');
+require('@docknetwork/dock-blockchain-api');
+require('@docknetwork/dock-blockchain-modules');
 require('../../modules/event-manager.js');
-require('../dock/configs.js');
+require('../util-crypto/service.js');
+require('@polkadot/keyring');
+require('@polkadot/util');
+require('@polkadot/util-crypto');
+require('../util-crypto/configs.js');
+require('../../core/validation.js');
+require('bignumber.js');
+require('../../types.js');
+require('@docknetwork/credential-sdk/types');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -19,7 +31,7 @@ var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 
 // @ts-nocheck
 const extrisicErrorsFilter = ({ event }) => {
-    return services_dock_service.dockService.dock.api.events.system.ExtrinsicFailed.is(event);
+    return services_blockchain_service.blockchainService.dock.api.events.system.ExtrinsicFailed.is(event);
 };
 const mapEventToErrorMessage = ({ event }) => {
     assert__default["default"](!!event, 'event is required');
@@ -27,7 +39,7 @@ const mapEventToErrorMessage = ({ event }) => {
     assert__default["default"](!!error, 'error is required');
     if (error.isModule) {
         // for module errors, we have the section indexed, lookup
-        const decoded = services_dock_service.dockService.dock.api.registry.findMetaError(error.asModule);
+        const decoded = services_blockchain_service.blockchainService.dock.api.registry.findMetaError(error.asModule);
         const { docs, method, section } = decoded;
         return `${section}.${method}: ${docs.join(' ')}`;
     }

package/lib/services/substrate/api-utils.mjs

@@ -1,17 +1,29 @@
 import assert from 'assert';
 import { EventEmitter } from 'events';
 import { Logger } from '../../core/logger.mjs';
-import { dockService } from '../dock/service.mjs';
-import '@docknetwork/dock-blockchain-api';
+import { blockchainService } from '../blockchain/service.mjs';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
-import '@docknetwork/dock-blockchain-modules';
 import '@docknetwork/crypto-wasm-ts/lib/index';
+import '@docknetwork/dock-blockchain-api';
+import '@docknetwork/dock-blockchain-modules';
 import '../../modules/event-manager.mjs';
-import '../dock/configs.mjs';
+import '../util-crypto/service.mjs';
+import '@polkadot/keyring';
+import '@polkadot/util';
+import '@polkadot/util-crypto';
+import '../util-crypto/configs.mjs';
+import '../../core/validation.mjs';
+import 'bignumber.js';
+import '../../types.mjs';
+import '@docknetwork/credential-sdk/types';
 
 // @ts-nocheck
 const extrisicErrorsFilter = ({ event }) => {
-    return dockService.dock.api.events.system.ExtrinsicFailed.is(event);
+    return blockchainService.dock.api.events.system.ExtrinsicFailed.is(event);
 };
 const mapEventToErrorMessage = ({ event }) => {
     assert(!!event, 'event is required');
@@ -19,7 +31,7 @@ const mapEventToErrorMessage = ({ event }) => {
     assert(!!error, 'error is required');
     if (error.isModule) {
         // for module errors, we have the section indexed, lookup
-        const decoded = dockService.dock.api.registry.findMetaError(error.asModule);
+        const decoded = blockchainService.dock.api.registry.findMetaError(error.asModule);
         const { docs, method, section } = decoded;
         return `${section}.${method}: ${docs.join(' ')}`;
     }

package/lib/services/substrate/index.js

@@ -9,20 +9,27 @@ require('bn.js');
 require('../../core/format-utils.js');
 require('../../core/validation.js');
 require('../../types.js');
-require('../dock/service.js');
-require('@docknetwork/dock-blockchain-api');
+require('../blockchain/service.js');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
-require('@docknetwork/dock-blockchain-modules');
 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('../dock/configs.js');
+require('../util-crypto/service.js');
+require('@polkadot/keyring');
+require('@polkadot/util');
+require('@polkadot/util-crypto');
+require('../util-crypto/configs.js');
+require('@docknetwork/credential-sdk/types');
 require('./api-utils.js');
 require('./configs.js');
 require('../keyring/service.js');
-require('@polkadot/keyring');
-require('@polkadot/util-crypto');
 require('../keyring/configs.js');
 
 

package/lib/services/substrate/index.mjs

@@ -5,18 +5,25 @@ import 'bn.js';
 import '../../core/format-utils.mjs';
 import '../../core/validation.mjs';
 import '../../types.mjs';
-import '../dock/service.mjs';
-import '@docknetwork/dock-blockchain-api';
+import '../blockchain/service.mjs';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
-import '@docknetwork/dock-blockchain-modules';
 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 '../dock/configs.mjs';
+import '../util-crypto/service.mjs';
+import '@polkadot/keyring';
+import '@polkadot/util';
+import '@polkadot/util-crypto';
+import '../util-crypto/configs.mjs';
+import '@docknetwork/credential-sdk/types';
 import './api-utils.mjs';
 import './configs.mjs';
 import '../keyring/service.mjs';
-import '@polkadot/keyring';
-import '@polkadot/util-crypto';
 import '../keyring/configs.mjs';

package/lib/services/substrate/service.js

@@ -6,22 +6,29 @@ var assert = require('assert');
 var BigNumber = require('bignumber.js');
 var BN = require('bn.js');
 var core_formatUtils = require('../../core/format-utils.js');
-var services_dock_service = require('../dock/service.js');
+var services_blockchain_service = require('../blockchain/service.js');
 var services_substrate_apiUtils = require('./api-utils.js');
 var services_substrate_configs = require('./configs.js');
 var services_keyring_service = require('../keyring/service.js');
 require('../../core/validation.js');
 require('../../types.js');
-require('@docknetwork/dock-blockchain-api');
+require('@cosmjs/proto-signing');
+require('@docknetwork/cheqd-blockchain-api');
+require('@docknetwork/cheqd-blockchain-modules');
+require('@docknetwork/credential-sdk/modules');
 require('@docknetwork/credential-sdk/resolver');
-require('@docknetwork/dock-blockchain-modules');
 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('../dock/configs.js');
+require('../util-crypto/service.js');
 require('@polkadot/keyring');
+require('@polkadot/util');
 require('@polkadot/util-crypto');
+require('../util-crypto/configs.js');
+require('@docknetwork/credential-sdk/types');
 require('../keyring/configs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -48,9 +55,9 @@ class SubstrateService {
     async getAccountBalance(params) {
         services_substrate_configs.validation.getAccountBalance(params);
         console.log('ensure dock ready');
-        await services_dock_service.dockService.ensureDockReady();
+        await services_blockchain_service.blockchainService.ensureBlockchainReady();
         console.log('ensure dock ready done');
-        const { data: { free }, } = await services_dock_service.dockService.dock.api.query.system.account(params.address);
+        const { data: { free }, } = await services_blockchain_service.blockchainService.dock.api.query.system.account(params.address);
         return free.toNumber() / core_formatUtils.DOCK_TOKEN_UNIT;
     }
     async getFeeAmount(params) {
@@ -61,8 +68,8 @@ class SubstrateService {
             jsonData: keyPair,
             password: '',
         });
-        services_dock_service.dockService.dock.setAccount(account);
-        const extrinsic = services_dock_service.dockService.dock.api.tx.balances.transfer(toAddress, amount);
+        services_blockchain_service.blockchainService.dock.setAccount(account);
+        const extrinsic = services_blockchain_service.blockchainService.dock.api.tx.balances.transfer(toAddress, amount);
         const paymentInfo = await extrinsic.paymentInfo(account);
         const fee = getFeeWithBuffer(paymentInfo.partialFee)
             .dividedBy(core_formatUtils.DOCK_TOKEN_UNIT)
@@ -77,7 +84,7 @@ class SubstrateService {
             jsonData: keyPair,
             password: '',
         });
-        const { dock } = services_dock_service.dockService;
+        const { dock } = services_blockchain_service.blockchainService;
         dock.setAccount(account);
         if (params.transferAll) {
             const api = dock.api;

package/lib/services/substrate/service.mjs

@@ -2,22 +2,29 @@ import assert from 'assert';
 import BigNumber from 'bignumber.js';
 import BN from 'bn.js';
 import { DOCK_TOKEN_UNIT, getPlainDockAmount } from '../../core/format-utils.mjs';
-import { dockService } from '../dock/service.mjs';
+import { blockchainService } from '../blockchain/service.mjs';
 import { signAndSend } from './api-utils.mjs';
 import { serviceName, validation } from './configs.mjs';
 import { keyringService } from '../keyring/service.mjs';
 import '../../core/validation.mjs';
 import '../../types.mjs';
-import '@docknetwork/dock-blockchain-api';
+import '@cosmjs/proto-signing';
+import '@docknetwork/cheqd-blockchain-api';
+import '@docknetwork/cheqd-blockchain-modules';
+import '@docknetwork/credential-sdk/modules';
 import '@docknetwork/credential-sdk/resolver';
-import '@docknetwork/dock-blockchain-modules';
 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 '../dock/configs.mjs';
+import '../util-crypto/service.mjs';
 import '@polkadot/keyring';
+import '@polkadot/util';
 import '@polkadot/util-crypto';
+import '../util-crypto/configs.mjs';
+import '@docknetwork/credential-sdk/types';
 import '../keyring/configs.mjs';
 
 // @ts-nocheck
@@ -38,9 +45,9 @@ class SubstrateService {
     async getAccountBalance(params) {
         validation.getAccountBalance(params);
         console.log('ensure dock ready');
-        await dockService.ensureDockReady();
+        await blockchainService.ensureBlockchainReady();
         console.log('ensure dock ready done');
-        const { data: { free }, } = await dockService.dock.api.query.system.account(params.address);
+        const { data: { free }, } = await blockchainService.dock.api.query.system.account(params.address);
         return free.toNumber() / DOCK_TOKEN_UNIT;
     }
     async getFeeAmount(params) {
@@ -51,8 +58,8 @@ class SubstrateService {
             jsonData: keyPair,
             password: '',
         });
-        dockService.dock.setAccount(account);
-        const extrinsic = dockService.dock.api.tx.balances.transfer(toAddress, amount);
+        blockchainService.dock.setAccount(account);
+        const extrinsic = blockchainService.dock.api.tx.balances.transfer(toAddress, amount);
         const paymentInfo = await extrinsic.paymentInfo(account);
         const fee = getFeeWithBuffer(paymentInfo.partialFee)
             .dividedBy(DOCK_TOKEN_UNIT)
@@ -67,7 +74,7 @@ class SubstrateService {
             jsonData: keyPair,
             password: '',
         });
-        const { dock } = dockService;
+        const { dock } = blockchainService;
         dock.setAccount(account);
         if (params.transferAll) {
             const api = dock.api;