cheqd migration

integration-tests/cheqd-credentials.test.ts

@@ -0,0 +1,59 @@
+import { IWallet } from '@docknetwork/wallet-sdk-core/lib/types';
+import { createVerificationController } from '@docknetwork/wallet-sdk-core/src/verification-controller';
+import { CheqdCredentialNonZKP } from './data/credentials/cheqd-credentials';
+import { closeWallet, createNewWallet, getCredentialProvider, getWallet } from './helpers';
+import { ProofTemplateIds, createProofRequest } from './helpers/certs-helpers';
+
+describe('Cheq integration tests', () => {
+  beforeAll(async () => {
+    await createNewWallet();
+  });
+
+  it('should verify a non ZKP cheqd credential', async () => {
+
+
+    const wallet: IWallet = await getWallet();
+
+    getCredentialProvider().addCredential(CheqdCredentialNonZKP);
+
+    const proofRequest = await createProofRequest(
+      ProofTemplateIds.ANY_CREDENTIAL,
+    );
+
+    const result: any = await getCredentialProvider().isValid(CheqdCredentialNonZKP);
+
+    expect(result).toBeTruthy();
+
+    const controller = await createVerificationController({
+      wallet,
+    });
+
+    await controller.start({
+      template: proofRequest,
+    });
+
+    controller.selectedCredentials.set(CheqdCredentialNonZKP.id, {
+      credential: CheqdCredentialNonZKP,
+    });
+
+    const presentation = await controller.createPresentation();
+    console.log('Presentation generated');
+    console.log(JSON.stringify(presentation, null, 2));
+    console.log('Sending presentation to Certs API');
+
+    let certsResponse;
+    try {
+      certsResponse = await controller.submitPresentation(presentation);
+      console.log('CERTS response');
+      console.log(JSON.stringify(certsResponse, null, 2));
+    } catch (err) {
+      certsResponse = err.response.data;
+      console.log('Certs API returned an error');
+      console.log(JSON.stringify(certsResponse, null, 2));
+    }
+
+    expect(certsResponse.verified).toBe(true);
+  });
+
+  afterAll(() => closeWallet());
+});

package.json

@@ -108,10 +108,13 @@
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
     "@babel/preset-flow": "^7.16.7",
     "@babel/preset-typescript": "^7.22.5",
+    "@cosmjs/proto-signing": "^0.32.4",
     "@digitalbazaar/x25519-key-agreement-key-2020": "2.1.0",
-    "@docknetwork/credential-sdk": "^0.6.0",
-    "@docknetwork/dock-blockchain-api": "^0.4.1",
-    "@docknetwork/dock-blockchain-modules": "^0.5.1",
+    "@docknetwork/cheqd-blockchain-api": "0.11.0",
+    "@docknetwork/cheqd-blockchain-modules": "0.10.0",
+    "@docknetwork/credential-sdk": "0.12.0",
+    "@docknetwork/dock-blockchain-api": "0.6.1",
+    "@docknetwork/dock-blockchain-modules": "0.8.0",
     "@inquirer/checkbox": "^1.3.8",
     "@inquirer/input": "^1.2.8",
     "@inquirer/prompts": "^3.0.3",

packages/core/src/wallet-wasm.ts

@@ -1,11 +1,11 @@
-import {keyringService} from '@docknetwork/wallet-sdk-wasm/src/services/keyring';
-import {utilCryptoService} from '@docknetwork/wallet-sdk-wasm/src/services/util-crypto';
-import {dockService} from '@docknetwork/wallet-sdk-wasm/src/services/dock';
+import { dockService } from '@docknetwork/wallet-sdk-wasm/src/services/dock';
+import { keyringService } from '@docknetwork/wallet-sdk-wasm/src/services/keyring';
+import { utilCryptoService } from '@docknetwork/wallet-sdk-wasm/src/services/util-crypto';
 
-import {IWallet} from './types';
-import {Network} from '@docknetwork/wallet-sdk-data-store/src/types';
-import {WalletEvents} from '@docknetwork/wallet-sdk-wasm/src/modules/wallet';
+import { Network } from '@docknetwork/wallet-sdk-data-store/src/types';
+import { WalletEvents } from '@docknetwork/wallet-sdk-wasm/src/modules/wallet';
 import { captureException } from './helpers';
