test: add test/solver_test.go

frontend/cs/scs/api.go

@@ -193,13 +193,16 @@ func (system *scs) FromBinary(b ...frontend.Variable) frontend.Variable {
 // Xor returns a ^ b
 // a and b must be 0 or 1
 func (system *scs) Xor(a, b frontend.Variable) frontend.Variable {
+	system.AssertIsBoolean(a)
+	system.AssertIsBoolean(b)
 	_a, aConstant := system.ConstantValue(a)
 	_b, bConstant := system.ConstantValue(b)
 
 	if aConstant && bConstant {
 		_a.Xor(_a, _b)
 		return _a
 	}
+
 	res := system.newInternalVariable()
 	if aConstant {
 		a, b = b, a
@@ -224,6 +227,10 @@ func (system *scs) Xor(a, b frontend.Variable) frontend.Variable {
 // Or returns a | b
 // a and b must be 0 or 1
 func (system *scs) Or(a, b frontend.Variable) frontend.Variable {
+
+	system.AssertIsBoolean(a)
+	system.AssertIsBoolean(b)
+
 	_a, aConstant := system.ConstantValue(a)
 	_b, bConstant := system.ConstantValue(b)
 
@@ -241,11 +248,6 @@ func (system *scs) Or(a, b frontend.Variable) frontend.Variable {
 		l := a.(compiled.Term)
 		r := l
 
-		if !(_b.IsUint64() && (_b.Uint64() <= 1)) {
-			panic(fmt.Sprintf("%s should be 0 or 1", _b.String()))
-		}
-		system.AssertIsBoolean(a)
-
 		one := big.NewInt(1)
 		_b.Sub(_b, one)
 		idl := system.st.CoeffID(_b)
@@ -254,8 +256,6 @@ func (system *scs) Or(a, b frontend.Variable) frontend.Variable {
 	}
 	l := a.(compiled.Term)
 	r := b.(compiled.Term)
-	system.AssertIsBoolean(l)
-	system.AssertIsBoolean(r)
 	system.addPlonkConstraint(l, r, res, compiled.CoeffIdMinusOne, compiled.CoeffIdMinusOne, compiled.CoeffIdOne, compiled.CoeffIdOne, compiled.CoeffIdOne, compiled.CoeffIdZero)
 	return res
 }

internal/backend/circuits/range.go

@@ -5,7 +5,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 )
 
-const bound = 161
+const bound = 44
 
 type rangeCheckConstantCircuit struct {
 	X frontend.Variable
@@ -24,8 +24,8 @@ func (circuit *rangeCheckConstantCircuit) Define(api frontend.API) error {
 func rangeCheckConstant() {
 	var circuit, good, bad rangeCheckConstantCircuit
 
-	good.X = (10)
-	good.Y = (4)
+	good.X = (4)
+	good.Y = (2)
 
 	bad.X = (11)
 	bad.Y = (4)
@@ -52,8 +52,8 @@ func rangeCheck() {
 
 	var circuit, good, bad rangeCheckCircuit
 
-	good.X = (10)
-	good.Y = (4)
+	good.X = (4)
+	good.Y = (2)
 	good.Bound = (bound)
 
 	bad.X = (11)

internal/generator/backend/template/representations/r1cs.sparse.go.tmpl

@@ -48,7 +48,7 @@ func NewSparseR1CS(ccs compiled.SparseR1CS, coefficients []big.Int) *SparseR1CS
 // witness: contains the input variables
 // it returns the full slice of wires
 func (cs *SparseR1CS) Solve(witness []fr.Element, opt backend.ProverConfig) ([]fr.Element, error) {
-	log := logger.Logger().With().Str("curve", cs.CurveID().String()).Int("nbConstraints", len(cs.Constraints)).Str("backend", "plonk").Logger()
+	log := logger.Logger().With().Int("nbConstraints", len(cs.Constraints)).Str("backend", "plonk").Logger()
 
 	// set the slices holding the solution.values and monitoring which variables have been solved
 	nbVariables := cs.NbInternalVariables + cs.NbSecretVariables + cs.NbPublicVariables