Update kimchi branch (#31)

* Update kimchi branch * Fix clippy
lambdaclass · Oct 11, 2023 · b171500 · b171500
1 parent dfda419
commit b171500
Show file tree

Hide file tree

Showing 11 changed files with 3,885 additions and 200 deletions.
diff --git a/verifier_circuit/src/prover/expr.ts b/verifier_circuit/src/prover/expr.ts
@@ -80,6 +80,22 @@ export class Variable {
                         point_evaluations = evals.genericSelector;
                         break;
                     }
+                    case GateType.CompleteAdd: {
+                        point_evaluations = evals.completeAddSelector;
+                        break;
+                    }
+                    case GateType.VarBaseMul: {
+                        point_evaluations = evals.mulSelector;
+                        break;
+                    }
+                    case GateType.EndoMul: {
+                        point_evaluations = evals.emulSelector;
+                        break;
+                    }
+                    case GateType.EndoMulScalar: {
+                        point_evaluations = evals.endomulScalarSelector;
+                        break;
+                    }
                 }
                 break;
             }
@@ -144,8 +160,8 @@ export namespace PolishToken {
     export type Sub = {
         kind: "sub"
     }
-    export type VanishesOnLast4Rows = {
-        kind: "vanishesonlast4rows"
+    export type VanishesOnZeroKnowledgeAndPreviousRows = {
+        kind: "vanishesonzeroknowledgeandpreviousrows"
     }
     export type UnnormalizedLagrangeBasis = {
         kind: "unnormalizedlagrangebasis"
@@ -216,7 +232,7 @@ export namespace PolishToken {
                     stack.push(c.mds[t.row][t.col]);
                     break;
                 }
-                case "vanishesonlast4rows": {
+                case "vanishesonzeroknowledgeandpreviousrows": {
                     const ZK_ROWS = 3;
                     const w4 = powScalar(domain_gen, domain_size - (ZK_ROWS + 1));
                     const w3 = domain_gen.mul(w4);
@@ -312,7 +328,7 @@ export type PolishToken =
     | PolishToken.Add
     | PolishToken.Mul
     | PolishToken.Sub
-    | PolishToken.VanishesOnLast4Rows
+    | PolishToken.VanishesOnZeroKnowledgeAndPreviousRows
     | PolishToken.UnnormalizedLagrangeBasis
     | PolishToken.Store
     | PolishToken.Load

diff --git a/verifier_circuit/src/prover/prover.ts b/verifier_circuit/src/prover/prover.ts
@@ -240,7 +240,7 @@ export class ProverProof {
         const evals = ProofEvaluations.combine(this.evals, powers_of_eval_points_for_chunks);
 
         //~ 29. Compute the evaluation of $ft(\zeta)$.
-        const zkp = index.zkpm.evaluate(zeta);
+        const zkp = index.permutation_vanishing_polynomial_m.evaluate(zeta);
         const zeta1m1 = zeta1.sub(Scalar.from(1));
 
         const PERMUTATION_CONSTRAINTS = 3; // FIXME: hardcoded here
@@ -456,6 +456,14 @@ export class ProofEvaluations<Evals> {
     genericSelector: Evals
     /* evaluation of the poseidon selector polynomial */
     poseidonSelector: Evals
+    /** evaluation of the elliptic curve addition selector polynomial */
+    completeAddSelector: Evals
+    /** evaluation of the elliptic curve variable base scalar multiplication selector polynomial */
+    mulSelector: Evals
+    /** evaluation of the endoscalar multiplication selector polynomial */
+    emulSelector: Evals
+    /** evaluation of the endoscalar multiplication scalar computation selector polynomial */
+    endomulScalarSelector: Evals
 
     constructor(
         w: Array<Evals>,
@@ -464,6 +472,10 @@ export class ProofEvaluations<Evals> {
         coefficients: Array<Evals>,
         genericSelector: Evals,
         poseidonSelector: Evals,
+        completeAddSelector: Evals,
+        mulSelector: Evals,
+        emulSelector: Evals,
+        endomulScalarSelector: Evals,
         lookup?: LookupEvaluations<Evals>,
         public_input?: Evals,
     ) {
@@ -474,6 +486,10 @@ export class ProofEvaluations<Evals> {
         this.lookup = lookup;
         this.genericSelector = genericSelector;
         this.poseidonSelector = poseidonSelector;
+        this.completeAddSelector = completeAddSelector;
+        this.mulSelector = mulSelector;
+        this.emulSelector = emulSelector;
+        this.endomulScalarSelector = endomulScalarSelector;
         this.public_input = public_input;
         return this;
     }
@@ -499,6 +515,10 @@ export class ProofEvaluations<Evals> {
             //lookup,
             genericSelector,
             poseidonSelector,
+            completeAddSelector,
+            mulSelector,
+            emulSelector,
+            endomulScalarSelector,
         } = this;
 
         let public_input = undefined;
@@ -511,6 +531,10 @@ export class ProofEvaluations<Evals> {
             coefficients.map(f),
             f(genericSelector),
             f(poseidonSelector),
+            f(completeAddSelector),
+            f(mulSelector),
+            f(emulSelector),
+            f(endomulScalarSelector),
             undefined, // FIXME: ignoring lookup
             public_input
         )

diff --git a/verifier_circuit/src/serde/serde_index.ts b/verifier_circuit/src/serde/serde_index.ts
@@ -46,7 +46,7 @@ export type VariableJSON = {
 
 export namespace PolishTokenJSON {
     export type UnitVariant = string
-    export type Literal = Scalar
+    export type Literal = string // Scalar
     export type Cell = VariableJSON
     export type Pow = number
     export type Mds = {
@@ -91,7 +91,7 @@ interface VerifierIndexJSON {
 
     //powers_of_alpha: AlphasJSON
     shift: string[]
-    zkpm: PolynomialJSON
+    permutation_vanishing_polynomial_m: PolynomialJSON
     w: string
     endo: string
     linear_constant_term: PolishTokenJSON[]
@@ -144,16 +144,16 @@ export function deserPolishToken(json: PolishTokenJSON): PolishToken | undefined
             case "Alpha": return { kind: "alpha" }
             case "Beta": return { kind: "beta" }
             case "Gamma": return { kind: "gamma" }
-            case "EndoCoefficint": return { kind: "endocoefficient" }
+            case "EndoCoefficient": return { kind: "endocoefficient" }
             case "Dup": return { kind: "dup" }
             case "Add": return { kind: "add" }
             case "Mul": return { kind: "mul" }
             case "Sub": return { kind: "sub" }
-            case "VanishesOnLast4Rows": return { kind: "vanishesonlast4rows" }
+            case "VanishesOnZeroKnowledgeAndPreviousRows": return { kind: "vanishesonzeroknowledgeandpreviousrows" }
             case "Store": return { kind: "store" }
         }
     } else {
-        if (json.Literal != null) return { kind: "literal", lit: json.Literal };
+        if (json.Literal != null) return { kind: "literal", lit: deserHexScalar(json.Literal) };
         if (json.Cell != null) {
             return { kind: "cell", cell: deserVariable(json.Cell) };
         }
@@ -184,7 +184,7 @@ export function deserVerifierIndex(json: VerifierIndexJSON): VerifierIndex {
         endomul_scalar_comm,
         //powers_of_alpha,
         shift,
-        zkpm,
+        permutation_vanishing_polynomial_m,
         w,
         endo,
         linear_constant_term,
@@ -199,7 +199,7 @@ export function deserVerifierIndex(json: VerifierIndexJSON): VerifierIndex {
             [ArgumentType.id({ kind: "gate", type: GateType.Zero }), [0, 21]],
             [ArgumentType.id({ kind: "permutation" }), [21, 3]]
         ]
-    ));
+        ));
 
     return new VerifierIndex(
         domain_size,
@@ -216,7 +216,7 @@ export function deserVerifierIndex(json: VerifierIndexJSON): VerifierIndex {
         deserPolyComm(endomul_scalar_comm),
         powers_of_alpha,
         shift.map(deserHexScalar),
-        deserPolynomial(zkpm),
+        deserPolynomial(permutation_vanishing_polynomial_m),
         deserHexScalar(w),
         deserHexScalar(endo),
         linear_constant_term.map((token) => deserPolishToken(token)!),

diff --git a/verifier_circuit/src/serde/serde_proof.ts b/verifier_circuit/src/serde/serde_proof.ts
@@ -22,9 +22,12 @@ interface ProofEvalsJSON {
     s: PointEvalsJSON[] // of size 7 - 1, total num of wirable registers minus one
     coefficients: PointEvalsJSON[] // of size 15, total num of registers (columns)
     //lookup?: LookupEvaluationsJSON
-    lookup: null,
     generic_selector: PointEvalsJSON
     poseidon_selector: PointEvalsJSON
+    complete_add_selector: PointEvalsJSON
+    mul_selector: PointEvalsJSON
+    emul_selector: PointEvalsJSON
+    endomul_scalar_selector: PointEvalsJSON
 }
 
 interface ProverCommitmentsJSON {
@@ -64,8 +67,20 @@ export function deserProofEvals(json: ProofEvalsJSON): ProofEvaluations<PointEva
     const [
         z,
         genericSelector,
-        poseidonSelector
-    ] = [json.z, json.generic_selector, json.poseidon_selector].map(deserPointEval);
+        poseidonSelector,
+        completeAddSelector,
+        mulSelector,
+        emulSelector,
+        endomulScalarSelector,
+    ] = [
+        json.z,
+        json.generic_selector,
+        json.poseidon_selector,
+        json.complete_add_selector,
+        json.mul_selector,
+        json.emul_selector,
+        json.endomul_scalar_selector
+    ].map(deserPointEval);
 
     // in the current json, there isn't a non-null lookup, so TS infers that it'll always be null.
     let lookup = undefined;
@@ -82,7 +97,19 @@ export function deserProofEvals(json: ProofEvalsJSON): ProofEvaluations<PointEva
     //       lookup = { sorted, aggreg, table, runtime };
     //   }
 
-    return new ProofEvaluations(w, z, s, coefficients, genericSelector, poseidonSelector, lookup);
+    return new ProofEvaluations(
+        w,
+        z,
+        s,
+        coefficients,
+        genericSelector,
+        poseidonSelector,
+        completeAddSelector,
+        mulSelector,
+        emulSelector,
+        endomulScalarSelector,
+        lookup
+    );
 }
 
 export function deserProverCommitments(json: ProverCommitmentsJSON): ProverCommitments {

diff --git a/verifier_circuit/src/verifier/verifier.ts b/verifier_circuit/src/verifier/verifier.ts
@@ -51,7 +51,7 @@ export class VerifierIndex {
     /** Wire coordinate shifts */
     shift: Scalar[] // of size PERMUTS
     /** Zero knowledge polynomial */
-    zkpm: Polynomial
+    permutation_vanishing_polynomial_m: Polynomial
     /** Domain offset for zero-knowledge */
     w: Scalar
     /** Endoscalar coefficient */
@@ -78,7 +78,7 @@ export class VerifierIndex {
         endomul_scalar_comm: PolyComm<Group>,
         powers_of_alpha: Alphas,
         shift: Scalar[],
-        zkpm: Polynomial,
+        permutation_vanishing_polynomial_m: Polynomial,
         w: Scalar,
         endo: Scalar,
         linear_constant_term: PolishToken[]
@@ -98,7 +98,7 @@ export class VerifierIndex {
         this.endomul_scalar_comm = endomul_scalar_comm;
         this.powers_of_alpha = powers_of_alpha;
         this.shift = shift;
-        this.zkpm = zkpm;
+        this.permutation_vanishing_polynomial_m = permutation_vanishing_polynomial_m;
         this.w = w;
         this.endo = endo;
         this.linear_constant_term = linear_constant_term;