From de0ff4f698468801468be081abd72f6f1519a1fb Mon Sep 17 00:00:00 2001 From: Kevin Jue Date: Tue, 19 Dec 2023 12:25:29 -0800 Subject: [PATCH] fix for V-SCT-VUL-028 --- fri/fri.go | 8 +++---- plonk/gates/arithmetic_extension_gate.go | 2 +- plonk/gates/arithmetic_gate.go | 2 +- plonk/gates/gates.go | 28 ++++++++++++------------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fri/fri.go b/fri/fri.go index 5455578..a422d80 100644 --- a/fri/fri.go +++ b/fri/fri.go @@ -49,14 +49,14 @@ func (f *Chip) GetInstance(zeta gl.QuadraticExtensionVariable) InstanceInfo { zeta, ) - zetaNextBath := BatchInfo{ + zetaNextBatch := BatchInfo{ Point: zetaNext, Polynomials: friZSPolys(f.commonData), } return InstanceInfo{ Oracles: friOracles(f.commonData), - Batches: []BatchInfo{zetaBatch, zetaNextBath}, + Batches: []BatchInfo{zetaBatch, zetaNextBatch}, } } @@ -168,7 +168,7 @@ func (f *Chip) expFromBitsConstBase( ) gl.Variable { product := gl.One() for i, bit := range exponentBits { - // If the bit is on, we multiply product by base^pow. + // If the bit is 1, we multiply product by base^pow. // We can arithmetize this as: // product *= 1 + bit (base^pow - 1) // product = (base^pow - 1) product bit + product @@ -326,7 +326,7 @@ func (f *Chip) computeEvaluation( ) gl.QuadraticExtensionVariable { arity := 1 << arityBits if (len(evals)) != arity { - panic("len(evals) ! arity") + panic("len(evals) != arity") } if arityBits > 8 { panic("currently assuming that arityBits is <= 8") diff --git a/plonk/gates/arithmetic_extension_gate.go b/plonk/gates/arithmetic_extension_gate.go index e09ed2a..7391798 100644 --- a/plonk/gates/arithmetic_extension_gate.go +++ b/plonk/gates/arithmetic_extension_gate.go @@ -9,7 +9,7 @@ import ( gl "github.com/succinctlabs/gnark-plonky2-verifier/goldilocks" ) -var aritheticExtensionGateRegex = regexp.MustCompile("ArithmeticExtensionGate { num_ops: (?P[0-9]+) }") +var arithmeticExtensionGateRegex = regexp.MustCompile("ArithmeticExtensionGate { num_ops: (?P[0-9]+) }") func deserializeExtensionArithmeticGate(parameters map[string]string) Gate { // Has the format "ArithmeticExtensionGate { num_ops: 10 }" diff --git a/plonk/gates/arithmetic_gate.go b/plonk/gates/arithmetic_gate.go index 7867cb0..f248bc4 100644 --- a/plonk/gates/arithmetic_gate.go +++ b/plonk/gates/arithmetic_gate.go @@ -9,7 +9,7 @@ import ( gl "github.com/succinctlabs/gnark-plonky2-verifier/goldilocks" ) -var aritheticGateRegex = regexp.MustCompile("ArithmeticGate { num_ops: (?P[0-9]+) }") +var arithmeticGateRegex = regexp.MustCompile("ArithmeticGate { num_ops: (?P[0-9]+) }") func deserializeArithmeticGate(parameters map[string]string) Gate { // Has the format "ArithmeticGate { num_ops: 10 }" diff --git a/plonk/gates/gates.go b/plonk/gates/gates.go index edd98d4..a10aee8 100644 --- a/plonk/gates/gates.go +++ b/plonk/gates/gates.go @@ -18,20 +18,20 @@ type Gate interface { } var gateRegexHandlers = map[*regexp.Regexp]func(parameters map[string]string) Gate{ - aritheticGateRegex: deserializeArithmeticGate, - aritheticExtensionGateRegex: deserializeExtensionArithmeticGate, - baseSumGateRegex: deserializeBaseSumGate, - constantGateRegex: deserializeConstantGate, - cosetInterpolationGateRegex: deserializeCosetInterpolationGate, - exponentiationGateRegex: deserializeExponentiationGate, - mulExtensionGateRegex: deserializeMulExtensionGate, - noopGateRegex: deserializeNoopGate, - poseidonGateRegex: deserializePoseidonGate, - poseidonMdsGateRegex: deserializePoseidonMdsGate, - publicInputGateRegex: deserializePublicInputGate, - randomAccessGateRegex: deserializeRandomAccessGate, - reducingExtensionGateRegex: deserializeReducingExtensionGate, - reducingGateRegex: deserializeReducingGate, + arithmeticGateRegex: deserializeArithmeticGate, + arithmeticExtensionGateRegex: deserializeExtensionArithmeticGate, + baseSumGateRegex: deserializeBaseSumGate, + constantGateRegex: deserializeConstantGate, + cosetInterpolationGateRegex: deserializeCosetInterpolationGate, + exponentiationGateRegex: deserializeExponentiationGate, + mulExtensionGateRegex: deserializeMulExtensionGate, + noopGateRegex: deserializeNoopGate, + poseidonGateRegex: deserializePoseidonGate, + poseidonMdsGateRegex: deserializePoseidonMdsGate, + publicInputGateRegex: deserializePublicInputGate, + randomAccessGateRegex: deserializeRandomAccessGate, + reducingExtensionGateRegex: deserializeReducingExtensionGate, + reducingGateRegex: deserializeReducingGate, } func GateInstanceFromId(gateId string) Gate {