Change Affine.ToProjective implementation to be in Go instead of call…

…ing down to cpp
ingonyama-zk · Sep 19, 2024 · 8a004d3 · 8a004d3
1 parent b58af44
commit 8a004d3
Show file tree

Hide file tree

Showing 29 changed files with 354 additions and 30 deletions.
diff --git a/wrappers/golang/core/internal/mock_curve.go b/wrappers/golang/core/internal/mock_curve.go
@@ -47,6 +47,10 @@ func (a *MockAffine) Zero() MockAffine {
 	return *a
 }
 
+func (a *MockAffine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *MockAffine) FromLimbs(x, y []uint32) MockAffine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)

diff --git a/wrappers/golang/core/internal/mock_field.go b/wrappers/golang/core/internal/mock_field.go
@@ -53,6 +53,16 @@ func (f *MockBaseField) Zero() MockBaseField {
 	return *f
 }
 
+func (f *MockBaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *MockBaseField) One() MockBaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12377/base_field.go b/wrappers/golang/curves/bls12377/base_field.go
@@ -53,6 +53,16 @@ func (f *BaseField) Zero() BaseField {
 	return *f
 }
 
+func (f *BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *BaseField) One() BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12377/curve.go b/wrappers/golang/curves/bls12377/curve.go
@@ -96,6 +96,10 @@ func (a *Affine) Zero() Affine {
 	return *a
 }
 
