diff --git a/cmd/tomo/config.go b/cmd/tomo/config.go index ce9dc564b8..f6c6c11542 100644 --- a/cmd/tomo/config.go +++ b/cmd/tomo/config.go @@ -24,19 +24,18 @@ import ( "os" "reflect" "unicode" - + "strings" "gopkg.in/urfave/cli.v1" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/dashboard" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/internal/debug" + "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/params" whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "github.com/naoina/toml" - "strings" - "github.com/ethereum/go-ethereum/log" ) var ( diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f029186ce3..5f038750e2 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -653,7 +653,7 @@ func setListenAddress(ctx *cli.Context, cfg *p2p.Config) { // setNAT creates a port mapper from command line flags. func setNAT(ctx *cli.Context, cfg *p2p.Config) { if ctx.GlobalIsSet(NATFlag.Name) { - log.Info("NAT is setted","value",ctx.GlobalString(NATFlag.Name)) + log.Info("NAT is setted", "value", ctx.GlobalString(NATFlag.Name)) natif, err := nat.Parse(ctx.GlobalString(NATFlag.Name)) if err != nil { Fatalf("Option %s: %v", NATFlag.Name, err) diff --git a/consensus/posv/posv.go b/consensus/posv/posv.go index b92ecccdc5..950ad32059 100644 --- a/consensus/posv/posv.go +++ b/consensus/posv/posv.go @@ -769,21 +769,10 @@ func (c *Posv) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan } } } - // Sweet, the protocol permits us to sign the block, wait for our time - delay := time.Unix(header.Time.Int64(), 0).Sub(time.Now()) // nolint: gosimple - if header.Difficulty.Cmp(diffNoTurn) == 0 { - // It's not our turn explicitly to sign, delay it a bit - wiggle := time.Duration(len(masternodes)/2+1) * wiggleTime - delay += time.Duration(rand.Int63n(int64(wiggle))) - - log.Trace("Out-of-turn signing requested", "wiggle", common.PrettyDuration(wiggle)) - } - log.Trace("Waiting for slot to sign and propagate", "delay", common.PrettyDuration(delay)) - select { case <-stop: return nil, nil - case <-time.After(delay): + default: } // Sign all the things! sighash, err := signFn(accounts.Account{Address: signer}, sigHash(header).Bytes()) diff --git a/core/blockchain.go b/core/blockchain.go index 23d77a0d7b..44f432d0ae 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -24,10 +24,10 @@ import ( "math/big" mrand "math/rand" "os" + "sort" "sync" "sync/atomic" "time" - "sort" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" @@ -1402,7 +1402,7 @@ func (bc *BlockChain) PostChainEvents(events []interface{}, logs []*types.Log) { } func (bc *BlockChain) update() { - futureTimer := time.NewTicker(5 * time.Second) + futureTimer := time.NewTicker(10 * time.Millisecond) defer futureTimer.Stop() for { select { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index b569e0ccd5..86e976696c 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1221,9 +1221,9 @@ func submitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c return common.Hash{}, err } addr := crypto.CreateAddress(from, tx.Nonce()) - log.Info("Submitted contract creation", "fullhash", tx.Hash().Hex(), "contract", addr.Hex()) + log.Trace("Submitted contract creation", "fullhash", tx.Hash().Hex(), "contract", addr.Hex()) } else { - log.Info("Submitted transaction", "fullhash", tx.Hash().Hex(), "recipient", tx.To()) + log.Trace("Submitted transaction", "fullhash", tx.Hash().Hex(), "recipient", tx.To()) } return tx.Hash(), nil }