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

# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go

consensus/ethash/consensus.go

@@ -57,8 +57,7 @@ var (
 	// Specification EIP-649: https://eips.ethereum.org/EIPS/eip-649
 	calcDifficultyByzantium = makeDifficultyCalculator(big.NewInt(3000000))
 	nanosecond2017Timestamp = mustParseRfc3339("2017-01-01T00:00:00+00:00").UnixNano()
-
-	)
+)
 
 // Various error messages to mark blocks invalid. These should be private to
 // prevent engine specific errors from being referenced in the remainder of the

core/types/transaction.go

@@ -23,11 +23,11 @@ import (
 	"math/big"
 	"sync/atomic"
 
+	fmt "fmt"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rlp"
-	fmt "fmt"
 )
 
 //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go

eth/backend.go

@@ -428,7 +428,6 @@ func (s *Ethereum) SetEtherbase(etherbase common.Address) {
 	}
 	s.etherbase = etherbase
 
-
 	s.miner.SetEtherbase(etherbase)
 }
 

private/constellation/constellation.go

@@ -44,7 +44,6 @@ func (g *Constellation) SendSignedTx(data []byte, to []string) (out []byte, err
 	return out, nil
 }
 
-
 func (g *Constellation) Receive(data []byte) ([]byte, error) {
 	if g.isConstellationNotInUse {
 		return nil, nil