BLS Components for Simplex

simplex/bls.go

@@ -4,6 +4,7 @@
 package simplex
 
 import (
+	"context"
 	"encoding/asn1"
 	"errors"
 	"fmt"
@@ -40,12 +41,14 @@ type BLSVerifier struct {
 	chainID   ids.ID
 }
 
-func NewBLSAuth(config *Config) (BLSSigner, BLSVerifier) {
+func NewBLSAuth(config *Config) (BLSSigner, BLSVerifier, error) {
+	verifier, err := createVerifier(config)
+
 	return BLSSigner{
 		chainID:  config.Ctx.ChainID,
 		subnetID: config.Ctx.SubnetID,
 		signBLS:  config.SignBLS,
-	}, createVerifier(config)
+	}, verifier, err
 }
 
 // Sign returns a signature on the given message using BLS signature scheme.
@@ -110,21 +113,22 @@ func (v BLSVerifier) Verify(message []byte, signature []byte, signer simplex.Nod
 	return nil
 }
 
-func createVerifier(config *Config) BLSVerifier {
+func createVerifier(config *Config) (BLSVerifier, error) {
 	verifier := BLSVerifier{
 		nodeID2PK: make(map[ids.NodeID]bls.PublicKey),
 		subnetID:  config.Ctx.SubnetID,
 		chainID:   config.Ctx.ChainID,
 	}
 
-	nodes := config.Validators.GetValidatorIDs(config.Ctx.SubnetID)
+	nodes, err := config.Validators.GetValidatorSet(context.Background(), 0, config.Ctx.SubnetID)
+	if err != nil {
+		config.Log.Error("failed to get validator set", zap.Error(err), zap.Stringer("subnetID", config.Ctx.SubnetID))
+		return BLSVerifier{}, err
+	}
+
 	for _, node := range nodes {
-		validator, ok := config.Validators.GetValidator(config.Ctx.SubnetID, node)
-		if !ok {
-			config.Log.Error("failed to get validator for node %s in subnet %s", zap.Stringer("node", node), zap.Stringer("subnetID", config.Ctx.SubnetID))
-			continue
-		}
-		verifier.nodeID2PK[node] = *validator.PublicKey
+		verifier.nodeID2PK[node.NodeID] = *node.PublicKey
 	}
-	return verifier
+
+	return verifier, nil
 }

simplex/bls_test.go

@@ -16,7 +16,8 @@ func TestBLSSignVerify(t *testing.T) {
 	config, err := newEngineConfig()
 	require.NoError(t, err)
 
-	signer, verifier := NewBLSAuth(config)
+	signer, verifier, err := NewBLSAuth(config)
+	require.NoError(t, err)
 
 	msg := "Begin at the beginning, and go on till you come to the end: then stop"
 
@@ -30,7 +31,8 @@ func TestBLSSignVerify(t *testing.T) {
 func TestSignerNotInMemberSet(t *testing.T) {
 	config, err := newEngineConfig()
 	require.NoError(t, err)
-	signer, verifier := NewBLSAuth(config)
+	signer, verifier, err := NewBLSAuth(config)
+	require.NoError(t, err)
 
 	msg := "Begin at the beginning, and go on till you come to the end: then stop"
 
@@ -53,7 +55,8 @@ func TestSignerInvalidMessageEncoding(t *testing.T) {
 
 	sigBytes := bls.SignatureToBytes(sig)
 
-	_, verifier := NewBLSAuth(config)
+	_, verifier, err := NewBLSAuth(config)
+	require.NoError(t, err)
 	err = verifier.Verify(dummyMsg, sigBytes, config.Ctx.NodeID[:])
 	require.ErrorIs(t, err, errSignatureVerificationFailed)
 }

simplex/config.go

@@ -4,14 +4,22 @@
 package simplex
 
 import (
+	"context"
+
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
 type ValidatorInfo interface {
-	GetValidatorIDs(subnetID ids.ID) []ids.NodeID
-	GetValidator(subnetID ids.ID, nodeID ids.NodeID) (*validators.Validator, bool)
+	// GetValidatorSet returns the validators of the provided subnet at the
+	// requested P-chain height.
+	// The returned map should not be modified.
+	GetValidatorSet(
+		ctx context.Context,
+		height uint64,
+		subnetID ids.ID,
+	) (map[ids.NodeID]*validators.GetValidatorOutput, error)
 }
 
 // Config wraps all the parameters needed for a simplex engine

simplex/test_util.go

@@ -4,6 +4,8 @@
 package simplex
 
 import (
+	"context"
+
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
@@ -15,34 +17,25 @@ var _ ValidatorInfo = (*testValidatorInfo)(nil)
 // testValidatorInfo is a mock implementation of ValidatorInfo for testing purposes.
 // it assumes all validators are in the same subnet and returns all of them for any subnetID.
 type testValidatorInfo struct {
-	validators map[ids.NodeID]validators.Validator
-}
-
-func (v *testValidatorInfo) GetValidatorIDs(_ ids.ID) []ids.NodeID {
-	ids := make([]ids.NodeID, 0, len(v.validators))
-	for id := range v.validators {
-		ids = append(ids, id)
-	}
-	return ids
+	validators map[ids.NodeID]*validators.GetValidatorOutput
 }
 
-func (v *testValidatorInfo) GetValidator(_ ids.ID, nodeID ids.NodeID) (*validators.Validator, bool) {
-	if v.validators == nil {
-		return nil, false
-	}
-
-	val, exists := v.validators[nodeID]
-	return &val, exists
+func (t *testValidatorInfo) GetValidatorSet(
+	context.Context,
+	uint64,
+	ids.ID,
+) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
+	return t.validators, nil
 }
 
 func newTestValidatorInfo(nodeIds []ids.NodeID, pks []*bls.PublicKey) *testValidatorInfo {
 	if len(nodeIds) != len(pks) {
 		panic("nodeIds and pks must have the same length")
 	}
 
-	vds := make(map[ids.NodeID]validators.Validator, len(pks))
+	vds := make(map[ids.NodeID]*validators.GetValidatorOutput, len(pks))
 	for i, pk := range pks {
-		validator := validators.Validator{
+		validator := &validators.GetValidatorOutput{
 			PublicKey: pk,
 			NodeID:    nodeIds[i],
 		}