@docknetwork/wallet-sdk-wasm 0.4.22 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-wasm",
-    "version": "0.4.22",
+    "version": "1.4.0",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",
@@ -25,7 +25,9 @@
         "@polkadot/util-crypto": "10.1.11"
     },
     "dependencies": {
+        "@astronautlabs/jsonpath": "^1.1.2",
         "@docknetwork/universal-wallet": "^2.0.1",
+        "@docknetwork/wallet-sdk-dids": "^1.4.0",
         "@polkadot/api": "9.7.1",
         "@polkadot/keyring": "10.1.11",
         "@polkadot/rpc-core": "9.7.1",
@@ -48,7 +50,10 @@
         "winston": "^3.3.3",
         "cwait": "1.1.2",
         "axios-retry": "^3.2.5",
-        "@sphereon/pex": "^1.1.4"
+        "@sphereon/pex": "^1.1.4",
+        "@docknetwork/credential-sdk": "0.12.0",
+        "@docknetwork/dock-blockchain-api": "0.6.1",
+        "@docknetwork/dock-blockchain-modules": "0.8.0"
     },
     "devDependencies": {
         "@babel/node": "^7.16.0",

package/src/services/credential/bbs-revocation.ts

@@ -7,9 +7,9 @@ import {
   VBWitnessUpdateInfo,
   Encoder,
 } from '@docknetwork/crypto-wasm-ts';
-import dock from '@docknetwork/sdk';
 
 import {hexToU8a} from '@polkadot/util';
+import { dockService } from '../dock/service';
 
 const trimHexID = id => {
   if (id.substr(0, 2) !== '0x') {
@@ -36,7 +36,9 @@ async function updateMembershipWitness({
 
   let updates = [];
   try {
-    updates = await dock.accumulatorModule.getUpdatesFromBlock(
+    // 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,
     );
@@ -64,17 +66,21 @@ async function updateMembershipWitness({
     }
   }
 
-  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;
 }
@@ -93,7 +99,7 @@ export const getWitnessDetails = async (credential, _membershipWitness) => {
   const registryId = credentialStatus?.id.replace('dock:accumulator:', '');
   const revocationIndex = credentialStatus.revocationId;
 
-  const queriedAccumulator = await dock.accumulatorModule.getAccumulator(
+  const queriedAccumulator = await dockService.modules.accumulator.getAccumulator(
     registryId,
     false,
   );
@@ -102,19 +108,17 @@ export const getWitnessDetails = async (credential, _membershipWitness) => {
     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(
+  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),

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

@@ -5,7 +5,8 @@ import {validation} from './config';
 import {DIDKeyManager} from '@docknetwork/wallet-sdk-dids/src';
 import {TestFixtures} from '../../fixtures';
 import {getTestWallet} from '../../test/setup-test-state';
-import {getDock} from '../dock/service';
+import {dockService, getDock} from '../dock/service';
+import {DockDid} from '@docknetwork/credential-sdk/types';
 
 describe('DID Service', () => {
   beforeAll(async () => {
@@ -99,6 +100,18 @@ describe('DID Service', () => {
   });
 
   it('expect to register did dock', async () => {
+    dockService.modules = {
+      did: {
+        dockOnly: {
+          rawTx: {
+            newOnchain: jest.fn(),
+          },
+        },
+      },
+    };
+
+    jest.spyOn(DockDid, 'fromQualifiedString').mockReturnValueOnce('');
+
     const result = await service.registerDidDock(
       TestFixtures.account1.getKeyring().toJson(''),
     );
@@ -107,14 +120,24 @@ describe('DID Service', () => {
   });
 
   it('expect to fail to register did dock', async () => {
+    dockService.modules = {
+      did: {
+        dockOnly: {
+          rawTx: {
+            newOnchain: () => {
+              throw new Error('');
+            },
+          },
+        },
+      },
+    };
+
     const error = await getPromiseError(() =>
       service.registerDidDock(
         TestFixtures.noBalanceAccount.getKeyring().toJson(''),
       ),
     );
-    expect(error.message).toBe(
-      '1010: Invalid Transaction: Inability to pay some fees , e.g. account balance too low',
-    );
+    expect(error.message).toBeDefined();
   });
 
   it('expect to get did document', async () => {

package/src/services/dids/service.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import {DIDKeyManager} from '@docknetwork/wallet-sdk-dids/src';
 import {
   serviceName,
@@ -8,16 +9,42 @@ import {
 import {keyringService} from '../keyring/service';
 import {utilCryptoService} from '../util-crypto/service';
 import assert from 'assert';
-import {createNewDockDID} from '@docknetwork/sdk/utils/did';
 import {dockService, getDock} from '../dock/service';
-import {PublicKeySr25519} from '@docknetwork/sdk';
-import {DidKey, VerificationRelationship} from '@docknetwork/sdk/public-keys';
+
+import {
+  DidKey,
+  DockDid,
+  VerificationRelationship,
+  DidMethodKey,
+} from '@docknetwork/credential-sdk/types';
+import {Ed25519Keypair} from '@docknetwork/credential-sdk/keypairs';
+
 import {Logger} from '../../core/logger';
 import {polkadotToKeydoc} from '../../core/polkadot-utils';
 import base64url from 'base64url';
-import { keyDocToKeypair } from '../credential/utils';
-import Ed25519Signature2020 from '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
-import EcdsaSecp256k1Signature2019 from '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
+import {keyDocToKeypair} from '../credential/utils';
+import {
+  Ed25519Signature2020,
+  EcdsaSecp256k1Signature2019,
+} from '@docknetwork/credential-sdk/vc/crypto';
+
+async function createDockDID({keyPair}) {
+  const dockDID = DockDid.random();
+  const dockController = dockDID.toString();
+  const publicKey = keyPair.publicKey();
+  const verRels = new VerificationRelationship();
+  const didKey = new DidKey(publicKey, verRels);
+
+  await dockService.modules.did.dockOnly.rawTx.newOnchain(
+    dockDID.did,
+    [didKey],
+    dockController === dockDID.toString()
+      ? []
+      : [DockDid.fromQualifiedString(dockController)],
+  );
+
+  return {did: dockDID.toString(), controller: dockController};
+}
 
 async function getSignerKeypair(privateKeyDoc) {
   const privateKey =
@@ -60,7 +87,6 @@ class DIDService {
     DIDService.prototype.registerDidDock,
     DIDService.prototype.getDidDockDocument,
     DIDService.prototype.createSignedJWT,
-
   ];
   keypairToDIDKeyDocument(params: KeypairToDIDKeyDocumentParams) {
     validation.keypairToDIDKeyDocument(params);
@@ -94,11 +120,7 @@ class DIDService {
     return polkadotToKeydoc(keyring, params.controller);
   }
 
-  async createSignedJWT({
-    payload,
-    privateKeyDoc,
-    headerInput
-  }) {
+  async createSignedJWT({payload, privateKeyDoc, headerInput}) {
     const privateKey = await getSignerKeypair(privateKeyDoc);
     const {sign} =
       typeof privateKey.signer === 'function'
@@ -113,7 +135,7 @@ class DIDService {
     const payloadBase64URL = base64url(JSON.stringify(payload));
     const headerAndPayloadBase64URL = `${headerBase64URL}.${payloadBase64URL}`;
     const signPayload = Buffer.from(headerAndPayloadBase64URL);
-  
+
     const signature = await sign({data: signPayload});
     return `${headerAndPayloadBase64URL}.${base64url.encode(signature)}`;
   }
@@ -127,23 +149,8 @@ class DIDService {
 
   async registerDidDock(keyPairJSON) {
     assert(!!keyPairJSON, 'keyPair is required');
-    const dockDID = createNewDockDID();
-    const dock = getDock();
-    const keyPair = keyringService.keyring.addFromJson(keyPairJSON);
-
-    keyPair.unlock('');
-
-    dock.setAccount(keyPair);
-
-    const publicKey = PublicKeySr25519.fromKeyringPair(keyPair);
-
-    const didKey = new DidKey(publicKey, new VerificationRelationship());
-
-    Logger.info(`Submitting new DID: ${dockDID}`);
-
-    const result = await dock.did.new(dockDID, [didKey], [], false);
-
-    Logger.info(`DID created with tx hash ${result.txHash.toString()}`);
+    const keyPair = Ed25519Keypair.random();
+    const dockDID = await createDockDID({keyPair});
 
     return {
       dockDID,

package/src/services/dock/service.ts

@@ -1,18 +1,21 @@
 // @ts-nocheck
-import dock from '@docknetwork/sdk';
+import { DockAPI } from '@docknetwork/dock-blockchain-api';
 import {
-  DockResolver,
   DIDKeyResolver,
-  WildcardMultiResolver,
   UniversalResolver,
-} from '@docknetwork/sdk/resolver';
+  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';
 
-let dockInstance = dock;
+let dockInstance;
 
 export function getDock() {
   return dockInstance;
@@ -25,19 +28,17 @@ export function setDock(instance) {
 // Create a resolver in order to lookup DIDs for verifying
 export const universalResolverUrl = 'https://uniresolver.io';
 
-// class WalletSDKResolver extends WildcardMultiResolver {
-//   async resolve(did) {
-//     const trimmedDID = did.split('#')[0];
-//     const document = await super.resolve(trimmedDID);
-//     return document;
-//   }
-// }
+class AnyDIDResolver extends ResolverRouter {
+  method = WILDCARD;
+}
 
 /**
  *
  */
 export class DockService {
   dock;
+  modules;
+  didModule;
   isDockReady = false;
   resolver: any;
   static Events = {
@@ -54,7 +55,10 @@ export class DockService {
 
   constructor() {
     this.name = 'dock';
-    this.dock = dock;
+    this.dock = new DockAPI();
+    this.didModule = new DockDIDModule(this.dock);
+    this.modules = new DockCoreModules(this.dock);
+    dockInstance = this.dock;
     this.emitter = new EventEmitter();
     this.resolver = this.createDIDResolver();
   }
@@ -72,11 +76,12 @@ export class DockService {
   }
 
   createDIDResolver() {
-    return new WildcardMultiResolver([
-      new DockResolver(getDock()), // Prebuilt resolver
-      new DIDKeyResolver(), // did:key resolution
+    return new AnyDIDResolver([
+      new DIDKeyResolver(),
+      new DIDResolver(this.didModule),
       new UniversalResolver(universalResolverUrl),
     ]);
+
   }
   /**
    *