Move all blst function usage to bls pkg (#2222)

Signed-off-by: Dan Laine <[email protected]>
Co-authored-by: Dan Laine <[email protected]>

snow/validators/gvalidators/validator_state_client.go

@@ -80,7 +80,7 @@ func (c *Client) GetValidatorSet(
 			// and key re-verification with PublicKeyFromBytes. We can safely
 			// assume that the BLS Public Keys are verified before being added
 			// to the P-Chain and served by the gRPC server.
-			publicKey = new(bls.PublicKey).Deserialize(validator.PublicKey)
+			publicKey = bls.DeserializePublicKey(validator.PublicKey)
 			if publicKey == nil {
 				return nil, errFailedPublicKeyDeserialize
 			}

snow/validators/gvalidators/validator_state_server.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/validators"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 
 	pb "github.com/ava-labs/avalanchego/proto/pb/validatorstate"
 )
@@ -71,7 +72,7 @@ func (s *Server) GetValidatorSet(ctx context.Context, req *pb.GetValidatorSetReq
 		if vdr.PublicKey != nil {
 			// This is a performance optimization to avoid the cost of compression
 			// from PublicKeyToBytes.
-			vdrPB.PublicKey = vdr.PublicKey.Serialize()
+			vdrPB.PublicKey = bls.SerializePublicKey(vdr.PublicKey)
 		}
 		resp.Validators[i] = vdrPB
 		i++

snow/validators/gvalidators/validator_state_test.go

@@ -188,8 +188,8 @@ func TestPublicKeyDeserialize(t *testing.T) {
 	require.NoError(err)
 	pk := bls.PublicFromSecretKey(sk)
 
-	pkBytes := pk.Serialize()
-	pkDe := new(bls.PublicKey).Deserialize(pkBytes)
+	pkBytes := bls.SerializePublicKey(pk)
+	pkDe := bls.DeserializePublicKey(pkBytes)
 	require.NotNil(pkDe)
 	require.Equal(pk, pkDe)
 }

tests/fixture/testnet/config.go

@@ -223,7 +223,7 @@ func (nc *NodeConfig) EnsureBLSSigningKey() error {
 	if err != nil {
 		return fmt.Errorf("failed to generate staking signer key: %w", err)
 	}
-	nc.Flags[config.StakingSignerKeyContentKey] = base64.StdEncoding.EncodeToString(newKey.Serialize())
+	nc.Flags[config.StakingSignerKeyContentKey] = base64.StdEncoding.EncodeToString(bls.SerializeSecretKey(newKey))
 	return nil
 }
 

utils/crypto/bls/public.go

@@ -70,3 +70,11 @@ func Verify(pk *PublicKey, sig *Signature, msg []byte) bool {
 func VerifyProofOfPossession(pk *PublicKey, sig *Signature, msg []byte) bool {
 	return sig.Verify(false, pk, false, msg, ciphersuiteProofOfPossession)
 }
+
+func DeserializePublicKey(pkBytes []byte) *PublicKey {
+	return new(PublicKey).Deserialize(pkBytes)
+}
+
+func SerializePublicKey(key *PublicKey) []byte {
+	return key.Serialize()
+}

utils/crypto/bls/secret.go

@@ -71,3 +71,11 @@ func Sign(sk *SecretKey, msg []byte) *Signature {
 func SignProofOfPossession(sk *SecretKey, msg []byte) *Signature {
 	return new(Signature).Sign(sk, msg, ciphersuiteProofOfPossession)
 }
+
+func DeserializeSecretKey(pkBytes []byte) *SecretKey {
+	return new(SecretKey).Deserialize(pkBytes)
+}
+
+func SerializeSecretKey(key *SecretKey) []byte {
+	return key.Serialize()
+}

vms/platformvm/state/state.go

@@ -1322,7 +1322,7 @@ func (s *state) ApplyValidatorPublicKeyDiffs(
 			continue
 		}
 
-		vdr.PublicKey = new(bls.PublicKey).Deserialize(pkBytes)
+		vdr.PublicKey = bls.DeserializePublicKey(pkBytes)
 	}
 
 	// Note: this does not fallback to the linkeddb index because the linkeddb
@@ -2060,7 +2060,7 @@ func (s *state) writeCurrentStakers(updateValidators bool, height uint64) error
 					// diffs.
 					err := s.flatValidatorPublicKeyDiffsDB.Put(
 						marshalDiffKey(constants.PrimaryNetworkID, height, nodeID),
-						staker.PublicKey.Serialize(),
+						bls.SerializePublicKey(staker.PublicKey),
 					)
 					if err != nil {
 						return err

vms/platformvm/vm_regression_test.go

@@ -2255,7 +2255,7 @@ func checkValidatorBlsKeyIsSet(
 		return errors.New("unexpected BLS key")
 	case expectedBlsKey != nil && val.PublicKey == nil:
 		return errors.New("missing BLS key")
-	case !bytes.Equal(expectedBlsKey.Serialize(), val.PublicKey.Serialize()):
+	case !bytes.Equal(bls.SerializePublicKey(expectedBlsKey), bls.SerializePublicKey(val.PublicKey)):
 		return errors.New("incorrect BLS key")
 	default:
 		return nil

vms/platformvm/warp/signature_test.go

@@ -56,7 +56,7 @@ func newTestValidator() *testValidator {
 		sk:     sk,
 		vdr: &Validator{
 			PublicKey:      pk,
-			PublicKeyBytes: pk.Serialize(),
+			PublicKeyBytes: bls.SerializePublicKey(pk),
 			Weight:         3,
 			NodeIDs:        []ids.NodeID{nodeID},
 		},

vms/platformvm/warp/validator.go

@@ -72,7 +72,7 @@ func GetCanonicalValidatorSet(
 			continue
 		}
 
-		pkBytes := vdr.PublicKey.Serialize()
+		pkBytes := bls.SerializePublicKey(vdr.PublicKey)
 		uniqueVdr, ok := vdrs[string(pkBytes)]
 		if !ok {
 			uniqueVdr = &Validator{

vms/platformvm/warp/validator_test.go

@@ -166,7 +166,7 @@ func TestFilterValidators(t *testing.T) {
 	pk0 := bls.PublicFromSecretKey(sk0)
 	vdr0 := &Validator{
 		PublicKey:      pk0,
-		PublicKeyBytes: pk0.Serialize(),
+		PublicKeyBytes: bls.SerializePublicKey(pk0),
 		Weight:         1,
 	}
 
@@ -175,7 +175,7 @@ func TestFilterValidators(t *testing.T) {
 	pk1 := bls.PublicFromSecretKey(sk1)
 	vdr1 := &Validator{
 		PublicKey:      pk1,
-		PublicKeyBytes: pk1.Serialize(),
+		PublicKeyBytes: bls.SerializePublicKey(pk1),
 		Weight:         2,
 	}