Merge branch 'master' into tsachi/minimize-verify-interface2

ava-labs · Jan 29, 2025 · 2eea933 · 2eea933
2 parents 79e5c8d + 9503b38
commit 2eea933
Show file tree

Hide file tree

Showing 56 changed files with 691 additions and 727 deletions.
diff --git a/config/config.go b/config/config.go
@@ -37,6 +37,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/compression"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/ips"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/perms"
@@ -640,7 +641,7 @@ func getStakingTLSCert(v *viper.Viper) (tls.Certificate, error) {
 
 func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 	if v.GetBool(StakingEphemeralSignerEnabledKey) {
-		key, err := bls.NewSigner()
+		key, err := localsigner.New()
 		if err != nil {
 			return nil, fmt.Errorf("couldn't generate ephemeral signing key: %w", err)
 		}
@@ -653,7 +654,7 @@ func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 		if err != nil {
 			return nil, fmt.Errorf("unable to decode base64 content: %w", err)
 		}
-		key, err := bls.SecretKeyFromBytes(signerKeyContent)
+		key, err := localsigner.FromBytes(signerKeyContent)
 		if err != nil {
 			return nil, fmt.Errorf("couldn't parse signing key: %w", err)
 		}
@@ -667,7 +668,7 @@ func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 		if err != nil {
 			return nil, err
 		}
-		key, err := bls.SecretKeyFromBytes(signingKeyBytes)
+		key, err := localsigner.FromBytes(signingKeyBytes)
 		if err != nil {
 			return nil, fmt.Errorf("couldn't parse signing key: %w", err)
 		}
@@ -678,7 +679,7 @@ func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 		return nil, errMissingStakingSigningKeyFile
 	}
 
-	key, err := bls.NewSigner()
+	key, err := localsigner.New()
 	if err != nil {
 		return nil, fmt.Errorf("couldn't generate new signing key: %w", err)
 	}

diff --git a/network/network_test.go b/network/network_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/bloom"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/ips"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/math/meter"
@@ -175,7 +175,7 @@ func newTestNetwork(t *testing.T, count int) (*testDialer, []*testListener, []id
 		require.NoError(t, err)
 		nodeID := ids.NodeIDFromCert(cert)
 
-		blsKey, err := bls.NewSigner()
+		blsKey, err := localsigner.New()
 		require.NoError(t, err)
 
 		config := defaultConfig

diff --git a/network/p2p/acp118/handler_test.go b/network/p2p/acp118/handler_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ava-labs/avalanchego/proto/pb/sdk"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 )
@@ -72,7 +73,7 @@ func TestHandler(t *testing.T) {
 			require := require.New(t)
 
 			ctx := context.Background()
-			sk, err := bls.NewSigner()
+			sk, err := localsigner.New()
 			require.NoError(err)
 			pk := sk.PublicKey()
 			networkID := uint32(123)

diff --git a/network/peer/ip_signer_test.go b/network/peer/ip_signer_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/staking"
 	"github.com/ava-labs/avalanchego/utils"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 )
 
 func TestIPSigner(t *testing.T) {
@@ -28,7 +28,7 @@ func TestIPSigner(t *testing.T) {
 	require.NoError(err)
 
 	tlsKey := tlsCert.PrivateKey.(crypto.Signer)
-	blsKey, err := bls.NewSigner()
+	blsKey, err := localsigner.New()
 	require.NoError(err)
 
 	s := NewIPSigner(dynIP, tlsKey, blsKey)

diff --git a/network/peer/ip_test.go b/network/peer/ip_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/staking"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 )
 
 func TestSignedIpVerify(t *testing.T) {
@@ -21,7 +22,7 @@ func TestSignedIpVerify(t *testing.T) {
 	cert1, err := staking.ParseCertificate(tlsCert1.Leaf.Raw)
 	require.NoError(t, err)
 	tlsKey1 := tlsCert1.PrivateKey.(crypto.Signer)
-	blsKey1, err := bls.NewSigner()
+	blsKey1, err := localsigner.New()
 	require.NoError(t, err)
 
 	tlsCert2, err := staking.NewTLSCert()

diff --git a/network/peer/peer_test.go b/network/peer/peer_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/math/meter"
 	"github.com/ava-labs/avalanchego/utils/resource"
@@ -111,7 +111,7 @@ func newRawTestPeer(t *testing.T, config Config) *rawTestPeer {
 		1,
 	))
 	tls := tlsCert.PrivateKey.(crypto.Signer)
-	bls, err := bls.NewSigner()
+	bls, err := localsigner.New()
 	require.NoError(err)
 
 	config.IPSigner = NewIPSigner(ip, tls, bls)
@@ -327,7 +327,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) {
 		1,
 	))
 
-	bogusBLSKey, err := bls.NewSigner()
+	bogusBLSKey, err := localsigner.New()
 	require.NoError(err)
 	require.NoError(rawPeer1.config.Validators.AddStaker(
 		constants.PrimaryNetworkID,
@@ -348,7 +348,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) {
 func TestShouldDisconnect(t *testing.T) {
 	peerID := ids.GenerateTestNodeID()
 	txID := ids.GenerateTestID()
-	blsKey, err := bls.NewSigner()
+	blsKey, err := localsigner.New()
 	require.NoError(t, err)
 
 	tests := []struct {

diff --git a/network/peer/test_peer.go b/network/peer/test_peer.go
@@ -23,7 +23,7 @@ import (
 	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/math/meter"
 	"github.com/ava-labs/avalanchego/utils/resource"
@@ -101,7 +101,7 @@ func StartTestPeer(
 	}
 
 	tlsKey := tlsCert.PrivateKey.(crypto.Signer)
-	blsKey, err := bls.NewSigner()
+	blsKey, err := localsigner.New()
 	if err != nil {
 		return nil, err
 	}

diff --git a/network/test_network.go b/network/test_network.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/math/meter"
 	"github.com/ava-labs/avalanchego/utils/resource"
@@ -84,7 +84,7 @@ func NewTestNetworkConfig(
 		return nil, err
 	}
 
-	blsKey, err := bls.NewSigner()
+	blsKey, err := localsigner.New()
 	if err != nil {
 		return nil, err
 	}

diff --git a/snow/snowtest/context.go b/snow/snowtest/context.go
@@ -17,7 +17,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/validators/validatorstest"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/logging"
 )
 
@@ -52,7 +52,7 @@ func ConsensusContext(ctx *snow.Context) *snow.ConsensusContext {
 func Context(tb testing.TB, chainID ids.ID) *snow.Context {
 	require := require.New(tb)
 
-	secretKey, err := bls.NewSigner()
+	secretKey, err := localsigner.New()
 	require.NoError(err)
 	publicKey := secretKey.PublicKey()
 

diff --git a/snow/validators/gvalidators/validator_state_test.go b/snow/validators/gvalidators/validator_state_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/snow/validators/validatorsmock"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
 
 	pb "github.com/ava-labs/avalanchego/proto/pb/validatorstate"
@@ -135,15 +136,15 @@ func TestGetValidatorSet(t *testing.T) {
 	state := setupState(t, ctrl)
 
 	// Happy path
-	sk0, err := bls.NewSigner()
+	sk0, err := localsigner.New()
 	require.NoError(err)
 	vdr0 := &validators.GetValidatorOutput{
 		NodeID:    ids.GenerateTestNodeID(),
 		PublicKey: sk0.PublicKey(),
 		Weight:    1,
 	}
 
-	sk1, err := bls.NewSigner()
+	sk1, err := localsigner.New()
 	require.NoError(err)
 	vdr1 := &validators.GetValidatorOutput{
 		NodeID:    ids.GenerateTestNodeID(),
@@ -181,7 +182,7 @@ func TestGetValidatorSet(t *testing.T) {
 func TestPublicKeyDeserialize(t *testing.T) {
 	require := require.New(t)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 	pk := sk.PublicKey()
 
@@ -222,7 +223,7 @@ func setupValidatorSet(b *testing.B, size int) map[ids.NodeID]*validators.GetVal
 	b.Helper()
 
 	set := make(map[ids.NodeID]*validators.GetValidatorOutput, size)
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(b, err)
 	pk := sk.PublicKey()
 	for i := 0; i < size; i++ {

diff --git a/snow/validators/manager_test.go b/snow/validators/manager_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/set"
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
@@ -214,7 +215,7 @@ func TestGet(t *testing.T) {
 	_, ok := m.GetValidator(subnetID, nodeID)
 	require.False(ok)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -304,7 +305,7 @@ func TestGetMap(t *testing.T) {
 	mp := m.GetMap(subnetID)
 	require.Empty(mp)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -404,7 +405,7 @@ func TestSample(t *testing.T) {
 	require.NoError(err)
 	require.Empty(sampled)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	nodeID0 := ids.GenerateTestNodeID()
@@ -464,7 +465,7 @@ func TestString(t *testing.T) {
 func TestAddCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := bls.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -512,7 +513,7 @@ func TestAddCallback(t *testing.T) {
 func TestAddWeightCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := bls.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -595,7 +596,7 @@ func TestAddWeightCallback(t *testing.T) {
 func TestRemoveWeightCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := bls.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -678,7 +679,7 @@ func TestRemoveWeightCallback(t *testing.T) {
 func TestRemoveCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := bls.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (

diff --git a/snow/validators/set_test.go b/snow/validators/set_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/set"
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
@@ -165,7 +166,7 @@ func TestSetGet(t *testing.T) {
 	_, ok := s.Get(nodeID)
 	require.False(ok)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -232,7 +233,7 @@ func TestSetMap(t *testing.T) {
 	m := s.Map()
 	require.Empty(m)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -330,7 +331,7 @@ func TestSetSample(t *testing.T) {
 	require.NoError(err)
 	require.Empty(sampled)
 
-	sk, err := bls.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	nodeID0 := ids.GenerateTestNodeID()
@@ -385,7 +386,7 @@ func TestSetAddCallback(t *testing.T) {
 	require := require.New(t)
 
 	nodeID0 := ids.BuildTestNodeID([]byte{1})
-	sk0, err := bls.NewSigner()
+	sk0, err := localsigner.New()
 	require.NoError(err)
 	pk0 := sk0.PublicKey()
 	txID0 := ids.GenerateTestID()

diff --git a/tests/e2e/p/workflow.go b/tests/e2e/p/workflow.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
 	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/vms/components/avax"
 	"github.com/ava-labs/avalanchego/vms/platformvm"
@@ -115,7 +115,7 @@ var _ = e2e.DescribePChain("[Workflow]", func() {
 		}
 
 		tc.By("issuing an AddPermissionlessValidatorTx", func() {
-			sk, err := bls.NewSigner()
+			sk, err := localsigner.New()
 			require.NoError(err)
 			pop := signer.NewProofOfPossession(sk)