Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18

consensus/istanbul/backend/handler.go

@@ -17,17 +17,25 @@
 package backend
 
 import (
+	"bytes"
 	"errors"
+	"io/ioutil"
+	"math/big"
+	"reflect"
+
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/consensus/istanbul"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p"
-	lru "github.com/hashicorp/golang-lru"
+	"github.com/hashicorp/golang-lru"
 )
 
 const (
 	istanbulMsg = 0x11
+	NewBlockMsg = 0x07
 )
 
 var (
@@ -44,6 +52,15 @@ func (sb *backend) Protocol() consensus.Protocol {
 	}
 }
 
+func (sb *backend) decode(msg p2p.Msg) ([]byte, common.Hash, error) {
+	var data []byte
+	if err := msg.Decode(&data); err != nil {
+		return nil, common.Hash{}, errDecodeFailed
+	}
+
+	return data, istanbul.RLPHash(data), nil
+}
+
 // HandleMsg implements consensus.Handler.HandleMsg
 func (sb *backend) HandleMsg(addr common.Address, msg p2p.Msg) (bool, error) {
 	sb.coreMu.Lock()
@@ -54,13 +71,11 @@ func (sb *backend) HandleMsg(addr common.Address, msg p2p.Msg) (bool, error) {
 			return true, istanbul.ErrStoppedEngine
 		}
 
-		var data []byte
-		if err := msg.Decode(&data); err != nil {
+		data, hash, err := sb.decode(msg)
+		if err != nil {
 			return true, errDecodeFailed
 		}
 
-		hash := istanbul.RLPHash(data)
-
 		// Mark peer's message
 		ms, ok := sb.recentMessages.Get(addr)
 		var m *lru.ARCCache
@@ -84,6 +99,32 @@ func (sb *backend) HandleMsg(addr common.Address, msg p2p.Msg) (bool, error) {
 
 		return true, nil
 	}
+	if msg.Code == NewBlockMsg && sb.core.IsProposer() { // eth.NewBlockMsg: import cycle
+		// this case is to safeguard the race of similar block which gets propagated from other node while this node is proposing
+		// as p2p.Msg can only be decoded once (get EOF for any subsequence read), we need to make sure the payload is restored after we decode it
+		log.Debug("Proposer received NewBlockMsg", "size", msg.Size, "payload.type", reflect.TypeOf(msg.Payload), "sender", addr)
+		if reader, ok := msg.Payload.(*bytes.Reader); ok {
+			payload, err := ioutil.ReadAll(reader)
+			if err != nil {
+				return true, err
+			}
+			reader.Reset(payload)       // ready to be decoded
+			defer reader.Reset(payload) // restore so main eth/handler can decode
+			var request struct {        // this has to be same as eth/protocol.go#newBlockData as we are reading NewBlockMsg
+				Block *types.Block
+				TD    *big.Int
+			}
+			if err := msg.Decode(&request); err != nil {
+				log.Debug("Proposer was unable to decode the NewBlockMsg", "error", err)
+				return false, nil
+			}
+			newRequestedBlock := request.Block
+			if newRequestedBlock.Header().MixDigest == types.IstanbulDigest && sb.core.IsCurrentProposal(newRequestedBlock.Hash()) {
+				log.Debug("Proposer already proposed this block", "hash", newRequestedBlock.Hash(), "sender", addr)
+				return true, nil
+			}
+		}
+	}
 	return false, nil
 }
 

consensus/istanbul/backend/handler_test.go

@@ -17,13 +17,18 @@
 package backend
 
 import (
+	"bytes"
+	"io/ioutil"
+	"math/big"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus/istanbul"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rlp"
-	lru "github.com/hashicorp/golang-lru"
+	"github.com/hashicorp/golang-lru"
 )
 
 func TestIstanbulMessage(t *testing.T) {
@@ -70,3 +75,110 @@ func makeMsg(msgcode uint64, data interface{}) p2p.Msg {
 	size, r, _ := rlp.EncodeToReader(data)
 	return p2p.Msg{Code: msgcode, Size: uint32(size), Payload: r}
 }
+
+func TestHandleNewBlockMessage_whenTypical(t *testing.T) {
+	_, backend := newBlockChain(1)
+	arbitraryAddress := common.StringToAddress("arbitrary")
+	arbitraryBlock, arbitraryP2PMessage := buildArbitraryP2PNewBlockMessage(t, false)
+	postAndWait(backend, arbitraryBlock, t)
+
+	handled, err := backend.HandleMsg(arbitraryAddress, arbitraryP2PMessage)
+
+	if err != nil {
+		t.Errorf("expected message being handled successfully but got %s", err)
+	}
+	if !handled {
+		t.Errorf("expected message being handled but not")
+	}
+	if _, err := ioutil.ReadAll(arbitraryP2PMessage.Payload); err != nil {
+		t.Errorf("expected p2p message payload is restored")
+	}
+}
+
+func TestHandleNewBlockMessage_whenNotAProposedBlock(t *testing.T) {
+	_, backend := newBlockChain(1)
+	arbitraryAddress := common.StringToAddress("arbitrary")
+	_, arbitraryP2PMessage := buildArbitraryP2PNewBlockMessage(t, false)
+	postAndWait(backend, types.NewBlock(&types.Header{
+		Number:    big.NewInt(1),
+		Root:      common.StringToHash("someroot"),
+		GasLimit:  1,
+		MixDigest: types.IstanbulDigest,
+	}, nil, nil, nil), t)
+
+	handled, err := backend.HandleMsg(arbitraryAddress, arbitraryP2PMessage)
+
+	if err != nil {
+		t.Errorf("expected message being handled successfully but got %s", err)
+	}
+	if handled {
+		t.Errorf("expected message not being handled")
+	}
+	if _, err := ioutil.ReadAll(arbitraryP2PMessage.Payload); err != nil {
+		t.Errorf("expected p2p message payload is restored")
+	}
+}
+
+func TestHandleNewBlockMessage_whenFailToDecode(t *testing.T) {
+	_, backend := newBlockChain(1)
+	arbitraryAddress := common.StringToAddress("arbitrary")
+	_, arbitraryP2PMessage := buildArbitraryP2PNewBlockMessage(t, true)
+	postAndWait(backend, types.NewBlock(&types.Header{
+		Number:    big.NewInt(1),
+		GasLimit:  1,
+		MixDigest: types.IstanbulDigest,
+	}, nil, nil, nil), t)
+
+	handled, err := backend.HandleMsg(arbitraryAddress, arbitraryP2PMessage)
+
+	if err != nil {
+		t.Errorf("expected message being handled successfully but got %s", err)
+	}
+	if handled {
+		t.Errorf("expected message not being handled")
+	}
+	if _, err := ioutil.ReadAll(arbitraryP2PMessage.Payload); err != nil {
+		t.Errorf("expected p2p message payload is restored")
+	}
+}
+
+func postAndWait(backend *backend, block *types.Block, t *testing.T) {
+	eventSub := backend.EventMux().Subscribe(istanbul.RequestEvent{})
+	defer eventSub.Unsubscribe()
+	stop := make(chan struct{}, 1)
+	eventLoop := func() {
+		select {
+		case <-eventSub.Chan():
+			stop <- struct{}{}
+		}
+	}
+	go eventLoop()
+	if err := backend.EventMux().Post(istanbul.RequestEvent{
+		Proposal: block,
+	}); err != nil {
+		t.Fatalf("%s", err)
+	}
+	<-stop
+}
+
+func buildArbitraryP2PNewBlockMessage(t *testing.T, invalidMsg bool) (*types.Block, p2p.Msg) {
+	arbitraryBlock := types.NewBlock(&types.Header{
+		Number:    big.NewInt(1),
+		GasLimit:  0,
+		MixDigest: types.IstanbulDigest,
+	}, nil, nil, nil)
+	request := []interface{}{&arbitraryBlock, big.NewInt(1)}
+	if invalidMsg {
+		request = []interface{}{"invalid msg"}
+	}
+	size, r, err := rlp.EncodeToReader(request)
+	if err != nil {
+		t.Fatalf("can't encode due to %s", err)
+	}
+	payload, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatalf("can't read payload due to %s", err)
+	}
+	arbitraryP2PMessage := p2p.Msg{Code: 0x07, Size: uint32(size), Payload: bytes.NewReader(payload)}
+	return arbitraryBlock, arbitraryP2PMessage
+}

consensus/istanbul/core/core.go

@@ -157,7 +157,7 @@ func (c *core) currentView() *istanbul.View {
 	}
 }
 
