Adds std/math/bits

backend/hint/builtin.go

@@ -11,20 +11,10 @@ var (
 	// corresponds to checking if a == 0 (for which the function returns 1) or a
 	// != 0 (for which the function returns 0).
 	IsZero = NewStaticHint(isZero)
-
-	// IthBit returns the i-tb bit the input. The function expects exactly two
-	// integer inputs i and n, takes the little-endian bit representation of n and
-	// returns its i-th bit.
-	IthBit = NewStaticHint(ithBit)
-
-	// NBits returns the n first bits of the input. Expects one argument: n.
-	NBits = NewStaticHint(nBits)
 )
 
 func init() {
 	Register(IsZero)
-	Register(IthBit)
-	Register(NBits)
 }
 
 func isZero(curveID ecc.ID, inputs []*big.Int, results []*big.Int) error {
@@ -47,22 +37,3 @@ func isZero(curveID ecc.ID, inputs []*big.Int, results []*big.Int) error {
 
 	return nil
 }
-
-func ithBit(_ ecc.ID, inputs []*big.Int, results []*big.Int) error {
-	result := results[0]
-	if !inputs[1].IsUint64() {
-		result.SetUint64(0)
-		return nil
-	}
-
-	result.SetUint64(uint64(inputs[0].Bit(int(inputs[1].Uint64()))))
-	return nil
-}
-
-func nBits(_ ecc.ID, inputs []*big.Int, results []*big.Int) error {
-	n := inputs[0]
-	for i := 0; i < len(results); i++ {
-		results[i].SetUint64(uint64(n.Bit(i)))
-	}
-	return nil
-}

examples/exponentiate/exponentiate.go

@@ -16,6 +16,7 @@ package exponentiate
 
 import (
 	"github.com/consensys/gnark/frontend"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // Circuit y == x**e
@@ -38,7 +39,7 @@ func (circuit *Circuit) Define(api frontend.API) error {
 
 	// specify constraints
 	output := frontend.Variable(1)
-	bits := api.ToBinary(circuit.E, bitSize)
+	bits := bits.ToBinary(api, circuit.E, bits.WithNbDigits(bitSize))
 
 	for i := 0; i < len(bits); i++ {
 		if i != 0 {

frontend/cs/r1cs/api.go

@@ -29,6 +29,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 	"github.com/consensys/gnark/frontend/compiled"
 	"github.com/consensys/gnark/frontend/schema"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // ---------------------------------------------------------------------------------------------
@@ -253,7 +254,6 @@ func (system *r1cs) Inverse(i1 frontend.Variable) frontend.Variable {
 //
 // The result in in little endian (first bit= lsb)
 func (system *r1cs) ToBinary(i1 frontend.Variable, n ...int) []frontend.Variable {
-
 	// nbBits
 	nbBits := system.BitLen()
 	if len(n) == 1 {
@@ -263,83 +263,12 @@ func (system *r1cs) ToBinary(i1 frontend.Variable, n ...int) []frontend.Variable
 		}
 	}
 
-	vars, _ := system.toVariables(i1)
-	a := vars[0]
-
-	// if a is a constant, work with the big int value.
-	if c, ok := system.ConstantValue(a); ok {
-		b := make([]frontend.Variable, nbBits)
-		for i := 0; i < len(b); i++ {
-			b[i] = system.toVariable(c.Bit(i))
-		}
-		return b
-	}
-
-	return system.toBinary(a, nbBits, false)
-}
-
-// toBinary is equivalent to ToBinary, exept the returned bits are NOT boolean constrained.
-func (system *r1cs) toBinary(a compiled.LinearExpression, nbBits int, unsafe bool) []frontend.Variable {
-
-	if _, ok := system.ConstantValue(a); ok {
-		return system.ToBinary(a, nbBits)
-	}
-
-	// allocate the resulting frontend.Variables and bit-constraint them
-	sb := make([]frontend.Variable, nbBits)
-	var c big.Int
-	c.SetUint64(1)
-
-	bits, err := system.NewHint(hint.NBits, nbBits, a)
-	if err != nil {
-		panic(err)
-	}
-
-	for i := 0; i < nbBits; i++ {
-		sb[i] = system.Mul(bits[i], c)
-		c.Lsh(&c, 1)
-		if !unsafe {
-			system.AssertIsBoolean(bits[i])
-		}
-	}
-
-	//var Σbi compiled.LinearExpression
-	var Σbi frontend.Variable
-	if nbBits == 1 {
-		Σbi = sb[0]
-	} else if nbBits == 2 {
-		Σbi = system.Add(sb[0], sb[1])
-	} else {
-		Σbi = system.Add(sb[0], sb[1], sb[2:]...)
-	}
-	system.AssertIsEqual(Σbi, a)
-
-	// record the constraint Σ (2**i * b[i]) == a
-	return bits
-
+	return bits.ToBinary(system, i1, bits.WithNbDigits(nbBits))
 }
 
 // FromBinary packs b, seen as a fr.Element in little endian
 func (system *r1cs) FromBinary(_b ...frontend.Variable) frontend.Variable {
-	b, _ := system.toVariables(_b...)
-
-	// res = Σ (2**i * b[i])
-
-	var res, v frontend.Variable
-	res = system.toVariable(0) // no constraint is recorded
-
-	var c big.Int
-	c.SetUint64(1)
-
-	L := make(compiled.LinearExpression, len(b))
-	for i := 0; i < len(L); i++ {
-		v = system.Mul(c, b[i])      // no constraint is recorded
-		res = system.Add(v, res)     // no constraint is recorded
-		system.AssertIsBoolean(b[i]) // ensures the b[i]'s are boolean
-		c.Lsh(&c, 1)
-	}
-
-	return res
+	return bits.FromBinary(system, _b)
 }
 
 // Xor compute the XOR between two frontend.Variables

frontend/cs/r1cs/api_assertions.go

@@ -23,6 +23,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 	"github.com/consensys/gnark/frontend/compiled"
 	"github.com/consensys/gnark/internal/utils"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // AssertIsEqual adds an assertion in the constraint system (i1 == i2)
@@ -92,7 +93,7 @@ func (system *r1cs) mustBeLessOrEqVar(a, bound compiled.LinearExpression) {
 
 	nbBits := system.BitLen()
 
-	aBits := system.toBinary(a, nbBits, true)
+	aBits := bits.ToBinary(system, a, bits.WithNbDigits(nbBits), bits.WithUnconstrainedOutputs())
 	boundBits := system.ToBinary(bound, nbBits)
 
 	p := make([]frontend.Variable, nbBits+1)
@@ -145,7 +146,7 @@ func (system *r1cs) mustBeLessOrEqCst(a compiled.LinearExpression, bound big.Int
 
 	// note that at this stage, we didn't boolean-constraint these new variables yet
 	// (as opposed to ToBinary)
-	aBits := system.toBinary(a, nbBits, true)
+	aBits := bits.ToBinary(system, a, bits.WithNbDigits(nbBits), bits.WithUnconstrainedOutputs())
 
 	// t trailing bits in the bound
 	t := 0

frontend/cs/scs/api.go

@@ -29,6 +29,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 	"github.com/consensys/gnark/frontend/compiled"
 	"github.com/consensys/gnark/frontend/schema"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // Add returns res = i1+i2+...in
@@ -174,7 +175,6 @@ func (system *scs) Inverse(i1 frontend.Variable) frontend.Variable {
 //
 // The result in in little endian (first bit= lsb)
 func (system *scs) ToBinary(i1 frontend.Variable, n ...int) []frontend.Variable {
-
 	// nbBits
 	nbBits := system.BitLen()
 	if len(n) == 1 {
@@ -184,72 +184,12 @@ func (system *scs) ToBinary(i1 frontend.Variable, n ...int) []frontend.Variable
 		}
 	}
 
-	// if a is a constant, work with the big int value.
-	if c, ok := system.ConstantValue(i1); ok {
-		b := make([]frontend.Variable, nbBits)
-		for i := 0; i < len(b); i++ {
-			b[i] = c.Bit(i)
-		}
-		return b
-	}
-
-	a := i1.(compiled.Term)
-	return system.toBinary(a, nbBits, false)
-}
-
-func (system *scs) toBinary(a compiled.Term, nbBits int, unsafe bool) []frontend.Variable {
-
-	// allocate the resulting frontend.Variables and bit-constraint them
-	sb := make([]frontend.Variable, nbBits)
-	var c big.Int
-	c.SetUint64(1)
-
-	bits, err := system.NewHint(hint.NBits, nbBits, a)
-	if err != nil {
-		panic(err)
-	}
-
-	for i := 0; i < nbBits; i++ {
-		sb[i] = system.Mul(bits[i], c)
-		c.Lsh(&c, 1)
-		if !unsafe {
-			system.AssertIsBoolean(bits[i])
-		}
-	}
-
-	//var Σbi compiled.Term
-	// TODO we can save a constraint here
-	var Σbi frontend.Variable
-	if nbBits == 1 {
-		Σbi = sb[0]
-	} else if nbBits == 2 {
-		Σbi = system.Add(sb[0], sb[1])
-	} else {
-		Σbi = system.Add(sb[0], sb[1], sb[2:]...)
-	}
-	system.AssertIsEqual(Σbi, a)
-
-	// record the constraint Σ (2**i * b[i]) == a
-	return bits
-
+	return bits.ToBinary(system, i1, bits.WithNbDigits(nbBits))
 }
 
 // FromBinary packs b, seen as a fr.Element in little endian
 func (system *scs) FromBinary(b ...frontend.Variable) frontend.Variable {
-	_b := make([]frontend.Variable, len(b))
-	var c big.Int
-	c.SetUint64(1)
-	for i := 0; i < len(b); i++ {
-		_b[i] = system.Mul(b[i], c)
-		c.Lsh(&c, 1)
-	}
-	if len(b) == 1 {
-		return b[0]
-	}
-	if len(b) == 1 {
-		return system.Add(_b[0], _b[1])
-	}
-	return system.Add(_b[0], _b[1], _b[2:]...)
+	return bits.FromBinary(system, b)
 }
 
 // Xor returns a ^ b

frontend/cs/scs/api_assertions.go

@@ -23,6 +23,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 	"github.com/consensys/gnark/frontend/compiled"
 	"github.com/consensys/gnark/internal/utils"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // AssertIsEqual fails if i1 != i2
@@ -104,7 +105,7 @@ func (system *scs) mustBeLessOrEqVar(a compiled.Term, bound compiled.Term) {
 
 	nbBits := system.BitLen()
 
-	aBits := system.toBinary(a, nbBits, true)
+	aBits := bits.ToBinary(system, a, bits.WithNbDigits(nbBits), bits.WithUnconstrainedOutputs())
 	boundBits := system.ToBinary(bound, nbBits)
 
 	p := make([]frontend.Variable, nbBits+1)
@@ -162,7 +163,7 @@ func (system *scs) mustBeLessOrEqCst(a compiled.Term, bound big.Int) {
 
 	// note that at this stage, we didn't boolean-constraint these new variables yet
 	// (as opposed to ToBinary)
-	aBits := system.toBinary(a, nbBits, true)
+	aBits := bits.ToBinary(system, a, bits.WithNbDigits(nbBits), bits.WithUnconstrainedOutputs())
 
 	// t trailing bits in the bound
 	t := 0

std/hints.go

@@ -4,9 +4,17 @@ import (
 	"github.com/consensys/gnark/backend/hint"
 	"github.com/consensys/gnark/std/algebra/sw_bls12377"
 	"github.com/consensys/gnark/std/algebra/sw_bls24315"
+	"github.com/consensys/gnark/std/math/bits"
 )
 
 // GetHints return std hints that are always injected in gnark solvers
 func GetHints() []hint.Function {
-	return []hint.Function{sw_bls24315.DecomposeScalar, sw_bls12377.DecomposeScalar}
+	return []hint.Function{
+		sw_bls24315.DecomposeScalar,
+		sw_bls12377.DecomposeScalar,
+		bits.NTrits,
+		bits.NNAF,
+		bits.IthBit,
+		bits.NBits,
+	}
 }