Fix error message + use strict equality checks

Author: olegnn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docknetwork/crypto-wasm-ts",
-  "version": "0.33.1",
+  "version": "0.33.2",
   "description": "Typescript abstractions over Dock's Rust crypto library's WASM wrapper",
   "homepage": "https://github.com/docknetwork/crypto-wasm-ts",
   "main": "lib/index.js",

src/accumulator/accumulator.ts

@@ -627,7 +627,7 @@ export class UniversalAccumulator extends Accumulator {
       if (storePresent) {
         await initialElementsStore.add(e);
       }
-      if (currentBatch.length == batchSize) {
+      if (currentBatch.length === batchSize) {
         // Batch full, take product
         products.push(universalAccumulatorComputeInitialFv(currentBatch, secretKey.value));
         currentBatch = [];
@@ -800,7 +800,7 @@ export class UniversalAccumulator extends Accumulator {
     const ds: Uint8Array[] = [];
     for (const member of members) {
       currentBatch.push(member);
-      if (currentBatch.length == batchSize) {
+      if (currentBatch.length === batchSize) {
         ds.push(universalAccumulatorComputeD(nonMember, currentBatch));
         currentBatch = [];
       }
@@ -874,7 +874,7 @@ export class UniversalAccumulator extends Accumulator {
     const members = await state.elements();
     for (const member of members) {
       currentBatch.push(member);
-      if (currentBatch.length == batchSize) {
+      if (currentBatch.length === batchSize) {
         // Current batch is full, compute `d` for all non-members
         for (let i = 0; i < nonMembers.length; i++) {
           dsForAll[i].push(universalAccumulatorComputeD(nonMembers[i], currentBatch));

src/anonymous-credentials/credential-builder.ts

@@ -204,7 +204,7 @@ export abstract class CredentialBuilder<SecretKey, PublicKey, Signature, Signatu
   }
 
   static hasSameFieldsAsSchema(cred: object, schema: CredentialSchema): boolean {
-    return areArraysEqual(schema.flatten()[0], Object.keys(flatten(cred) as object).sort());
+    return areArraysEqual(schema.flatten()[0], Object.keys(flatten(cred)).sort());
   }
 
   protected abstract signMessageObject(

src/anonymous-credentials/presentation-builder.ts

@@ -273,7 +273,7 @@ export class PresentationBuilder extends Versioned {
     wasmBytes?: Uint8Array,
     provingKey?: LegoProvingKey | LegoProvingKeyUncompressed
   ) {
-    if (circuitPrivateVars.length == 0) {
+    if (circuitPrivateVars.length === 0) {
       throw new Error('Provide at least one private variable mapping');
     }
     this.validateCredIndex(credIdx);
@@ -322,7 +322,7 @@ export class PresentationBuilder extends Versioned {
     // Also collect encoded attributes used in any predicate
     for (let i = 0; i < numCreds; i++) {
       const cred = this.credentials[i][0];
-      const schema = cred.schema as CredentialSchema;
+      const schema = cred.schema;
       const flattenedSchema = schema.flatten();
 
       const numAttribs = flattenedSchema[0].length;
@@ -425,7 +425,7 @@ export class PresentationBuilder extends Versioned {
       }
 
       function circomAttrForSpec(attrName: string, encodedAttrs: Map<number, Uint8Array>): object {
-        const nameIdx = flattenedSchema[0].indexOf(attrName as string);
+        const nameIdx = flattenedSchema[0].indexOf(attrName);
         encodedAttrs.set(nameIdx, unrevealedAttrsEncoded.get(nameIdx) as Uint8Array);
         return unflatten({ [attrName]: null });
       }

src/anonymous-credentials/presentation.ts

@@ -85,7 +85,7 @@ export class Presentation extends Versioned {
     circomOutputs?: Map<number, Uint8Array[][]>
   ): VerifyResult {
     const numCreds = this.spec.credentials.length;
-    if (publicKeys.length != numCreds) {
+    if (publicKeys.length !== numCreds) {
       throw new Error(`Supply same no of public keys as creds. ${publicKeys.length} != ${numCreds}`);
     }
 
@@ -361,7 +361,7 @@ export class Presentation extends Versioned {
         attributeEqualities: this.spec.attributeEqualities
       },
       attributeCiphertexts,
-      proof: b58.encode((this.proof as CompositeProofG1).bytes)
+      proof: b58.encode((this.proof).bytes)
     };
   }
 

src/anonymous-credentials/schema.ts

@@ -474,7 +474,7 @@ export class CredentialSchema extends Versioned {
     CredentialSchema.validate(schema);
 
     super(CredentialSchema.VERSION);
-    this.schema = schema as ISchema;
+    this.schema = schema;
     // This is the schema in JSON-schema format. Kept to output in credentials or in `toJSON` without converting back from
     // internal representation; trading off memory for CPU time.
     this.jsonSchema = jsonSchema;
@@ -835,7 +835,7 @@ export class CredentialSchema extends Versioned {
     terms.add(SCHEMA_STR);
     terms.add(CRYPTO_VERSION_STR);
 
-    let ctx = {
+    const ctx = {
       dk: 'https://ld.dock.io/credentials#'
     };
 
@@ -890,7 +890,7 @@ export class CredentialSchema extends Versioned {
   ): object {
     // util function needed only in this func
     const createFullName = (old: string, neww: string): string => {
-      return old.length == 0 ? neww : `${old}.${neww}`;
+      return old.length === 0 ? neww : `${old}.${neww}`;
     };
 
     // Will either have a "type" property or will be defined using "$ref"
@@ -1081,14 +1081,14 @@ export class CredentialSchema extends Versioned {
       } else if ('type' in schemaProps[key]) {
         // key in schema
         if (
-          schemaProps[key]['type'] == 'string' ||
-          schemaProps[key]['type'] == 'integer' ||
-          schemaProps[key]['type'] == 'number'
+          schemaProps[key]['type'] === 'string' ||
+          schemaProps[key]['type'] === 'integer' ||
+          schemaProps[key]['type'] === 'number'
         ) {
           if (schemaProps[key]['type'] !== typ) {
             throw new Error(`Mismatch in credential and given schema type: ${schemaProps[key]['type']} !== ${typ}`);
           }
-        } else if (schemaProps[key]['type'] == 'array' && typ == 'array') {
+        } else if (schemaProps[key]['type'] === 'array' && typ === 'array') {
           if (schemaProps[key]['items'].length < value.length) {
             // If cred has more items than schema, add the missing ones
             value.slice(schemaProps[key]['items'].length).forEach((v) => {
@@ -1098,7 +1098,7 @@ export class CredentialSchema extends Versioned {
             // If cred has less items than schema, delete those items
             schemaProps[key]['items'] = schemaProps[key]['items'].slice(0, value.length);
           }
-        } else if (schemaProps[key]['type'] == 'object' && typ == 'object') {
+        } else if (schemaProps[key]['type'] === 'object' && typ === 'object') {
           const schemaKeys = new Set([...Object.keys(schemaProps[key]['properties'])]);
           const valKeys = new Set([...Object.keys(value)]);
           for (const vk of valKeys) {

src/composite-proof/setup-param.ts

@@ -149,7 +149,7 @@ export class SetupParam extends BytearrayWrapper {
   }
 
   static r1cs(r1cs: R1CS | ParsedR1CSFile): SetupParam {
-    let processedR1cs = getR1CS(r1cs);
+    const processedR1cs = getR1CS(r1cs);
     return new SetupParam(
       generateSetupParamForR1CS(
         processedR1cs.curveName,

src/composite-proof/statement.ts

@@ -490,7 +490,7 @@ export class Statement {
     wasmBytes: Uint8Array,
     snarkPk: LegoProvingKeyUncompressed
   ): Uint8Array {
-    let processedR1cs = getR1CS(r1cs);
+    const processedR1cs = getR1CS(r1cs);
     return generateR1CSCircomProverStatement(
       processedR1cs.curveName,
       processedR1cs.numPublic,
@@ -507,7 +507,7 @@ export class Statement {
     wasmBytes: Uint8Array,
     snarkPk: LegoProvingKey
   ): Uint8Array {
-    let processedR1cs = getR1CS(r1cs);
+    const processedR1cs = getR1CS(r1cs);
     return generateR1CSCircomProverStatement(
       processedR1cs.curveName,
       processedR1cs.numPublic,

src/encoder.ts

@@ -88,7 +88,7 @@ export abstract class MessageEncoder extends BytearrayWrapper {
       const chars: string[] = [];
       for (let i = 0; i < this.maxEncodedLength; i++) {
         // If a null character found then stop looking further
-        if (decoded.charCodeAt(i) == 0) {
+        if (decoded.charCodeAt(i) === 0) {
           break;
         }
         chars.push(decoded.charAt(i));

src/ps/signature.ts

@@ -38,7 +38,7 @@ export class PSSignature extends MessageEncoder {
       throw new Error(
         `Number of messages ${
           messages.length
-        } is different from ${params.supportedMessageCount()} supported by the secret key`
+        } is different from ${secretKey.supportedMessageCount()} supported by the secret key`
       );
     }
     const sig = psSign(messages, secretKey.value, params.value);