@docknetwork/wallet-sdk-wasm 1.5.6 → 1.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-wasm",
-    "version": "1.5.6",
+    "version": "1.5.9",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",
@@ -25,12 +25,13 @@
         "@polkadot/util-crypto": "10.1.11"
     },
     "dependencies": {
+        "p-limit": "2.3.0",
         "@astronautlabs/jsonpath": "^1.1.2",
         "@docknetwork/universal-wallet": "^2.0.1",
-        "@docknetwork/wallet-sdk-dids": "^1.5.6",
+        "@docknetwork/wallet-sdk-dids": "^1.5.9",
         "@cosmjs/proto-signing": "^0.32.4",
-        "@docknetwork/cheqd-blockchain-api": "0.30.2",
-        "@docknetwork/cheqd-blockchain-modules": "0.30.2",
+        "@docknetwork/cheqd-blockchain-api": "0.36.1",
+        "@docknetwork/cheqd-blockchain-modules": "0.33.0",
         "@polkadot/api": "9.7.1",
         "@polkadot/keyring": "10.1.11",
         "@polkadot/rpc-core": "9.7.1",
@@ -41,8 +42,7 @@
         "@polkadot/util": "10.1.11",
         "@polkadot/util-crypto": "10.1.11",
         "@polkadot/wasm-crypto": "6.3.1",
-        "@docknetwork/credential-sdk": "0.44.0",
-        "@docknetwork/dock-blockchain-modules": "0.26.2",
+        "@docknetwork/credential-sdk": "0.50.0",
         "@sphereon/oid4vci-client": "^0.16.0",
         "@sphereon/oid4vci-common": "^0.16.0",
         "axios": "^0.25.0",
@@ -54,8 +54,7 @@
         "winston": "^3.3.3",
         "cwait": "1.1.2",
         "axios-retry": "^3.2.5",
-        "@sphereon/pex": "^1.1.4",
-        "@docknetwork/dock-blockchain-api": "0.6.1"
+        "@sphereon/pex": "^1.1.4"
     },
     "devDependencies": {
         "@babel/node": "^7.16.0",

package/src/modules/accounts.test.js

@@ -1,4 +1,3 @@
-import {substrateService} from '../services/substrate';
 import {Accounts} from './accounts';
 import {Wallet} from './wallet';
 import {getTestWallet} from '../test/setup-test-state';
@@ -43,30 +42,6 @@ describe('Accounts module', () => {
     expect(account.address).toBe(address);
   });
 
-  it('expect to fetch account balance and update currency document', async () => {
-    const account = await accounts.create({
-      name: 'test',
-    });
-    const balance = 10;
-    jest.spyOn(substrateService, 'getAccountBalance').mockReturnValue(balance);
-
-    let result = await accounts.fetchBalance(account.address);
-
-    expect(substrateService.getAccountBalance).toBeCalled();
-    expect(result).toBe(balance);
-
-    const currency = await accounts.findCorrelationByType(
-      account.address,
-      'Currency',
-    );
-
-    expect(currency.value).toBe(balance);
-
-    result = await accounts.getBalance(account.address);
-
-    expect(result).toBe(balance);
-  });
-
   it('Expect to export account and import account', async () => {
     const account = await accounts.create({
       name: 'test',

package/src/modules/accounts.ts

@@ -3,7 +3,6 @@ import assert from 'assert';
 import {walletService as _walletService} from '../services/wallet';
 import {utilCryptoService} from '../services/util-crypto';
 import {keyringService} from '../services/keyring';
-import {substrateService} from '../services/substrate';
 import {polkadotService} from '../services/polkadot';
 import {Wallet, WalletEvents} from './wallet';
 import {Errors} from '../errors';
@@ -70,38 +69,6 @@ export class Accounts {
     });
   }
 
-  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');
 

package/src/modules/data-migration.test.js

@@ -1,14 +1,7 @@
 import {Wallet} from './wallet';
 import walletLegacyData from '../test/fixtures/legacy-wallet-schema.json';
-import {mockDockService} from '../services/test-utils';
 
 describe('DataMigration', () => {
-  let unmockDockService;
-
-  beforeAll(async () => {
-    unmockDockService = await mockDockService();
-  });
-
   describe('migrate wallet from v0.1 to v0.2 (file1)', () => {
     let wallet: Wallet;
 
@@ -65,8 +58,4 @@ describe('DataMigration', () => {
     const wallet = await Wallet.create({walletId: 'bad-documents'});
     await wallet.load();
   });
-
-  afterAll(() => {
-    return unmockDockService();
-  });
 });

package/src/modules/network-manager.ts

@@ -12,16 +12,16 @@ export type NetworkId = 'mainnet' | 'testnet' | 'local' | 'custom';
 
 export const SUBSTRATE_NETWORKS : Record<NetworkId, NetworkInfo> = {
   mainnet: {
-    name: 'Dock PoS Mainnet',
+    name: 'Cheqd Mainnet',
     substrateUrl: null,
     addressPrefix: 22,
-    cheqdApiUrl: 'https://mainnet.cheqd.docknode.io/',
+    cheqdApiUrl: 'https://mainnet.cheqd.docknode.io',
   },
   testnet: {
-    name: 'Dock PoS Testnet',
+    name: 'Cheqd Testnet',
     substrateUrl: null,
     addressPrefix: 21,
-    cheqdApiUrl: 'https://testnet.cheqd.docknode.io/',
+    cheqdApiUrl: 'https://testnet.cheqd.docknode.io',
   },
   local: {
     name: 'Local Node',

package/src/modules/wallet.test.js

@@ -1,15 +1,8 @@
 import {Wallet, WalletEvents} from './wallet';
 import walletJson from '../test/fixtures/wallet-backup.json';
-import {mockDockService} from '../services/test-utils';
 import {getTestWallet} from '../test/setup-test-state';
 
 describe('ApiModule', () => {
-  let unmockDockService;
-
-  beforeAll(async () => {
-    unmockDockService = await mockDockService();
-  });
-
   describe('new wallet', () => {
     let wallet: Wallet;
 
@@ -220,8 +213,4 @@ describe('ApiModule', () => {
       );
     });
   });
-
-  afterAll(async () => {
-    await unmockDockService();
-  });
 });

package/src/modules/wallet.ts

@@ -234,7 +234,7 @@ class Wallet {
       }
 
       await blockchainService.init({
-        address: networkInfo.substrateUrl,
+        cheqdApiUrl: networkInfo.cheqdApiUrl,
       });
 
       this.eventManager.emit(WalletEvents.networkConnected);

package/src/services/blockchain/index.test.js

@@ -1,34 +1,23 @@
 import {NetworkManager} from '../../modules/network-manager';
-import {assertRpcService, mockDockSdkConnection} from '../test-utils';
+import {assertRpcService} from '../test-utils';
 import {validation} from './configs';
 import {blockchainService as service} from './service';
 import {BlockchainServiceRpc} from './service-rpc';
 
-const doConnect = (
-  address = NetworkManager.getInstance().getNetworkInfo().substrateUrl,
-) =>
-  service.init({
-    address,
-  });
-
 describe('DockService', () => {
   it('ServiceRpc', () => {
     assertRpcService(BlockchainServiceRpc, service, validation);
   });
 
   describe('init', () => {
-    afterEach(async () => {
-      await service.disconnect();
-    });
-
     it('connect and disconnect substrate node', async () => {
-      const mock = mockDockSdkConnection();
-      const result = await doConnect();
+      const result = await service.init({
+        cheqdApiUrl: NetworkManager.getInstance().getNetworkInfo().cheqdApiUrl,
+      });
       expect(result).toBe(true);
       expect(service.isBlockchainReady).toBeTruthy();
       await service.disconnect();
       expect(service.isBlockchainReady).toBeFalsy();
-      mock.clear();
     });
   });
 });

package/src/services/blockchain/service.ts

@@ -12,12 +12,6 @@ import {
   WILDCARD,
 } from '@docknetwork/credential-sdk/resolver';
 import {initializeWasm} from '@docknetwork/crypto-wasm-ts/lib/index';
-
-import {DockAPI} from '@docknetwork/dock-blockchain-api';
-import {
-  DockCoreModules,
-  DockDIDModule,
-} from '@docknetwork/dock-blockchain-modules';
 import {EventEmitter} from 'events';
 import {Logger} from '../../core/logger';
 import {once} from '../../modules/event-manager';
@@ -27,47 +21,25 @@ import {InitParams} from './configs';
 export const universalResolverUrl = 'https://uniresolver.truvera.io';
 
 import {
-  CheqdAccumulatorCommon,
-  CheqdAccumulatorId,
-  CheqdAccumulatorPublicKey,
-  DockAccumulatorCommon,
-  DockAccumulatorId,
-  DockAccumulatorPublicKey,
+  AccumulatorCommon,
+  AccumulatorId,
+  AccumulatorPublicKey,
 } from '@docknetwork/credential-sdk/types';
 
 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,
-  },
-};
-
 /**
  *
  */
 export class BlockchainService {
   dock;
   modules;
-  didModule;
   cheqdApi;
+  cheqdApiUrl;
   isBlockchainReady = false;
   resolver: any;
-  dockEnabled: boolean;
   static Events = {
     BLOCKCHAIN_READY: 'blockchain-ready',
   };
@@ -82,32 +54,20 @@ export 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 {
+        PublicKey: AccumulatorPublicKey,
+        AccumulatorId,
+        AccumulatorCommon,
+        AccumulatorModule: this.modules.accumulator,
     }
-    return types;
   }
 
   /**
@@ -135,63 +95,47 @@ export class BlockchainService {
    * @returns
    */
   async init(params: InitParams) {
-    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.modules = new MultiApiCoreModules([this.cheqdModules]);
 
-    this.dockEnabled = !!params.substrateUrl;
+    const checkdApiUrl = params?.cheqdApiUrl;
+    const cheqdNetworkId = params?.networkId;
+    const cheqdMnemonic =
+      params?.cheqdMnemonic || (await utilCryptoService.mnemonicGenerate(12));
 
-    if (this.dockEnabled) {
-      await this.dock.init({
-        address: params.substrateUrl,
-      });
-      Logger.info(`Substrate initialized at: ${params.address}`);
-    }
+    const wallet = await DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
+      prefix: 'cheqd',
+    });
 
-    this.modules = new MultiApiCoreModules(
-      this.dockEnabled
-        ? [this.dockModules, this.cheqdModules]
-        : [this.cheqdModules],
-    );
+    const walletAccounts = await wallet.getAccounts();
+    const [{address}] = walletAccounts;
+    console.log('Using cheqd account:', address);
 
-    if (params?.cheqdApiUrl) {
-      const checkdApiUrl = params?.cheqdApiUrl;
-      const cheqdNetworkId = params?.networkId;
-      const cheqdMnemonic =
-        params?.cheqdMnemonic || (await utilCryptoService.mnemonicGenerate(12));
+    Logger.info(
+      `Attempt to initialized cheqd at: ${checkdApiUrl} with networkId: ${cheqdNetworkId}`,
+    );
+    Logger.info(`Using cheqd account: ${address}`);
 
-      const wallet = await DirectSecp256k1HdWallet.fromMnemonic(cheqdMnemonic, {
-        prefix: 'cheqd',
+    try {
+      await this.cheqdApi.init({
+        wallet,
+        url: checkdApiUrl,
+        network: cheqdNetworkId,
       });
-
-      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}`);
-      }
+      Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
+    } catch (err) {
+      console.error(err);
+      debugger;
+      Logger.error(`Failed to initialize cheqd at: ${checkdApiUrl}`);
     }
 
-    this.address = params.address;
 
     this.resolver = this.createDIDResolver();
 
@@ -214,10 +158,6 @@ export 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();
     }
@@ -246,7 +186,7 @@ export class BlockchainService {
   }
 
   async getAddress() {
-    return this.dock.address;
+    return this.cheqdApiUrl;
   }
 
   _setBlockchainReady(isBlockchainReady) {

package/src/services/dids/index.test.js

@@ -100,7 +100,7 @@ describe('DID Service', () => {
   it('expect to get did document', async () => {
     const document = 'document';
     jest
-      .spyOn(blockchainService.didModule, 'getDocument')
+      .spyOn(blockchainService.modules.did, 'getDocument')
       .mockResolvedValue(document);
 
     const result = await service.getDidDockDocument(

package/src/services/dids/service.ts

@@ -137,7 +137,7 @@ class DIDService {
   async getDidDockDocument(did) {
     assert(!!did, 'DID is required');
     const dock = blockchainService.dock;
-    const result = await blockchainService.didModule.getDocument(did);
+    const result = await blockchainService.modules.did.getDocument(did);
     return result;
   }
 }

package/src/services/edv/hmac.ts

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

package/src/services/edv/index.test.js

@@ -1,3 +1,5 @@
+import base64url from 'base64url-universal';
+
 import {assertRpcService} from '../test-utils';
 import {validation} from './configs';
 import {edvService as service} from './service';
@@ -23,10 +25,13 @@ describe('EDVService', () => {
 
     describe('deriveKeys', () => {
       it('should derive EDV keys', async () => {
-        const testMasterKey = '0O+9vxwb3Zo/9AVcQfVeQ59wvgcYUVH/mTye6islspM=';
+        const testMasterKey = new Uint8Array(
+          base64url.decode('0O+9vxwb3Zo/9AVcQfVeQ59wvgcYUVH/mTye6islspM='),
+        );
         const derivedTestAgreementKey =
           '{"id":"did:key:z6Mkt1paLGw6VqRCTmqjpbiP9fxLVHJb8k97zERL6TcWr9Ru#z6LSojEubzYtAGCBE7Mwwks7J3Gttsrd1c9EXcDuNjthwVQj","controller":"did:key:z6Mkt1paLGw6VqRCTmqjpbiP9fxLVHJb8k97zERL6TcWr9Ru","type":"X25519KeyAgreementKey2020","publicKeyMultibase":"z6LSojEubzYtAGCBE7Mwwks7J3Gttsrd1c9EXcDuNjthwVQj","privateKeyMultibase":"z3weoV5H5DppQ7pjABoopaiDFN6zH3SokESte2Jte87YNXgg"}';
-        const derivedTestHmacKey = 'AAkACzAAmgwPDgWQAMAAAAAOYAAAAA';
+        const derivedTestHmacKey =
+          '0O-9vxwb3Zo_9AVcQfVeQ59wvgcYUVH_mTye6islspM';
         const derivedTestVerificationKey =
           '{"id":"did:key:z6Mkt1paLGw6VqRCTmqjpbiP9fxLVHJb8k97zERL6TcWr9Ru#z6Mkt1paLGw6VqRCTmqjpbiP9fxLVHJb8k97zERL6TcWr9Ru","controller":"did:key:z6Mkt1paLGw6VqRCTmqjpbiP9fxLVHJb8k97zERL6TcWr9Ru","type":"Ed25519VerificationKey2018","publicKeyBase58":"EZZXk2gfAHvjMH1392kYJaQLfi2jirtmJDWQGBeVvveX","privateKeyBase58":"5BHUEjDDbDzQKnveM9qXXXmRqwTtmBvumTY2xZXN61x8dvZHgzsDaTpkVqkE4LSoMLcV6yDRhxcv7mMTzdaJ21pX"}';
         const {agreementKey, hmacKey, verificationKey} =

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

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

package/src/services/edv/service.ts

@@ -10,7 +10,6 @@ import {logger} from '@docknetwork/wallet-sdk-data-store/src/logger';
 import {didService} from '@docknetwork/wallet-sdk-wasm/src/services/dids/service';
 import {keyringService} from '@docknetwork/wallet-sdk-wasm/src/services/keyring';
 import {ed25519PairFromSeed} from '@polkadot/util-crypto';
-import base64url from 'base64url-universal';
 
 /**
  * EDVService
@@ -19,10 +18,12 @@ export class EDVService {
   storageInterface: EDVHTTPStorageInterface;
 
   private insertQueue: Promise<any> = Promise.resolve();
+  public controller: string;
 
   rpcMethods = [
     EDVService.prototype.generateKeys,
     EDVService.prototype.deriveKeys,
+    EDVService.prototype.getController,
     EDVService.prototype.initialize,
     EDVService.prototype.find,
     EDVService.prototype.update,
@@ -51,6 +52,7 @@ export class EDVService {
     };
 
     const {controller} = verificationKey;
+    this.controller = controller;
     const invocationSigner = getKeypairFromDoc(verificationKey);
     invocationSigner.sign = invocationSigner.signer().sign;
 
@@ -113,11 +115,11 @@ export class EDVService {
     return {verificationKey, agreementKey, hmacKey};
   }
 
-  async deriveKeys(masterKey: any) {
+  async deriveKeys(masterKey: Uint8Array) {
     await keyringService.initialize({
       ss58Format: 22,
     });
-    const pair = ed25519PairFromSeed(base64url.decode(masterKey));
+    const pair = ed25519PairFromSeed(masterKey);
 
     const keyPair = await didService.deriveKeyDoc({ pair });
 
@@ -131,6 +133,10 @@ export class EDVService {
     return { verificationKey, agreementKey, hmacKey };
   }
 
+  async getController() {
+    return this.controller;
+  }
+
   find(params: any) {
     return this.storageInterface.find(params);
   }

package/src/services/index.js

@@ -1,6 +1,5 @@
 import {keyringService} from './keyring/service';
 import {blockchainService} from './blockchain/service';
-import {substrateService} from './substrate/service';
 import {walletService} from './wallet/service';
 import {polkadotService} from './polkadot/service';
 import {utilCryptoService} from './util-crypto/service';
@@ -9,13 +8,11 @@ import {didService} from './dids/service';
 import {credentialService} from './credential/service';
 import {relayService} from './relay-service/service';
 import {pexService} from './pex/service';
-import {trustRegistryService} from './trust-registry/service';
 import {edvService} from './edv/service';
 
 export default [
   keyringService,
   blockchainService,
-  substrateService,
   walletService,
   polkadotService,
   utilCryptoService,
@@ -24,6 +21,5 @@ export default [
   credentialService,
   relayService,
   pexService,
-  trustRegistryService,
   edvService,
 ];

package/src/services/pex/service.ts

@@ -105,12 +105,18 @@ class PEXService {
 
   presentationFrom(params: CreatePresentationParams) {
     const {credentials, presentationDefinition, holderDID} = params;
-    const result: IPresentation = pex.presentationFrom(
+    const evaluateResult = pex.evaluateCredentials(
       removeOptionalAttribute(presentationDefinition),
       credentials,
       holderDID,
     );
 
+    const result: IPresentation = pex.presentationFrom(
+      presentationDefinition,
+      evaluateResult.verifiableCredential,
+      holderDID,
+    );
+
     return result;
   }
 }