Remove PK from config and producing a block (iotexproject#627)

Author: zjshen14

blockchain/block/block.go

@@ -165,13 +165,10 @@ func (b *Block) ProducerAddress() string {
 
 // RunnableActions abstructs RunnableActions from a Block.
 func (b *Block) RunnableActions() RunnableActions {
-	pkHash := keypair.HashPubKey(b.Header.pubkey)
-	addr, _ := address.FromBytes(pkHash[:])
 	return RunnableActions{
 		blockHeight:         b.Header.height,
 		blockTimeStamp:      b.Header.timestamp,
 		blockProducerPubKey: b.Header.pubkey,
-		blockProducerAddr:   addr.String(),
 		actions:             b.Actions,
 		txHash:              b.txRoot,
 	}

blockchain/block/builder.go

@@ -28,6 +28,7 @@ func NewBuilder(ra RunnableActions) *Builder {
 				height:    ra.blockHeight,
 				timestamp: ra.blockTimeStamp,
 				txRoot:    ra.txHash,
+				pubkey:    ra.blockProducerPubKey,
 			},
 			Actions: ra.actions,
 		},
@@ -65,12 +66,15 @@ func (b *Builder) SetReceiptRoot(h hash.Hash256) *Builder {
 }
 
 // SignAndBuild signs and then builds a block.
-func (b *Builder) SignAndBuild(signerPubKey keypair.PublicKey, signerPriKey keypair.PrivateKey) (Block, error) {
-	b.blk.Header.pubkey = signerPubKey
+func (b *Builder) SignAndBuild(signerPriKey keypair.PrivateKey) (Block, error) {
+	if keypair.EncodePublicKey(b.blk.Header.pubkey) != keypair.EncodePublicKey(&signerPriKey.PublicKey) {
+		return Block{}, errors.New("public key from the signer doesn't match that from runnable actions")
+	}
+
 	h := b.blk.Header.HashHeaderCore()
 	sig, err := crypto.Sign(h[:], signerPriKey)
 	if err != nil {
-		return Block{}, errors.New("Failed to sign block")
+		return Block{}, errors.New("failed to sign block")
 	}
 	b.blk.Header.blockSig = sig
 	return b.blk, nil

blockchain/block/builder_test.go

@@ -20,11 +20,11 @@ func TestBuilder(t *testing.T) {
 	ra := NewRunnableActionsBuilder().
 		SetHeight(1).
 		SetTimeStamp(testutil.TimestampNow()).
-		Build(ta.Addrinfo["bravo"].String(), ta.Keyinfo["bravo"].PubKey)
+		Build(ta.Keyinfo["bravo"].PubKey)
 
 	nblk, err := NewBuilder(ra).
 		SetPrevBlockHash(hash.ZeroHash256).
-		SignAndBuild(ta.Keyinfo["bravo"].PubKey, ta.Keyinfo["bravo"].PriKey)
+		SignAndBuild(ta.Keyinfo["bravo"].PriKey)
 	require.NoError(t, err)
 
 	require.True(t, nblk.VerifySignature())

blockchain/block/runnable.go

@@ -17,7 +17,6 @@ type RunnableActions struct {
 	blockHeight         uint64
 	blockTimeStamp      int64
 	blockProducerPubKey keypair.PublicKey
-	blockProducerAddr   string
 	txHash              hash.Hash256
 	actions             []action.SealedEnvelope
 }
@@ -37,11 +36,6 @@ func (ra RunnableActions) BlockProducerPubKey() keypair.PublicKey {
 	return ra.blockProducerPubKey
 }
 
-// BlockProducerAddr returns BlockProducerAddr.
-func (ra RunnableActions) BlockProducerAddr() string {
-	return ra.blockProducerAddr
-}
-
 // TxHash returns TxHash.
 func (ra RunnableActions) TxHash() hash.Hash256 { return ra.txHash }
 
@@ -78,8 +72,7 @@ func (b *RunnableActionsBuilder) AddActions(acts ...action.SealedEnvelope) *Runn
 }
 
 // Build signs and then builds a block.
-func (b *RunnableActionsBuilder) Build(producerAddr string, producerPubKey keypair.PublicKey) RunnableActions {
-	b.ra.blockProducerAddr = producerAddr
+func (b *RunnableActionsBuilder) Build(producerPubKey keypair.PublicKey) RunnableActions {
 	b.ra.blockProducerPubKey = producerPubKey
 	b.ra.txHash = calculateTxRoot(b.ra.actions)
 	return b.ra

blockchain/blockchain.go

@@ -304,7 +304,7 @@ func NewBlockchain(cfg config.Config, opts ...Option) Blockchain {
 	if err != nil {
 		log.L().Panic("Failed to get block producer address.", zap.Error(err))
 	}
-	chain.validator = &validator{sf: chain.sf, validatorAddr: producerAddress(cfg).String()}
+	chain.validator = &validator{sf: chain.sf, validatorAddr: cfg.ProducerAddress().String()}
 
 	if chain.dao != nil {
 		chain.lifecycle.Add(chain.dao)
@@ -727,14 +727,14 @@ func (bc *blockchain) MintNewBlock(
 		SetHeight(newblockHeight).
 		SetTimeStamp(timestamp).
 		AddActions(actions...).
-		Build(producerAddr, producerPubKey)
+		Build(producerPubKey)
 
 	blk, err := block.NewBuilder(ra).
 		SetPrevBlockHash(bc.tipHash).
 		SetDeltaStateDigest(ws.Digest()).
 		SetReceipts(rc).
 		SetReceiptRoot(calculateReceiptRoot(rc)).
-		SignAndBuild(producerPubKey, producerPriKey)
+		SignAndBuild(producerPriKey)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to create block")
 	}
@@ -951,7 +951,7 @@ func (bc *blockchain) startEmptyBlockchain() error {
 		ws      factory.WorkingSet
 		err     error
 	)
-	pk, sk, addr, err := bc.genesisProducer()
+	pk, sk, _, err := bc.genesisProducer()
 	if err != nil {
 		return errors.Wrap(err, "failed to get the key and address of producer")
 	}
@@ -973,7 +973,7 @@ func (bc *blockchain) startEmptyBlockchain() error {
 			SetHeight(0).
 			SetTimeStamp(Gen.Timestamp).
 			AddActions(acts...).
-			Build(addr, pk)
+			Build(pk)
 		// run execution and update state trie root hash
 		receipts, err := bc.runActions(racts, ws)
 		if err != nil {
@@ -985,18 +985,18 @@ func (bc *blockchain) startEmptyBlockchain() error {
 			SetDeltaStateDigest(ws.Digest()).
 			SetReceipts(receipts).
 			SetReceiptRoot(calculateReceiptRoot(receipts)).
-			SignAndBuild(pk, sk)
+			SignAndBuild(sk)
 		if err != nil {
 			return errors.Wrapf(err, "Failed to create block")
 		}
 	} else {
 		racts := block.NewRunnableActionsBuilder().
 			SetHeight(0).
 			SetTimeStamp(Gen.Timestamp).
-			Build(addr, pk)
+			Build(pk)
 		genesis, err = block.NewBuilder(racts).
 			SetPrevBlockHash(hash.ZeroHash256).
-			SignAndBuild(pk, sk)
+			SignAndBuild(sk)
 		if err != nil {
 			return errors.Wrapf(err, "Failed to create block")
 		}
@@ -1139,7 +1139,8 @@ func (bc *blockchain) runActions(
 	}
 	gasLimit := bc.config.Genesis.BlockGasLimit
 	// update state factory
-	producer, err := address.FromString(acts.BlockProducerAddr())
+	pkHash := keypair.HashPubKey(acts.BlockProducerPubKey())
+	producer, err := address.FromBytes(pkHash[:])
 	if err != nil {
 		return nil, err
 	}
@@ -1321,10 +1322,7 @@ func (bc *blockchain) createPutPollResultAction(height uint64) (skip bool, se ac
 	default:
 		return
 	}
-	_, sk, err := bc.config.KeyPair()
-	if err != nil {
-		log.L().Panic("Failed to get block producer private key.", zap.Error(err))
-	}
+	sk := bc.config.ProducerPrivateKey()
 	nonce := uint64(0)
 	pollAction := action.NewPutPollResult(nonce, nextEpochHeight, l)
 	builder := action.EnvelopeBuilder{}
@@ -1402,7 +1400,7 @@ func (bc *blockchain) refreshStateDB() error {
 }
 
 func (bc *blockchain) buildStateInGenesis() error {
-	pk, _, addr, err := bc.genesisProducer()
+	pk, _, _, err := bc.genesisProducer()
 	if err != nil {
 		return errors.Wrap(err, "failed to get the key and address of producer")
 	}
@@ -1415,7 +1413,7 @@ func (bc *blockchain) buildStateInGenesis() error {
 		SetHeight(0).
 		SetTimeStamp(Gen.Timestamp).
 		AddActions(acts...).
-		Build(addr, pk)
+		Build(pk)
 	// run execution and update state trie root hash
 	if _, err := bc.runActions(racts, ws); err != nil {
 		return errors.Wrap(err, "failed to update state changes in Genesis block")
@@ -1439,10 +1437,7 @@ func (bc *blockchain) createGrantRewardAction(rewardType int) (action.SealedEnve
 		SetGasLimit(grant.GasLimit()).
 		SetAction(&grant).
 		Build()
-	_, sk, err := bc.config.KeyPair()
-	if err != nil {
-		log.L().Panic("Failed to get block producer private key.", zap.Error(err))
-	}
+	sk := bc.config.ProducerPrivateKey()
 	return action.Sign(envelope, sk)
 }
 
@@ -1550,16 +1545,3 @@ func calculateReceiptRoot(receipts []*action.Receipt) hash.Hash256 {
 	res := crypto.NewMerkleTree(h).HashTree()
 	return res
 }
-
-func producerAddress(cfg config.Config) address.Address {
-	pubKey, _, err := cfg.KeyPair()
-	if err != nil {
-		log.L().Panic("Failed to get block producer public key.", zap.Error(err))
-	}
-	pkHash := keypair.HashPubKey(pubKey)
-	address, err := address.FromBytes(pkHash[:])
-	if err != nil {
-		log.L().Panic("Failed to get block producer address.", zap.Error(err))
-	}
-	return address
-}

blockchain/genesis_test.go

@@ -35,11 +35,11 @@ func TestGenesis(t *testing.T) {
 		SetHeight(0).
 		SetTimeStamp(Gen.Timestamp).
 		AddActions(acts...).
-		Build(testaddress.Addrinfo["producer"].String(), testaddress.Keyinfo["producer"].PubKey)
+		Build(testaddress.Keyinfo["producer"].PubKey)
 
 	genesisBlk, err := block.NewBuilder(racts).
 		SetPrevBlockHash(Gen.ParentHash).
-		SignAndBuild(testaddress.Keyinfo["producer"].PubKey, testaddress.Keyinfo["producer"].PriKey)
+		SignAndBuild(testaddress.Keyinfo["producer"].PriKey)
 	assert.NoError(err)
 
 	t.Log("The Genesis Block has the following header:")

cli/ioctl/cmd/account/accountcreate.go

@@ -37,7 +37,7 @@ func init() {
 	AccountCmd.AddCommand(accountCreateCmd)
 }
 
-func accountCreate(args []string) string {
+func accountCreate(_ []string) string {
 	items := make([]string, numAccounts)
 	for i := 0; i < numAccounts; i++ {
 		private, err := crypto.GenerateKey()
@@ -46,12 +46,10 @@ func accountCreate(args []string) string {
 		}
 		pkHash := keypair.HashPubKey(&private.PublicKey)
 		addr, _ := address.FromBytes(pkHash[:])
-		pubKeyBytes := keypair.PublicKeyToBytes(&private.PublicKey)
 		priKeyBytes := keypair.PrivateKeyToBytes(private)
 		items[i] = fmt.Sprintf(
-			"{\"Address\": \"%s\", \"PublicKey\": \"%x\", \"PrivateKey\": \"%x\"}\n",
+			"{\"Address\": \"%s\", \"PrivateKey\": \"%x\"}\n",
 			addr.String(),
-			pubKeyBytes,
 			priKeyBytes,
 		)
 	}

config/config.go

@@ -7,19 +7,19 @@
 package config
 
 import (
-	"encoding/hex"
 	"flag"
 	"os"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/pkg/errors"
 	uconfig "go.uber.org/config"
 
 	"github.com/iotexproject/iotex-core/address"
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/consensus/consensusfsm"
-	"github.com/iotexproject/iotex-core/pkg/hash"
 	"github.com/iotexproject/iotex-core/pkg/keypair"
 	"github.com/iotexproject/iotex-core/pkg/log"
 )
@@ -76,7 +76,6 @@ var (
 			TrieDBPath:                   "/tmp/trie.db",
 			ID:                           1,
 			Address:                      "",
-			ProducerPubKey:               keypair.EncodePublicKey(&PrivateKey.PublicKey),
 			ProducerPrivKey:              keypair.EncodePrivateKey(PrivateKey),
 			GenesisActionsPath:           "",
 			EmptyGenesis:                 false,
@@ -171,7 +170,6 @@ var (
 
 	// Validates is the collection config validation functions
 	Validates = []Validate{
-		ValidateKeyPair,
 		ValidateRollDPoS,
 		ValidateDispatcher,
 		ValidateExplorer,
@@ -201,7 +199,6 @@ type (
 		TrieDBPath                   string `yaml:"trieDBPath"`
 		ID                           uint32 `yaml:"id"`
 		Address                      string `yaml:"address"`
-		ProducerPubKey               string `yaml:"producerPubKey"`
 		ProducerPrivKey              string `yaml:"producerPrivKey"`
 		GenesisActionsPath           string `yaml:"genesisActionsPath"`
 		EmptyGenesis                 bool   `yaml:"emptyGenesis"`
@@ -440,50 +437,31 @@ func NewSub(validates ...Validate) (Config, error) {
 	return cfg, 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)
+// ProducerAddress returns the configured producer address derived from key
+func (cfg Config) ProducerAddress() address.Address {
+	sk := cfg.ProducerPrivateKey()
+	pkHash := keypair.HashPubKey(&sk.PublicKey)
+	addr, err := address.FromBytes(pkHash[:])
 	if err != nil {
-		return nil, errors.Wrapf(err, "error when decoding public key %s", cfg.Chain.ProducerPubKey)
+		log.L().Panic(
+			"Error when constructing producer address",
+			zap.Error(err),
+		)
 	}
-	pkHash := keypair.HashPubKey(pk)
-	return address.FromBytes(pkHash[:])
+	return addr
 }
 
-// KeyPair returns the decoded public and private key pair
-func (cfg Config) KeyPair() (keypair.PublicKey, keypair.PrivateKey, error) {
-	pk, err := keypair.DecodePublicKey(cfg.Chain.ProducerPubKey)
-	if err != nil {
-		return nil, nil, errors.Wrapf(err, "error when decoding public key %s", cfg.Chain.ProducerPubKey)
-	}
+// ProducerPrivateKey returns the configured private key
+func (cfg Config) ProducerPrivateKey() keypair.PrivateKey {
 	sk, err := keypair.DecodePrivateKey(cfg.Chain.ProducerPrivKey)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "error when decoding private key %s", cfg.Chain.ProducerPrivKey)
-	}
-	return pk, sk, nil
-}
-
-// ValidateKeyPair validates the block producer address
-func ValidateKeyPair(cfg Config) error {
-	pkBytes, err := hex.DecodeString(cfg.Chain.ProducerPubKey)
-	if err != nil {
-		return err
-	}
-	priKey, err := keypair.DecodePrivateKey(cfg.Chain.ProducerPrivKey)
-	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"
-	msgHash := hash.Hash256b([]byte(validationMsg))
-	sig, err := crypto.Sign(msgHash[:], priKey)
-	if err != nil {
-		return err
-	}
-	if !crypto.VerifySignature(pkBytes, msgHash[:], sig[:64]) {
-		return errors.Wrap(ErrInvalidCfg, "block producer has unmatched pubkey and prikey")
+		log.L().Panic(
+			"Error when decoding private key",
+			zap.String("key", cfg.Chain.ProducerPrivKey),
+			zap.Error(err),
+		)
 	}
-	return nil
+	return sk
 }
 
 // ValidateChain validates the chain configure