Merge pull request #272 from docknetwork/bbs-revocation-fix

fix: use new credential witness
docknetwork · Jun 25, 2024 · d9fa824 · d9fa824
2 parents 3747bec + a2c5f36
commit d9fa824
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/packages/wasm/src/services/credential/bbs-revocation.ts b/packages/wasm/src/services/credential/bbs-revocation.ts
@@ -27,7 +27,7 @@ async function updateMembershipWitness({
   credential,
   membershipWitness,
   registryId,
-  accumulator,
+  blockNo,
 }) {
   const revocationId = credential.credentialStatus.revocationId;
   const member = Accumulator.encodePositiveNumberAsAccumulatorMember(
@@ -38,7 +38,7 @@ async function updateMembershipWitness({
   try {
     updates = await dock.accumulatorModule.getUpdatesFromBlock(
       registryId,
-      accumulator.lastModified,
+      blockNo,
     );
   } catch (err) {
     if (err.code === UnknownBlockErrorCode) {
@@ -80,6 +80,15 @@ async function updateMembershipWitness({
 }
 
 export const getWitnessDetails = async (credential, _membershipWitness) => {
+  let witness = _membershipWitness;
+  let blockNo;
+
+  try {
+    ({blockNo, witness} = JSON.parse(_membershipWitness));
+  } catch (err) {
+    console.error(err);
+  }
+
   const {credentialStatus} = credential;
   const registryId = credentialStatus?.id.replace('dock:accumulator:', '');
   const revocationIndex = credentialStatus.revocationId;
@@ -107,24 +116,24 @@ export const getWitnessDetails = async (credential, _membershipWitness) => {
   const params = dockAccumulatorParams();
   const pk = new AccumulatorPublicKey(hexToU8a(publicKey.bytes));
 
-  const membershipWitness = new VBMembershipWitness(
-    hexToU8a(_membershipWitness),
+  let membershipWitness = new VBMembershipWitness(
+    hexToU8a(witness),
   );
 
-  // TODO: Currently working with Lovesh to fix this
-  // https://dock-team.atlassian.net/browse/DCKM-453
-  // try {
-  //   const updatedWitness = await updateMembershipWitness({
-  //     credential,
-  //     membershipWitness: _membershipWitness,
-  //     registryId,
-  //     accumulator: queriedAccumulator,
-  //   });
-  //   membershipWitness = updatedWitness;
-
-  // } catch (err) {
-  //   console.error(err);
-  // }
+  if(blockNo){
+    try {
+      const updatedWitness = await updateMembershipWitness({
+        credential,
+        membershipWitness: witness,
+        registryId,
+        blockNo,
+      });
+      membershipWitness = updatedWitness;
+
+    } catch (err) {
+      console.error(err);
+    }
+  }
 
   return {
     encodedRevId,