Added field in code extractor

reilabs · Jun 21, 2023 · f3be700 · f3be700
1 parent 3b27a85
commit f3be700
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/extractor/extractor.go b/extractor/extractor.go
@@ -6,6 +6,7 @@ import (
 	"math/big"
 	"reflect"
 
+	"github.com/consensys/gnark-crypto/ecc"
 	"github.com/consensys/gnark/backend/hint"
 	"github.com/consensys/gnark/frontend"
 )
@@ -129,6 +130,7 @@ type ExCircuit struct {
 type CodeExtractor struct {
 	Code    []App
 	Gadgets []ExGadget
+	Field   ecc.ID
 }
 
 func operandFromArray(arg []frontend.Variable) Operand {
@@ -194,7 +196,7 @@ func (ce *CodeExtractor) Inverse(i1 frontend.Variable) frontend.Variable {
 }
 
 func (ce *CodeExtractor) ToBinary(i1 frontend.Variable, n ...int) []frontend.Variable {
-	nbBits := 254 // Taken from gnark lib
+	nbBits := ce.Field.ScalarField().BitLen()
 	if len(n) == 1 {
 		nbBits = n[0]
 		if nbBits < 0 {

diff --git a/extractor/extractor_test.go b/extractor/extractor_test.go
@@ -5,6 +5,7 @@ import (
 	"gnark-extractor/abstractor"
 	"testing"
 
+	"github.com/consensys/gnark-crypto/ecc"
 	"github.com/consensys/gnark/frontend"
 )
 
@@ -47,7 +48,7 @@ func (circuit MerkleRecover) Define(api frontend.API) error {
 
 func TestMerkleRecover(t *testing.T) {
 	assignment := MerkleRecover{}
-	err := CircuitToLean(&assignment)
+	err := CircuitToLean(&assignment, ecc.BW6_756)
 	if err != nil {
 		fmt.Println("CircuitToLean error!")
 		fmt.Println(err.Error())
@@ -89,7 +90,7 @@ func (circuit TwoGadgets) Define(api frontend.API) error {
 
 func TestTwoGadgets(t *testing.T) {
 	assignment := TwoGadgets{}
-	err := CircuitToLean(&assignment)
+	err := CircuitToLean(&assignment, ecc.BN254)
 	if err != nil {
 		fmt.Println("CircuitToLean error!")
 		fmt.Println(err.Error())

diff --git a/extractor/lean_export.go b/extractor/lean_export.go
@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/consensys/gnark-crypto/ecc"
 	"github.com/consensys/gnark/frontend"
 )
 
@@ -30,10 +31,11 @@ func ExportCircuit(circuit ExCircuit) string {
 	return fmt.Sprintf("%s\n\n%s", strings.Join(gadgets, "\n\n"), circ)
 }
 
-func CircuitToLean(circuit abstractor.Circuit) error {
+func CircuitToLean(circuit abstractor.Circuit, field ecc.ID) error {
 	api := CodeExtractor{
 		Code:    []App{},
 		Gadgets: []ExGadget{},
+		Field:   field,
 	}
 	err := circuit.AbsDefine(&api)
 	if err != nil {