IOTEX-69 Get rid of config.ProducerAddr() (iotexproject#119)

Author: zjshen14

config/config.go

@@ -154,7 +154,7 @@ var (
 
 	// Validates is the collection config validation functions
 	Validates = []Validate{
-		ValidateAddr,
+		ValidateKeyPair,
 		ValidateConsensusScheme,
 		ValidateRollDPoS,
 		ValidateDispatcher,
@@ -389,24 +389,6 @@ func (cfg *Config) IsLightweight() bool {
 	return cfg.NodeType == LightweightType
 }
 
-// ProducerAddr returns address struct based on the data from producer pub/pri-key in the config
-func (cfg *Config) ProducerAddr() (*iotxaddress.Address, error) {
-	priKey, err := keypair.DecodePrivateKey(cfg.Chain.ProducerPrivKey)
-	if err != nil {
-		return nil, err
-	}
-	pubKey, err := keypair.DecodePublicKey(cfg.Chain.ProducerPubKey)
-	if err != nil {
-		return nil, err
-	}
-	addr, err := iotxaddress.GetAddressByPubkey(iotxaddress.IsTestnet, iotxaddress.ChainID, pubKey)
-	if err != nil {
-		return nil, err
-	}
-	addr.PrivateKey = priKey
-	return addr, nil
-}
-
 // BlockchainAddress returns the address derived from the configured chain ID and public key
 func (cfg *Config) BlockchainAddress() (address.Address, error) {
 	pk, err := keypair.DecodePublicKey(cfg.Chain.ProducerPubKey)
@@ -434,20 +416,20 @@ func (cfg *Config) KeyPair() (keypair.PublicKey, keypair.PrivateKey, error) {
 	return pk, sk, nil
 }
 
-// ValidateAddr validates the block producer address
-func ValidateAddr(cfg *Config) error {
-	addr, err := cfg.ProducerAddr()
+// ValidateKeyPair validates the block producer address
+func ValidateKeyPair(cfg *Config) error {
+	priKey, err := keypair.DecodePrivateKey(cfg.Chain.ProducerPrivKey)
 	if err != nil {
 		return err
 	}
-	// Validate producer's address
-	if _, err := iotxaddress.GetPubkeyHash(addr.RawAddress); err != nil {
-		return errors.Wrap(ErrInvalidCfg, "invalid block producer address")
+	pubKey, err := keypair.DecodePublicKey(cfg.Chain.ProducerPubKey)
+	if err != nil {
+		return err
 	}
 	// Validate producer pubkey and prikey by signing a dummy message and verify it
 	validationMsg := "connecting the physical world block by block"
-	sig := crypto.EC283.Sign(addr.PrivateKey, []byte(validationMsg))
-	if !crypto.EC283.Verify(addr.PublicKey, []byte(validationMsg), sig) {
+	sig := crypto.EC283.Sign(priKey, []byte(validationMsg))
+	if !crypto.EC283.Verify(pubKey, []byte(validationMsg), sig) {
 		return errors.Wrap(ErrInvalidCfg, "block producer has unmatched pubkey and prikey")
 	}
 	return nil

config/config_test.go

@@ -165,17 +165,17 @@ chain:
 	require.Equal(t, LightweightType, cfg.NodeType)
 }
 
-func TestValidateAddr(t *testing.T) {
+func TestValidateKeyPair(t *testing.T) {
 	cfg := Default
 	cfg.Chain.ProducerPubKey = "hello world"
 	cfg.Chain.ProducerPrivKey = "world hello"
-	err := ValidateAddr(&cfg)
+	err := ValidateKeyPair(&cfg)
 	assert.NotNil(t, err)
 	assert.True(t, strings.Contains(err.Error(), "encoding/hex:"), err.Error())
 
 	cfg.Chain.ProducerPubKey = keypair.EncodePublicKey(testaddress.Addrinfo["alfa"].PublicKey)
 	cfg.Chain.ProducerPrivKey = keypair.EncodePrivateKey(testaddress.Addrinfo["bravo"].PrivateKey)
-	err = ValidateAddr(&cfg)
+	err = ValidateKeyPair(&cfg)
 	assert.NotNil(t, err)
 	require.Equal(t, ErrInvalidCfg, errors.Cause(err))
 	require.True(

consensus/consensus.go

@@ -17,9 +17,11 @@ import (
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/consensus/scheme"
 	"github.com/iotexproject/iotex-core/consensus/scheme/rolldpos"
+	"github.com/iotexproject/iotex-core/iotxaddress"
 	"github.com/iotexproject/iotex-core/logger"
 	"github.com/iotexproject/iotex-core/network"
 	"github.com/iotexproject/iotex-core/pkg/errcode"
+	"github.com/iotexproject/iotex-core/pkg/keypair"
 	"github.com/iotexproject/iotex-core/pkg/lifecycle"
 )
 
@@ -57,11 +59,8 @@ func NewConsensus(
 			Int("votes", len(votes)).
 			Int("Executions", len(executions)).
 			Msg("pick actions")
-		addr, err := cfg.ProducerAddr()
-		if err != nil {
-			return nil, err
-		}
-		blk, err := bc.MintNewBlock(transfers, votes, executions, addr, "")
+
+		blk, err := bc.MintNewBlock(transfers, votes, executions, GetAddr(cfg), "")
 		if err != nil {
 			logger.Error().Msg("Failed to mint a block")
 			return nil, err
@@ -90,15 +89,11 @@ func NewConsensus(
 		return nil
 	}
 
-	addr, err := cfg.ProducerAddr()
-	if err != nil {
-		logger.Panic().Err(err).Msg("Fail to create new consensus")
-	}
-
+	var err error
 	switch cfg.Consensus.Scheme {
 	case config.RollDPoSScheme:
 		cs.scheme, err = rolldpos.NewRollDPoSBuilder().
-			SetAddr(addr).
+			SetAddr(GetAddr(cfg)).
 			SetConfig(cfg.Consensus.RollDPoS).
 			SetBlockchain(bc).
 			SetActPool(ap).
@@ -172,3 +167,24 @@ func (c *IotxConsensus) HandleBlockPropose(m proto.Message) error {
 func (c *IotxConsensus) Scheme() scheme.Scheme {
 	return c.scheme
 }
+
+// GetAddr returns the iotex address
+func GetAddr(cfg *config.Config) *iotxaddress.Address {
+	addr, err := cfg.BlockchainAddress()
+	if err != nil {
+		logger.Panic().Err(err).Msg("Fail to create new consensus")
+	}
+	pk, err := keypair.DecodePublicKey(cfg.Chain.ProducerPubKey)
+	if err != nil {
+		logger.Panic().Err(err).Msg("Fail to create new consensus")
+	}
+	sk, err := keypair.DecodePrivateKey(cfg.Chain.ProducerPrivKey)
+	if err != nil {
+		logger.Panic().Err(err).Msg("Fail to create new consensus")
+	}
+	return &iotxaddress.Address{
+		PublicKey:  pk,
+		PrivateKey: sk,
+		RawAddress: addr.IotxAddress(),
+	}
+}

consensus/sim/consensus_sim.go

@@ -15,6 +15,7 @@ import (
 	"github.com/iotexproject/iotex-core/actpool"
 	"github.com/iotexproject/iotex-core/blockchain"
 	"github.com/iotexproject/iotex-core/config"
+	consensus "github.com/iotexproject/iotex-core/consensus"
 	"github.com/iotexproject/iotex-core/consensus/scheme"
 	"github.com/iotexproject/iotex-core/consensus/scheme/rolldpos"
 	pbsim "github.com/iotexproject/iotex-core/consensus/sim/proto"
@@ -106,13 +107,9 @@ func NewSim(
 		}
 	*/
 
-	addr, err := cfg.ProducerAddr()
-	if err != nil {
-		logger.Panic().Err(err).Msg("Fail to create new consensus")
-	}
-
+	var err error
 	cs.scheme, err = rolldpos.NewRollDPoSBuilder().
-		SetAddr(addr).
+		SetAddr(consensus.GetAddr(cfg)).
 		SetConfig(cfg.Consensus.RollDPoS).
 		SetBlockchain(bc).
 		SetActPool(ap).
@@ -180,13 +177,9 @@ func NewSimByzantine(
 		}
 	*/
 
-	addr, err := cfg.ProducerAddr()
-	if err != nil {
-		logger.Panic().Err(err).Msg("Fail to create new consensus")
-	}
-
+	var err error
 	cs.scheme, err = rolldpos.NewRollDPoSBuilder().
-		SetAddr(addr).
+		SetAddr(consensus.GetAddr(cfg)).
 		SetConfig(cfg.Consensus.RollDPoS).
 		SetBlockchain(bc).
 		SetActPool(ap).

server/main.go

@@ -116,7 +116,7 @@ func main() {
 }
 
 func initLogger(cfg *config.Config) {
-	iotxAddr, err := cfg.ProducerAddr()
+	addr, err := cfg.BlockchainAddress()
 	if err != nil {
 		logger.Fatal().Err(err).Msg("Failed to get producer address from pub/kri key.")
 		return
@@ -127,7 +127,7 @@ func initLogger(cfg *config.Config) {
 	} else {
 		logger.SetLogger(
 			l.With().
-				Str("iotexAddr", iotxAddr.RawAddress).
+				Str("iotxAddr", addr.IotxAddress()).
 				Str("networkAddress", fmt.Sprintf("%s:%d", cfg.Network.Host, cfg.Network.Port)).
 				Str("nodeType", cfg.NodeType).Logger(),
 		)