Update shcrypto

Author: jannikluhn

rolling-shutter/app/messages.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	bn256 "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
+	"github.com/ethereum/go-ethereum/crypto/bls12381"
 	"github.com/pkg/errors"
 
 	"github.com/shutter-network/shutter/shlib/shcrypto"
@@ -54,14 +54,17 @@ func ParsePolyEvalMsg(msg *shmsg.PolyEval, sender common.Address) (*PolyEval, er
 
 // ParsePolyCommitmentMsg converts a shmsg.PolyCommitmentMsg to an app.PolyCommitmentMsg.
 func ParsePolyCommitmentMsg(msg *shmsg.PolyCommitment, sender common.Address) (*PolyCommitment, error) {
+	g2 := bls12381.NewG2()
 	gammas := shcrypto.Gammas{}
 	for _, g := range msg.Gammas {
-		g2 := new(bn256.G2)
-		_, err := g2.Unmarshal(g)
+		p, err := g2.FromBytes(g)
 		if err != nil {
 			return nil, err
 		}
-		gammas = append(gammas, g2)
+		if !g2.IsOnCurve(p) {
+			return nil, errors.Errorf("invalid gamma value %x", g)
+		}
+		gammas = append(gammas, p)
 	}
 	return &PolyCommitment{
 		Sender: sender,

rolling-shutter/cmd/cryptocmd/jsontests.go

@@ -10,7 +10,7 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	bn256 "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
+	"github.com/ethereum/go-ethereum/crypto/bls12381"
 	"github.com/spf13/cobra"
 
 	"github.com/shutter-network/shutter/shlib/shcrypto"
@@ -452,12 +452,13 @@ func createEncryptionTest(keygen *testkeygen.KeyGenerator, message []byte) (*enc
 // tamperEncryptedMessage changes the C1 value of EncryptedMessage, which allows to test for malleability issues.
 func tamperEncryptedMessage(keygen *testkeygen.KeyGenerator, et encryptionTest) encryptionTest {
 	decryptionKey := keygen.EpochSecretKey(et.EpochID)
-	var c1 *bn256.G2
+	g2 := bls12381.NewG2()
+	var c1 *bls12381.PointG2
 	var err error
 
 	for i := 1; i <= 10000; i++ {
 		c1 = et.Expected.C1
-		c1.Add(c1, c1)
+		g2.Add(c1, c1, c1)
 		et.Expected.C1 = c1
 		sigma := et.Expected.Sigma(decryptionKey)
 		decryptedBlocks := shcrypto.DecryptBlocks(et.Expected.C3, sigma)

rolling-shutter/go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/rs/zerolog v1.28.0
 	github.com/shutter-network/gnosh-contracts v0.2.0
 	github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6
-	github.com/shutter-network/shutter/shlib v0.1.13
+	github.com/shutter-network/shutter/shlib v0.1.18
 	github.com/shutter-network/txtypes v0.1.0
 	github.com/spf13/afero v1.8.2
 	github.com/spf13/cobra v1.6.1

rolling-shutter/go.sum

@@ -835,8 +835,8 @@ github.com/shutter-network/gnosh-contracts v0.2.0 h1:qH3gAhlh5VZzvJcbi044lxFWQ+M
 github.com/shutter-network/gnosh-contracts v0.2.0/go.mod h1:QB0d64ybbVFKMrLjrc1tldri87KNjTmKQjhk9jaso2E=
 github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6 h1:m6Ti1/IH+GBTtGqyAX3xbh+ruUKvC+m+/uzYDUa+JDQ=
 github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6/go.mod h1:LEWXLRruvxq9fe2oKtJI3xfzbauhfWTjOczHN61RU+4=
-github.com/shutter-network/shutter/shlib v0.1.13 h1:9YloDJBdhFAKm2GMg4gBNeaJ+Mw9Qzeh5Kz9A2ayp1E=
-github.com/shutter-network/shutter/shlib v0.1.13/go.mod h1:RlYNZjx+pfKAi0arH+jfdlxG4kQ75UFzDfVjgCVYaUw=
+github.com/shutter-network/shutter/shlib v0.1.18 h1:ei1EWEavnlkwbX51aGKtgt7NydY0IPNV35J525vAfeo=
+github.com/shutter-network/shutter/shlib v0.1.18/go.mod h1:RlYNZjx+pfKAi0arH+jfdlxG4kQ75UFzDfVjgCVYaUw=
 github.com/shutter-network/txtypes v0.1.0 h1:QqdiiiB9AiBCSJ/ke6z1ZoDGfu2+1Lgpz5vHzVN4FKc=
 github.com/shutter-network/txtypes v0.1.0/go.mod h1:gaLQWfEFH+3q5CmM3kkSgS+NspclEs8SCnj8QAozsaI=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=

rolling-shutter/keyper/shutterevents/marshal.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
-	bn256 "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
+	"github.com/ethereum/go-ethereum/crypto/bls12381"
 	"github.com/ethereum/go-ethereum/crypto/ecies"
 	"github.com/pkg/errors"
 
@@ -96,28 +96,32 @@ func decodePubkey(val string) (*ecdsa.PublicKey, error) {
 }
 
 func encodeGammas(gammas *shcrypto.Gammas) string {
+	g2 := bls12381.NewG2()
 	var encoded []string
 	if gammas != nil {
 		for _, g := range *gammas {
-			encoded = append(encoded, hex.EncodeToString(g.Marshal()))
+			encoded = append(encoded, hex.EncodeToString(g2.ToBytes(g)))
 		}
 	}
 	return strings.Join(encoded, ",")
 }
 
 func decodeGammas(eventValue string) (shcrypto.Gammas, error) {
+	g2 := bls12381.NewG2()
 	parts := strings.Split(eventValue, ",")
 	var res shcrypto.Gammas
 	for _, p := range parts {
 		marshaledG2, err := hex.DecodeString(p)
 		if err != nil {
 			return shcrypto.Gammas{}, err
 		}
-		g := new(bn256.G2)
-		_, err = g.Unmarshal(marshaledG2)
+		g, err := g2.FromBytes(marshaledG2)
 		if err != nil {
 			return shcrypto.Gammas{}, err
 		}
+		if !g2.IsOnCurve(g) {
+			return shcrypto.Gammas{}, errors.Errorf("invalid gamma value %x", p)
+		}
 		res = append(res, g)
 	}
 	return res, nil

rolling-shutter/mocknode/mocknode.go

@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	bn256 "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	txtypes "github.com/shutter-network/txtypes/types"
@@ -107,7 +106,7 @@ func (m *MockNode) handleEonPublicKey(
 	if err := m.eonPublicKey.Unmarshal(key.PublicKey); err != nil {
 		log.Info().Err(err).Msg("failed to unmarshal eon public key")
 	}
-	log.Info().Str("eon-public-key", (*bn256.G2)(m.eonPublicKey).String()).
+	log.Info().Hex("eon-public-key", m.eonPublicKey.Marshal()).
 		Msg("updated eon public key from messages to %s")
 	return make([]p2pmsg.Message, 0), nil
 }

rolling-shutter/shmsg/messages.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/crypto/bls12381"
 	"github.com/ethereum/go-ethereum/crypto/ecies"
 
 	shcrypto "github.com/shutter-network/shutter/shlib/shcrypto"
@@ -79,9 +80,10 @@ func NewAccusation(eon uint64, accused []common.Address) *Message {
 
 // NewPolyCommitment creates a new poly commitment message containing gamma values.
 func NewPolyCommitment(eon uint64, gammas *shcrypto.Gammas) *Message {
+	g2 := bls12381.NewG2()
 	gammaBytes := [][]byte{}
 	for _, gamma := range *gammas {
-		gammaBytes = append(gammaBytes, gamma.Marshal())
+		gammaBytes = append(gammaBytes, g2.ToBytes(gamma))
 	}
 
 	return &Message{

rolling-shutter/shmsg/messages_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto/bls12381"
 	"gotest.tools/v3/assert"
 
 	shcrypto "github.com/shutter-network/shutter/shlib/shcrypto"
@@ -24,9 +25,10 @@ func TestNewPolyCommitmentMsg(t *testing.T) {
 
 	assert.Equal(t, eon, msg.Eon)
 	assert.Equal(t, int(threshold)+1, len(msg.Gammas))
+	g2 := bls12381.NewG2()
 	for i := 0; i < int(threshold)+1; i++ {
 		gammaBytes := msg.Gammas[i]
-		assert.DeepEqual(t, gammaBytes, (*gammas)[i].Marshal())
+		assert.DeepEqual(t, gammaBytes, g2.ToBytes((*gammas)[i]))
 	}
 }