Wip

Signed-off-by: lovesh <lovesh.bond@gmail.com>

Author: lovesh

README.md

@@ -1049,7 +1049,7 @@ check if the value is between -200 and 50, the verifier should ask the prover to
 numbers, convert them to integers by multiplying with a number to make it integer, like if a decimal value can have maximum of 3 decimal places, they should be 
 multiplied by 1000.  The [test](./tests/composite-proofs/bound-check.spec.ts) mentioned above shows these scenarios.  
 The conversions defined in the above tests are abstracted in this [Encoders](./src/bbs-plus/encoder.ts) class and you can see the usage 
-in [these tests](./tests/composite-proofs/sign-verify-js-obj.spec.ts). 
+in [these tests](tests/composite-proofs/msg-js-obj/bound-check.spec.ts). 
 
 
 For this, the verifier needs to first create the setup parameters which he then shares with the prover. Note that the 
@@ -1228,4 +1228,4 @@ For complete example, see [these tests](./tests/composite-proofs/bound-check.spe
 ### Working with messages as JS objects
 
 The above interfaces have been found to be a bit difficult to work with when signing messages that are represented as JS objects. 
-[Here](./src/sign-verify-js-objs.ts) are some [utilities](./src/bbs-plus/encoder.ts) to make this task a bit easier. [These tests](./tests/composite-proofs/sign-verify-js-obj.spec.ts) contain plenty of examples.
+[Here](./src/sign-verify-js-objs.ts) are some [utilities](./src/bbs-plus/encoder.ts) to make this task a bit easier. [These tests](tests/composite-proofs/msg-js-obj) contain plenty of examples.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docknetwork/crypto-wasm-ts",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Typescript abstractions over Dock's Rust crypto library's WASM wrapper",
   "homepage": "https://github.com/docknetwork/crypto-wasm-ts",
   "main": "lib/crypto-wasm-ts/src/index.js",
@@ -21,7 +21,7 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@docknetwork/crypto-wasm": "0.12.0"
+    "@docknetwork/crypto-wasm": "file:../crypto-wasm"
   },
   "devDependencies": {
     "@types/flat": "^5.0.2",
@@ -37,6 +37,7 @@
     "jest": "^27.3.0",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
+    "r1csfile": "^0.0.41",
     "ts-jest": "^27.0.7",
     "ts-node": "^10.4.0",
     "typescript": "^4.8.2"

src/Pseudonym.ts

@@ -79,7 +79,7 @@ export class PseudonymBases {
    * Each verifier should have a unique scope
    */
   static generateBasesForAttributes(attributeCount: number, scope?: Uint8Array): Uint8Array[] {
-    const b = [];
+    const b: Uint8Array[] = [];
     let s: number[];
     if (scope !== undefined) {
       s = Array.from(scope);

src/accumulator/accumulator.ts

@@ -619,7 +619,7 @@ export class UniversalAccumulator extends Accumulator {
     products.push(universalAccumulatorComputeInitialFv(fixed, secretKey.value));
 
     // store a batch of generated elements and take the product once the batch is full
-    let currentBatch = [];
+    let currentBatch: Uint8Array[] = [];
     // Accumulate 1 more than the maximum number of allowed members as specified in the paper
     for (let i = 0; i <= maxSize; i++) {
       const e = generateRandomFieldElement();
@@ -796,7 +796,7 @@ export class UniversalAccumulator extends Accumulator {
     const sk = this.getSecretKey(secretKey);
     const params_ = this.getParams(params);
     const members = await state.elements();
-    let currentBatch = [];
+    let currentBatch: Uint8Array[] = [];
     const ds: Uint8Array[] = [];
     for (const member of members) {
       currentBatch.push(member);
@@ -862,7 +862,7 @@ export class UniversalAccumulator extends Accumulator {
     const sk = this.getSecretKey(secretKey);
     const params_ = this.getParams(params);
     const members = await state.elements();
-    let currentBatch = [];
+    let currentBatch: Uint8Array[] = [];
     // store multiple `d`s for each non-member
     const dsForAll: Uint8Array[][] = new Array(nonMembers.length);
     for (const member of members) {

src/bbs-plus/encoder.ts

@@ -66,6 +66,19 @@ export class Encoder {
     return [names, encoded];
   }
 
+  encodeDefault(value: unknown, strict = false): Uint8Array {
+    if (this.defaultEncoder !== undefined) {
+      return this.defaultEncoder(value);
+    } else {
+      if (!strict && value instanceof Uint8Array) {
+        return SignatureG1.encodeMessageForSigning(value);
+      } else {
+        throw new Error(
+          `Cannot encode value ${value} as neither was default encoder present nor it was an Uint8Array. Its type was ${typeof value}`
+        );
+      }
+    }
+  }
   /**
    * Returns an encoding function to be used on a message that is a positive integer.
    */

src/bbs-plus/params.ts

@@ -52,7 +52,7 @@ export abstract class SignatureParams {
    * @param indices
    */
   getParamsForIndices(indices: number[]): Uint8Array[] {
-    const p = [];
+    const p: Uint8Array[] = [];
     p.push(this.value.h_0);
     for (const i of indices) {
       if (!this.isValidIndex(i)) {

src/bbs-plus/signature.ts

@@ -68,7 +68,7 @@ export abstract class Signature extends BytearrayWrapper {
     }
     const decoder = new TextDecoder();
     const decoded = decoder.decode(message);
-    const chars = [];
+    const chars: string[] = [];
     for (let i = 0; i < maxLength; i++) {
       // If a null character found then stop looking further
       if (decoded.charCodeAt(i) == 0) {

src/composite-proof/proof-spec.ts

@@ -68,4 +68,8 @@ export class QuasiProofSpecG1 {
   setContext(context: Uint8Array) {
     this.context = context;
   }
+
+  toProofSpec(): ProofSpecG1 {
+    return new ProofSpecG1(this.statements, this.metaStatements, this.setupParams, this.context);
+  }
 }

src/composite-proof/setup-param.ts

@@ -12,7 +12,10 @@ import {
   generateSetupParamForSaverProvingKey,
   generateSetupParamForSaverVerifyingKey,
   generateSetupParamForLegoProvingKey,
-  generateSetupParamForLegoVerifyingKey
+  generateSetupParamForLegoVerifyingKey, generateSetupParamForR1CS,
+  R1CS,
+  generateSetupParamForBytes,
+  generateSetupParamForFieldElemVec
 } from '@docknetwork/crypto-wasm';
 import { BBSPlusPublicKeyG2, SignatureParamsG1 } from '../bbs-plus';
 import {
@@ -35,6 +38,7 @@ import {
 } from '../legosnark';
 import { AccumulatorParams, AccumulatorPublicKey, MembershipProvingKey, NonMembershipProvingKey } from '../accumulator';
 import { BytearrayWrapper } from '../bytearray-wrapper';
+import { getR1CS, ParsedR1CSFile } from '../r1cs';
 
 /**
  * Represents (public) setup parameters of different protocols. Different setup parameters can be wrapped in this and
@@ -125,4 +129,17 @@ export class SetupParam extends BytearrayWrapper {
   static legosnarkVerifyingKeyUncompressed(key: LegoVerifyingKeyUncompressed): SetupParam {
     return new SetupParam(generateSetupParamForLegoVerifyingKey(key.value, true));
   }
+
+  static r1cs(r1cs: R1CS | ParsedR1CSFile): SetupParam {
+    let processedR1cs = getR1CS(r1cs);
+    return new SetupParam(generateSetupParamForR1CS(processedR1cs.curveName, processedR1cs.numPublic, processedR1cs.numPrivate, processedR1cs.constraints));
+  }
+
+  static bytes(b: Uint8Array): SetupParam {
+    return new SetupParam(generateSetupParamForBytes(b));
+  }
+
+  static fieldElementVec(arr: Uint8Array[]): SetupParam {
+    return new SetupParam(generateSetupParamForFieldElemVec(arr));
+  }
 }

src/composite-proof/statement.ts

@@ -15,7 +15,11 @@ import {
   generateBoundCheckLegoProverStatement,
   generateBoundCheckLegoProverStatementFromParamRefs,
   generateBoundCheckLegoVerifierStatement,
-  generateBoundCheckLegoVerifierStatementFromParamRefs
+  generateBoundCheckLegoVerifierStatementFromParamRefs,
+  generateR1CSCircomProverStatement,
+  generateR1CSCircomProverStatementFromParamRefs,
+  generateR1CSCircomVerifierStatement,
+  generateR1CSCircomVerifierStatementFromParamRefs, R1CS
 } from '@docknetwork/crypto-wasm';
 import { BBSPlusPublicKeyG2, SignatureParamsG1 } from '../bbs-plus';
 import {
@@ -40,6 +44,7 @@ import {
 import { AccumulatorParams, AccumulatorPublicKey, MembershipProvingKey, NonMembershipProvingKey } from '../accumulator';
 import { AttributeBoundPseudonym, Pseudonym } from '../Pseudonym';
 import { isPositiveInteger } from '../util';
+import { getR1CS, ParsedR1CSFile } from '../r1cs';
 
 /**
  * Relation which needs to be proven. Contains any public data that needs to be known to both prover and verifier
@@ -400,6 +405,32 @@ export class Statement {
     }
     return Statement.pedersenCommitmentG1(b, pseudonym.value);
   }
+
+  static r1csCircomProver(r1cs: R1CS | ParsedR1CSFile, wasmBytes: Uint8Array, snarkPk: LegoProvingKeyUncompressed): Uint8Array {
+    let processedR1cs = getR1CS(r1cs);
+    return generateR1CSCircomProverStatement(processedR1cs.curveName, processedR1cs.numPublic, processedR1cs.numPrivate, processedR1cs.constraints, wasmBytes, snarkPk.value, true);
+  }
+
+  static r1csCircomProverFromCompressedParams(r1cs: R1CS | ParsedR1CSFile, wasmBytes: Uint8Array, snarkPk: LegoProvingKey): Uint8Array {
+    let processedR1cs = getR1CS(r1cs);
+    return generateR1CSCircomProverStatement(processedR1cs.curveName, processedR1cs.numPublic, processedR1cs.numPrivate, processedR1cs.constraints, wasmBytes, snarkPk.value, false);
+  }
+
+  static r1csCircomProverFromSetupParamRefs(processedR1cs: number, wasmBytes: number, snarkPkRef: number): Uint8Array {
+    return generateR1CSCircomProverStatementFromParamRefs(processedR1cs, wasmBytes, snarkPkRef);
+  }
+
+  static r1csCircomVerifier(publicInputs: Uint8Array[], snarkVk: LegoVerifyingKeyUncompressed): Uint8Array {
+    return generateR1CSCircomVerifierStatement(publicInputs, snarkVk.value, true);
+  }
+
+  static r1csCircomVerifierFromCompressedParams(publicInputs: Uint8Array[], snarkVk: LegoVerifyingKey): Uint8Array {
+    return generateR1CSCircomVerifierStatement(publicInputs, snarkVk.value, false);
+  }
+
+  static r1csCircomVerifierFromSetupParamRefs(publicInputsRef: number, snarkVkRef: number): Uint8Array {
+    return generateR1CSCircomVerifierStatementFromParamRefs(publicInputsRef, snarkVkRef);
+  }
 }
 
 /**