+func (a *Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *Affine) FromLimbs(x, y []uint32) Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *Affine) FromLimbs(x, y []uint32) Affine {
 func (a Affine) ToProjective() Projective {
 	var p Projective
 
-	cA := (*C.affine_t)(unsafe.Pointer(&a))
-	cP := (*C.projective_t)(unsafe.Pointer(&p))
-	C.bls12_377_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.projective_t)(unsafe.Pointer(&p))
+	// C.bls12_377_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bls12377/g2/curve.go b/wrappers/golang/curves/bls12377/g2/curve.go
@@ -96,6 +96,10 @@ func (a *G2Affine) Zero() G2Affine {
 	return *a
 }
 
+func (a *G2Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 func (a G2Affine) ToProjective() G2Projective {
 	var p G2Projective
 
-	cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
-	cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
-	C.bls12_377_g2_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
+	// C.bls12_377_g2_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bls12377/g2/g2base_field.go b/wrappers/golang/curves/bls12377/g2/g2base_field.go
@@ -53,6 +53,16 @@ func (f *G2BaseField) Zero() G2BaseField {
 	return *f
 }
 
+func (f *G2BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *G2BaseField) One() G2BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12377/scalar_field.go b/wrappers/golang/curves/bls12377/scalar_field.go
@@ -60,6 +60,16 @@ func (f *ScalarField) Zero() ScalarField {
 	return *f
 }
 
+func (f *ScalarField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *ScalarField) One() ScalarField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12381/base_field.go b/wrappers/golang/curves/bls12381/base_field.go
@@ -53,6 +53,16 @@ func (f *BaseField) Zero() BaseField {
 	return *f
 }
 
+func (f *BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *BaseField) One() BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12381/curve.go b/wrappers/golang/curves/bls12381/curve.go
@@ -96,6 +96,10 @@ func (a *Affine) Zero() Affine {
 	return *a
 }
 
+func (a *Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *Affine) FromLimbs(x, y []uint32) Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *Affine) FromLimbs(x, y []uint32) Affine {
 func (a Affine) ToProjective() Projective {
 	var p Projective
 
-	cA := (*C.affine_t)(unsafe.Pointer(&a))
-	cP := (*C.projective_t)(unsafe.Pointer(&p))
-	C.bls12_381_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.projective_t)(unsafe.Pointer(&p))
+	// C.bls12_381_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bls12381/g2/curve.go b/wrappers/golang/curves/bls12381/g2/curve.go
@@ -96,6 +96,10 @@ func (a *G2Affine) Zero() G2Affine {
 	return *a
 }
 
+func (a *G2Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 func (a G2Affine) ToProjective() G2Projective {
 	var p G2Projective
 
-	cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
-	cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
-	C.bls12_381_g2_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
+	// C.bls12_381_g2_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bls12381/g2/g2base_field.go b/wrappers/golang/curves/bls12381/g2/g2base_field.go
@@ -53,6 +53,16 @@ func (f *G2BaseField) Zero() G2BaseField {
 	return *f
 }
 
+func (f *G2BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *G2BaseField) One() G2BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bls12381/scalar_field.go b/wrappers/golang/curves/bls12381/scalar_field.go
@@ -60,6 +60,16 @@ func (f *ScalarField) Zero() ScalarField {
 	return *f
 }
 
+func (f *ScalarField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *ScalarField) One() ScalarField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bn254/base_field.go b/wrappers/golang/curves/bn254/base_field.go
@@ -53,6 +53,16 @@ func (f *BaseField) Zero() BaseField {
 	return *f
 }
 
+func (f *BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *BaseField) One() BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bn254/curve.go b/wrappers/golang/curves/bn254/curve.go
@@ -96,6 +96,10 @@ func (a *Affine) Zero() Affine {
 	return *a
 }
 
+func (a *Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *Affine) FromLimbs(x, y []uint32) Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *Affine) FromLimbs(x, y []uint32) Affine {
 func (a Affine) ToProjective() Projective {
 	var p Projective
 
-	cA := (*C.affine_t)(unsafe.Pointer(&a))
-	cP := (*C.projective_t)(unsafe.Pointer(&p))
-	C.bn254_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.projective_t)(unsafe.Pointer(&p))
+	// C.bn254_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bn254/g2/curve.go b/wrappers/golang/curves/bn254/g2/curve.go
@@ -96,6 +96,10 @@ func (a *G2Affine) Zero() G2Affine {
 	return *a
 }
 
+func (a *G2Affine) IsZero() bool {
+	return a.X.IsZero() && a.Y.IsZero()
+}
+
 func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 	a.X.FromLimbs(x)
 	a.Y.FromLimbs(y)
@@ -106,9 +110,19 @@ func (a *G2Affine) FromLimbs(x, y []uint32) G2Affine {
 func (a G2Affine) ToProjective() G2Projective {
 	var p G2Projective
 
-	cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
-	cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
-	C.bn254_g2_from_affine(cA, cP)
+	// TODO - Figure out why this sometimes returns an empty projective point, i.e. {x:0, y:0, z:0}
+	// cA := (*C.g2_affine_t)(unsafe.Pointer(&a))
+	// cP := (*C.g2_projective_t)(unsafe.Pointer(&p))
+	// C.bn254_g2_from_affine(cA, cP)
+
+	if a.IsZero() {
+		p.Zero()
+	} else {
+		p.X = a.X
+		p.Y = a.Y
+		p.Z.One()
+	}
+
 	return p
 }
 

diff --git a/wrappers/golang/curves/bn254/g2/g2base_field.go b/wrappers/golang/curves/bn254/g2/g2base_field.go
@@ -53,6 +53,16 @@ func (f *G2BaseField) Zero() G2BaseField {
 	return *f
 }
 
+func (f *G2BaseField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *G2BaseField) One() G2BaseField {
 	for i := range f.limbs {
 		f.limbs[i] = 0

diff --git a/wrappers/golang/curves/bn254/scalar_field.go b/wrappers/golang/curves/bn254/scalar_field.go
@@ -60,6 +60,16 @@ func (f *ScalarField) Zero() ScalarField {
 	return *f
 }
 
+func (f *ScalarField) IsZero() bool {
+	for _, limb := range f.limbs {
+		if limb != 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 func (f *ScalarField) One() ScalarField {
 	for i := range f.limbs {
 		f.limbs[i] = 0