[FEAT] Full refactor of gnark circuits which reuse code now,

Removed SecretData from required parameters because it's computed inside circuits

Author: Alex E

bin/gnark/linux-arm64-libprove.so

@@ -33,7 +33,5 @@ func (c *AESTOPRFCircuit) Define(api frontend.API) error {
 		}
 	}
 
-	c.TOPRF.SecretData = toprf.ExtractSecretElements(api, outBits, c.Bitmask[:], c.Len)
-
-	return toprf.VerifyTOPRF(api, &c.TOPRF)
+	return toprf.VerifyTOPRF(api, &c.TOPRF, toprf.ExtractSecretElements(api, outBits, c.Bitmask[:], c.Len))
 }

bin/gnark/linux-arm64-libverify.so

@@ -25,8 +25,7 @@ func TestAES128(t *testing.T) {
 
 	secretStr := "00000000001111111111000000000011000000000011111111110000000000" // max 62 bytes
 	secretBytes := []byte(secretStr)
-	d, err := toprf.PrepareTestData(secretStr, "reclaim")
-	assert.NoError(err)
+	d, _ := toprf.PrepareTestData(secretStr, "reclaim")
 
 	pos := 18
 	Counter := 12345
@@ -79,7 +78,6 @@ func createWitness(d *toprf.Params, bKey []uint8, bNonce []uint8, counter int, c
 		Out: [aes_v2.BLOCKS * 16]frontend.Variable{},
 		Len: l,
 		TOPRF: toprf.Params{
-			SecretData:      [2]frontend.Variable{0, 0}, // will be rewritten inside
 			Mask:            d.Mask,
 			DomainSeparator: d.DomainSeparator,
 			Responses:       d.Responses,

bin/gnark/linux-x86_64-libprove.so

@@ -25,8 +25,7 @@ func TestAES256(t *testing.T) {
 
 	secretStr := "00000000001111111111000000000011" // max 62 bytes
 	secretBytes := []byte(secretStr)
-	d, err := toprf.PrepareTestData(secretStr, "reclaim")
-	assert.NoError(err)
+	d, _ := toprf.PrepareTestData(secretStr, "reclaim")
 
 	pos := 30
 	Counter := 12345
@@ -68,7 +67,6 @@ func createWitness256(d *toprf.Params, bKey []uint8, bNonce []uint8, counter int
 		Out: [aes_v2.BLOCKS * 16]frontend.Variable{},
 		Len: l,
 		TOPRF: toprf.Params{
-			SecretData:      [2]frontend.Variable{0, 0}, // will be rewritten inside
 			Mask:            d.Mask,
 			DomainSeparator: d.DomainSeparator,
 			Responses:       d.Responses,

bin/gnark/linux-x86_64-libverify.so

@@ -35,7 +35,5 @@ func (c *ChachaTOPRFCircuit) Define(api frontend.API) error {
 		}
 	}
 
-	c.TOPRF.SecretData = toprf.ExtractSecretElements(api, outBits, c.Bitmask[:], c.Len)
-
-	return toprf.VerifyTOPRF(api, &c.TOPRF)
+	return toprf.VerifyTOPRF(api, &c.TOPRF, toprf.ExtractSecretElements(api, outBits, c.Bitmask[:], c.Len))
 }

gnark/circuits/aesV2_oprf/aes.go

@@ -41,8 +41,7 @@ func TestCipher(t *testing.T) {
 	cipher.SetCounter(uint32(counter))
 	cipher.XORKeyStream(ciphertext, plaintext)
 
-	d, err := toprf.PrepareTestData(secretStr, "reclaim")
-	assert.NoError(err)
+	d, _ := toprf.PrepareTestData(secretStr, "reclaim")
 
 	witness := createWitness(d, bKey, bNonce, counter, ciphertext, plaintext, pos, len(secretBytes))
 
@@ -74,7 +73,6 @@ func createWitness(d *toprf.Params, bKey []uint8, bNonce []uint8, counter int, c
 	witness := ChachaTOPRFCircuit{
 		Len: len,
 		TOPRF: toprf.Params{
-			SecretData:      [2]frontend.Variable{0, 0}, // will be rewritten inside
 			Mask:            d.Mask,
 			DomainSeparator: d.DomainSeparator,
 			Responses:       d.Responses,

gnark/circuits/aesV2_oprf/aes128_test.go

@@ -25,10 +25,10 @@ type TestData struct {
 	Proof      *Proof
 }
 
-func PrepareTestData(secretData string, domainSeparator string) (*Params, error) {
+func PrepareTestData(secretData string, domainSeparator string) (*Params, [2]frontend.Variable) {
 	req, err := utils.OPRFGenerateRequest([]byte(secretData), domainSeparator)
 	if err != nil {
-		return nil, err
+		panic(err)
 	}
 
 	// server secret
@@ -42,7 +42,7 @@ func PrepareTestData(secretData string, domainSeparator string) (*Params, error)
 
 	shares, err := utils.TOPRFCreateShares(nodes, threshold, sk)
 	if err != nil {
-		return nil, err
+		panic(err)
 	}
 
 	idxs := utils.PickRandomIndexes(nodes, threshold)
@@ -60,7 +60,7 @@ func PrepareTestData(secretData string, domainSeparator string) (*Params, error)
 		var resp *utils.OPRFResponse
 		resp, err = utils.OPRFEvaluate(shares[idx].PrivateKey, req.MaskedData)
 		if err != nil {
-			return nil, err
+			panic(err)
 		}
 
 		resps[i] = utils.OutPointToInPoint(resp.EvaluatedPoint)
@@ -74,16 +74,15 @@ func PrepareTestData(secretData string, domainSeparator string) (*Params, error)
 	// without TOPRF
 	resp, err := utils.OPRFEvaluate(sk, req.MaskedData)
 	if err != nil {
-		return nil, err
+		panic(err)
 	}
 
 	out, err := utils.OPRFFinalize(serverPublic, req, resp)
 	if err != nil {
-		return nil, err
+		panic(err)
 	}
 
 	data := &Params{
-		SecretData:      [2]frontend.Variable{req.SecretElements[0], req.SecretElements[1]},
 		DomainSeparator: new(big.Int).SetBytes([]byte(domainSeparator)),
 		Output:          out,
 		Mask:            req.Mask,
@@ -95,5 +94,5 @@ func PrepareTestData(secretData string, domainSeparator string) (*Params, error)
 	copy(data.C[:], cs)
 	copy(data.R[:], rs)
 
-	return data, nil
+	return data, [2]frontend.Variable{req.SecretElements[0], req.SecretElements[1]}
 }