+import { IWallet } from './types';
 
 function isSubstrateNetwork(network: Network) {
   return !!network.configs.substrateUrl;
@@ -37,13 +37,28 @@ export async function setSubstrateNetwork(wallet: IWallet) {
   const network = wallet.dataStore.network;
   const networkConfigs = network.configs;
 
+
+  let cheqdMnemonicDoc = await wallet.getDocumentById('cheqd-mnemonic');
+
+  if (!cheqdMnemonicDoc) {
+    cheqdMnemonicDoc = {
+      id: 'cheqd-mnemonic',
+      value: await utilCryptoService.mnemonicGenerate(12),
+    }
+
+    await wallet.addDocument(cheqdMnemonicDoc);
+  }
+
   await keyringService.initialize({
     ss58Format: networkConfigs.addressPrefix,
   });
 
   dockService
     .init({
       address: networkConfigs.substrateUrl,
+      cheqdApiUrl: networkConfigs.cheqdApiUrl,
+      networkId: network.id,
+      cheqdMnemonic: cheqdMnemonicDoc.value,
     })
     .then(() => {
       wallet.eventManager.emit(WalletEvents.networkConnected);

packages/relay-service/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-relay-service",
-    "version": "0.4.19",
+    "version": "0.4.23",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",

packages/wasm/src/modules/network-manager.ts

@@ -5,6 +5,7 @@ export type NetworkInfo = {
   name: string,
   substrateUrl: string | string[],
   addressPrefix: number,
+  cheqdApiUrl: string,
 };
 
 export type NetworkId = 'mainnet' | 'testnet' | 'local' | 'custom';
@@ -14,11 +15,13 @@ export const SUBSTRATE_NETWORKS : Record<NetworkId, NetworkInfo> = {
     name: 'Dock PoS Mainnet',
     substrateUrl: ['wss://mainnet-node.dock.io', 'wss://mainnet-node-2.dock.io'],
     addressPrefix: 22,
+    cheqdApiUrl: 'https://cheqd-mainnet-rpc.autostake.com/',
   },
   testnet: {
     name: 'Dock PoS Testnet',
     substrateUrl: 'wss://knox-1.dock.io',
     addressPrefix: 21,
+    cheqdApiUrl: 'https://cheqd-testnet.docknode.io/',
   },
   local: {
     name: 'Local Node',

packages/wasm/src/services/dock/configs.ts

@@ -9,4 +9,7 @@ export const validation = {
 
 export type InitParams = {
   address: string,
+  cheqdApiUrl: string,
+  networkId: string,
+  cheqdMnemonic?: string,
 };

packages/wasm/src/services/dock/service.ts

@@ -1,19 +1,24 @@
 // @ts-nocheck
-import { DockAPI } from '@docknetwork/dock-blockchain-api';
+
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { CheqdAPI } from '@docknetwork/cheqd-blockchain-api';
+import { CheqdCoreModules } from '@docknetwork/cheqd-blockchain-modules';
+import { MultiApiCoreModules } from '@docknetwork/credential-sdk/modules';
 import {
   DIDKeyResolver,
+  ResolverRouter,
+  CoreResolver,
   UniversalResolver,
   WILDCARD,
-  DIDResolver,
-  ResolverRouter,
 } from '@docknetwork/credential-sdk/resolver';
-import {DockDIDModule} from '@docknetwork/dock-blockchain-modules';
-import {initializeWasm} from '@docknetwork/crypto-wasm-ts/lib/index';
-import {EventEmitter} from 'events';
-import {Logger} from '../../core/logger';
-import {once} from '../../modules/event-manager';
-import {InitParams, validation} from './configs';
-import {DockCoreModules} from '@docknetwork/dock-blockchain-modules';
+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';
+import { utilCryptoService } from '../util-crypto';
+import { InitParams, validation } from './configs';
 
 let dockInstance;
 
@@ -39,6 +44,7 @@ export class DockService {
   dock;
   modules;
   didModule;
+  cheqdApi;
   isDockReady = false;
   resolver: any;
   static Events = {
@@ -56,8 +62,12 @@ export class DockService {
   constructor() {
     this.name = 'dock';
     this.dock = new DockAPI();
+    this.cheqdApi = new CheqdAPI();
     this.didModule = new DockDIDModule(this.dock);
-    this.modules = new DockCoreModules(this.dock);
+    this.dockModules = new DockCoreModules(this.dock);
+    this.cheqdModules = new CheqdCoreModules(this.cheqdApi);
+    this.modules = new MultiApiCoreModules([this.dockModules]);
+
     dockInstance = this.dock;
     this.emitter = new EventEmitter();
     this.resolver = this.createDIDResolver();
@@ -78,10 +88,9 @@ export class DockService {
   createDIDResolver() {
     return new AnyDIDResolver([
       new DIDKeyResolver(),
-      new DIDResolver(this.didModule),
+      new CoreResolver(this.modules),
       new UniversalResolver(universalResolverUrl),
     ]);
-
   }
   /**
    *
@@ -90,7 +99,6 @@ export class DockService {
    */
   async init(params: InitParams) {
     validation.init(params);
-
 
     if (this.dock.isConnected) {
       await this.dock.disconnect();
@@ -100,16 +108,42 @@ export class DockService {
 
     await getDock().init(params);
 
+    Logger.info(`Substrate initialized at: ${params.address}`);
+
+    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}`);
+    Logger.info(`Using cheqd account: ${address}`);
+
+    await this.cheqdApi.init({
+      wallet,
+      url: checkdApiUrl,
+      network: cheqdNetworkId,
+    });
+
+    Logger.info(`Cheqd initialized at: ${checkdApiUrl}`);
+
     this.address = params.address;
 
     this.resolver = this.createDIDResolver();
 
-    if (process.env.NODE_ENV !== 'test' || process.env.API_MOCK_DISABLED === 'true') {
+    if (
+      process.env.NODE_ENV !== 'test' ||
+      process.env.API_MOCK_DISABLED === 'true'
+    ) {
       await initializeWasm();
     }
 
-    Logger.info(`Substrate initialized at: ${params.address}`);
-
     this._setDockReady(true);
 
     return true;