-func (c *core) isProposer() bool {
+func (c *core) IsProposer() bool {
 	v := c.valSet
 	if v == nil {
 		return false
@@ -165,6 +165,10 @@ func (c *core) isProposer() bool {
 	return v.IsProposer(c.backend.Address())
 }
 
+func (c *core) IsCurrentProposal(blockHash common.Hash) bool {
+	return c.current.pendingRequest != nil && c.current.pendingRequest.Proposal.Hash() == blockHash
+}
+
 func (c *core) commit() {
 	c.setState(StateCommitted)
 
@@ -245,7 +249,7 @@ func (c *core) startNewRound(round *big.Int) {
 	c.valSet.CalcProposer(lastProposer, newView.Round.Uint64())
 	c.waitingForRoundChange = false
 	c.setState(StateAcceptRequest)
-	if roundChange && c.isProposer() && c.current != nil {
+	if roundChange && c.IsProposer() && c.current != nil {
 		// If it is locked, propose the old proposal
 		// If we have pending request, propose pending request
 		if c.current.IsHashLocked() {
@@ -259,7 +263,7 @@ func (c *core) startNewRound(round *big.Int) {
 	}
 	c.newRoundChangeTimer()
 
-	logger.Debug("New round", "new_round", newView.Round, "new_seq", newView.Sequence, "new_proposer", c.valSet.GetProposer(), "valSet", c.valSet.List(), "size", c.valSet.Size(), "isProposer", c.isProposer())
+	logger.Debug("New round", "new_round", newView.Round, "new_seq", newView.Sequence, "new_proposer", c.valSet.GetProposer(), "valSet", c.valSet.List(), "size", c.valSet.Size(), "IsProposer", c.IsProposer())
 }
 
 func (c *core) catchUpRound(view *istanbul.View) {

consensus/istanbul/core/preprepare.go

@@ -27,7 +27,7 @@ func (c *core) sendPreprepare(request *istanbul.Request) {
 	logger := c.logger.New("state", c.state)
 
 	// If I'm the proposer and I have the same sequence with the proposal
-	if c.current.Sequence().Cmp(request.Proposal.Number()) == 0 && c.isProposer() {
+	if c.current.Sequence().Cmp(request.Proposal.Number()) == 0 && c.IsProposer() {
 		curView := c.currentView()
 		preprepare, err := Encode(&istanbul.Preprepare{
 			View:     curView,

consensus/istanbul/core/types.go

@@ -27,6 +27,16 @@ import (
 type Engine interface {
 	Start() error
 	Stop() error
+
+	IsProposer() bool
+
+	// verify if a hash is the same as the proposed block in the current pending request
+	//
+	// this is useful when the engine is currently the proposer
+	//
+	// pending request is populated right at the preprepare stage so this would give us the earliest verification
+	// to avoid any race condition of coming propagated blocks
+	IsCurrentProposal(blockHash common.Hash) bool
 }
 
 type State uint64

core/state_transition.go

@@ -218,7 +218,9 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 		data = st.data
 	}
 
-	// Pay intrinsic gas
+	// Pay intrinsic gas. For a private contract this is done using the public hash passed in,
+	// not the private data retrieved above. This is because we need any (participant) validator
+	// node to get the same result as a (non-participant) minter node, to avoid out-of-gas issues.
 	gas, err := IntrinsicGas(st.data, contractCreation, homestead)
 	if err != nil {
 		return nil, 0, false, err
@@ -228,6 +230,7 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 	}
 
 	var (
+		leftoverGas uint64
 		evm = st.evm
 		// vm errors do not effect consensus and are therefor
 		// not assigned to err, except for insufficient balance
@@ -235,7 +238,7 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 		vmerr error
 	)
 	if contractCreation {
-		ret, _, st.gas, vmerr = evm.Create(sender, data, st.gas, st.value)
+		ret, _, leftoverGas, vmerr = evm.Create(sender, data, st.gas, st.value)
 	} else {
 		// Increment the account nonce only if the transaction isn't private.
 		// If the transaction is private it has already been incremented on
@@ -254,7 +257,7 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 			return nil, 0, false, nil
 		}
 
-		ret, st.gas, vmerr = evm.Call(sender, to, data, st.gas, st.value)
+		ret, leftoverGas, vmerr = evm.Call(sender, to, data, st.gas, st.value)
 	}
 	if vmerr != nil {
 		log.Info("VM returned with error", "err", vmerr)
@@ -265,6 +268,15 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo
 			return nil, 0, false, vmerr
 		}
 	}
+
+	// Pay gas used during contract creation or execution (st.gas tracks remaining gas)
+	// However, if private contract then we don't want to do this else we can get
+	// a mismatch between a (non-participant) minter and (participant) validator,
+	// which can cause a 'BAD BLOCK' crash.
+	if !isPrivate {
+		st.gas = leftoverGas
+	}
+
 	st.refundGas()
 	st.state.AddBalance(st.evm.Coinbase, new(big.Int).Mul(new(big.Int).SetUint64(st.gasUsed()), st.gasPrice))