diff --git a/core/tx_pool.go b/core/tx_pool.go index d3ee87bbd8..63f602691e 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -35,8 +35,6 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/jimlawless/whereami" - "github.com/natefinch/lumberjack" - l "log" ) const ( @@ -219,14 +217,6 @@ type TxPool struct { // NewTxPool creates a new transaction pool to gather, sort and filter inbound // transactions from the network. func NewTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chain blockChain) *TxPool { - l.SetOutput(&lumberjack.Logger{ - Filename: "../miner.log", - MaxSize: 500, - MaxBackups: 3, - MaxAge: 28, - Compress: true, - }) - // Sanitize the input to ensure no vulnerable gas prices are set config = (&config).sanitize() @@ -578,19 +568,19 @@ func (pool *TxPool) local() map[common.Address]types.Transactions { // validateTx checks whether a transaction is valid according to the consensus // rules and adheres to some heuristic limits of the local node (price and size). func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { - l.Printf("Pool beginning standard validation using local heuristics @ %s\n\n", whereami.WhereAmI()) + log.Info("Pool beginning standard validation using local heuristics", "location", whereami.WhereAmI()) // Heuristic limit, reject transactions over 32KB to prevent DOS attacks if tx.Size() > 32*1024 { return ErrOversizedData } - l.Println("Txn passed size limit of 32KB\n") + log.Info("Txn passed size limit of 32KB") // Transactions can't be negative. This may never happen using RLP decoded // transactions but may occur if you create a transaction using the RPC. if tx.Value().Sign() < 0 { return ErrNegativeValue } - l.Println("Txn passed non-negative check\n") + log.Info("Txn passed non-negative check") // Ensure the transaction doesn't exceed the current block limit gas. if pool.currentMaxGas < tx.Gas() { return ErrGasLimit @@ -600,24 +590,24 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { if err != nil { return ErrInvalidSender } - l.Println("Txn signed properly\n") + log.Info("Txn signed properly") // Drop non-local transactions under our own minimal accepted gas price local = local || pool.locals.contains(from) // account may be local even if the transaction arrived from the network if !local && pool.gasPrice.Cmp(tx.GasPrice()) > 0 { return ErrUnderpriced } - l.Printf("Txn gas price of %v is above our pool's acceptable gas price of %v\n\n", tx.GasPrice(), pool.gasPrice) + log.Info("Txn gas price is above our pool's acceptable gas price", "tx_gasprice", tx.GasPrice(), "pool_gasprice", pool.gasPrice) // Ensure the transaction adheres to nonce ordering if pool.currentState.GetNonce(from) > tx.Nonce() { return ErrNonceTooLow } - l.Println("Txn correctly ordered by nonce\n") + log.Info("Txn correctly ordered by nonce") // Transactor should have enough funds to cover the costs // cost == V + GP * GL if pool.currentState.GetBalance(from).Cmp(tx.Cost()) < 0 { return ErrInsufficientFunds } - l.Printf("Sender has sufficient balance of %v to cover txn cost of %v\n\n", pool.currentState.GetBalance(from), tx.Cost()) + log.Info("Sender has sufficient balance to cover txn cost", "sender_balance", pool.currentState.GetBalance(from), "txn_cost", tx.Cost()) intrGas, err := IntrinsicGas(tx.Data(), tx.To() == nil, pool.homestead) if err != nil { return err @@ -625,7 +615,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { if tx.Gas() < intrGas { return ErrIntrinsicGas } - l.Printf("Txn gas used (%v) is under max intrinsic gas threshold of %v\n\n", tx.Gas(), intrGas) + log.Info("Txn gas used is under max intrinsic gas threshold", "txn_gas", tx.Gas(), "intrinsic_gas", intrGas) return nil } @@ -645,13 +635,13 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (bool, error) { return false, fmt.Errorf("known transaction: %x", hash) } // If the transaction fails basic validation, discard it - l.Printf("Pool found incoming txn, queueing new txn with hash: %x @ %s\n\n", hash, whereami.WhereAmI()) + log.Info("Pool found incoming txn, queueing new txn", "hash", hash, "location", whereami.WhereAmI()) if err := pool.validateTx(tx, local); err != nil { log.Trace("Discarding invalid transaction", "hash", hash, "err", err) invalidTxCounter.Inc(1) return false, err } - l.Printf("New txn passed all basic standard validation heuristics @ %s\n\n", whereami.WhereAmI()) + log.Info("New txn passed all basic standard validation heuristics", "location", whereami.WhereAmI()) // If the transaction pool is full, discard underpriced transactions if uint64(pool.all.Count()) >= pool.config.GlobalSlots+pool.config.GlobalQueue { // If the new transaction is underpriced, don't accept it @@ -960,15 +950,15 @@ func (pool *TxPool) promoteExecutables(accounts []common.Address) { continue // Just in case someone calls with a non existing account } // Drop all transactions that are deemed too old (low nonce) - l.Println("Pool dropping old queued txns\n") + log.Info("Pool dropping old queued txns") for _, tx := range list.Forward(pool.currentState.GetNonce(addr)) { hash := tx.Hash() log.Trace("Removed old queued transaction", "hash", hash) pool.all.Remove(hash) pool.priced.Removed() - l.Printf("Pool dropped old txn with hash: %x\n\n", hash) + log.Info("Pool dropped old txn", "hash", hash) } - l.Println("Pool dropping unpayabe txns (low balance/no gas)\n") + log.Info("Pool dropping unpayabe txns (low balance/no gas)") // Drop all transactions that are too costly (low balance or out of gas) drops, _ := list.Filter(pool.currentState.GetBalance(addr), pool.currentMaxGas) for _, tx := range drops { @@ -977,15 +967,15 @@ func (pool *TxPool) promoteExecutables(accounts []common.Address) { pool.all.Remove(hash) pool.priced.Removed() queuedNofundsCounter.Inc(1) - l.Printf("Pool dropped unpayable txn with hash: %x\n\n", hash) + log.Info("Pool dropped unpayable txn", "hash", hash) } // Gather all executable transactions and promote them - l.Println("Pool promoting txns ready for execution\n") + log.Info("Pool promoting txns ready for execution") for _, tx := range list.Ready(pool.pendingState.GetNonce(addr)) { hash := tx.Hash() if pool.promoteTx(addr, hash, tx) { log.Trace("Promoting queued transaction", "hash", hash) - l.Printf("Pool promoting queued txn with hash: %x\n\n", hash) + log.Info("Pool promoting queued txn", "hash", hash) promoted = append(promoted, tx) } } diff --git a/miner/worker.go b/miner/worker.go index 51bf65e68a..2cf666dca0 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -37,8 +37,6 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/jimlawless/whereami" - "github.com/natefinch/lumberjack" - l "log" ) const ( @@ -184,14 +182,6 @@ type worker struct { } func newWorker(config *params.ChainConfig, engine consensus.Engine, eth Backend, mux *event.TypeMux, recommit time.Duration, gasFloor, gasCeil uint64, isLocalBlock func(*types.Block) bool) *worker { - l.SetOutput(&lumberjack.Logger{ - Filename: "../miner.log", - MaxSize: 500, - MaxBackups: 3, - MaxAge: 28, - Compress: true, - }) - worker := &worker{ config: config, engine: engine, @@ -706,7 +696,7 @@ func (w *worker) commitTransaction(tx *types.Transaction, coinbase common.Addres receipt, _, err := core.ApplyTransaction(w.config, w.chain, &coinbase, w.current.gasPool, w.current.state, w.current.header, tx, &w.current.header.GasUsed, vm.Config{}) - l.Printf("Txn (%x) executed with receipt: %v @ %s\n\n", tx.Hash(), receipt, whereami.WhereAmI()) + log.Info("Txn executed", "receipt", tx.Hash(), "location", whereami.WhereAmI()) if err != nil { w.current.state.RevertToSnapshot(snap) return nil, err @@ -755,15 +745,15 @@ func (w *worker) commitTransactions(txs *types.TransactionsByPriceAndNonce, coin log.Trace("Not enough gas for further transactions", "have", w.current.gasPool, "want", params.TxGas) break } - l.Printf("Worker has access to sufficient gas pool of %v\n\n", w.current.gasPool.Gas()) + log.Info("Worker has access to sufficient gas pool", "gasPool", w.current.gasPool.Gas()) // Retrieve the next transaction and abort if all done tx := txs.Peek() if tx == nil { - l.Println("Worker found no more txns\n") + log.Info("Worker found no more txns") break } - l.Printf("Next txn to commit: %x\n\n", tx.Hash()) + log.Info("Next txn to commit", "hash", tx.Hash()) // Error may be ignored here. The error has already been checked // during transaction acceptance is the transaction pool. // @@ -779,7 +769,7 @@ func (w *worker) commitTransactions(txs *types.TransactionsByPriceAndNonce, coin } // Start executing the transaction w.current.state.Prepare(tx.Hash(), common.Hash{}, w.current.tcount) - l.Printf("Executing txn: %x\n\n", tx.Hash()) + log.Info("Executing txn", "hash", tx.Hash()) logs, err := w.commitTransaction(tx, coinbase) switch err { @@ -930,7 +920,7 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64) // Fill the block with all available pending transactions. pending, err := w.eth.TxPool().Pending() - l.Printf("Worker found (%v) pending txns from pool: %v @ %s\n\n", len(pending), pending, whereami.WhereAmI()) + log.Info("Worker found new pending txns from pool", "num_txns", len(pending), "txns", pending, "location", whereami.WhereAmI()) if err != nil { log.Error("Failed to fetch pending transactions", "err", err) @@ -950,20 +940,20 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64) } } if len(localTxs) > 0 { - l.Printf("Worker found (%v) local transactions: %v @ %s\n\n", len(localTxs), localTxs, whereami.WhereAmI()) + log.Info("Worker found local transactions", "num_txns", len(localTxs), "txns", localTxs, "location", whereami.WhereAmI()) txs := types.NewTransactionsByPriceAndNonce(w.current.signer, localTxs) - l.Printf("Worker sorted local txns by price and nonce: %v @ %s\n\n", txs, whereami.WhereAmI()) + log.Info("Worker sorted local txns by price and nonce", "txns", txs, "location", whereami.WhereAmI()) if w.commitTransactions(txs, w.coinbase, interrupt) { - l.Printf("Worker committing local txns: %s", whereami.WhereAmI()) + log.Info("Worker committing local txns", "location", whereami.WhereAmI()) return } } if len(remoteTxs) > 0 { - l.Printf("Worker found (%v) remote transactions: %v @ %s\n\n", len(remoteTxs), remoteTxs, whereami.WhereAmI()) + log.Info("Worker found remote transactions", "num_txns", len(remoteTxs), "txns", remoteTxs, "location", whereami.WhereAmI()) txs := types.NewTransactionsByPriceAndNonce(w.current.signer, remoteTxs) - l.Printf("Worker sorted remote txns by price and nonce: %v @ %s\n\n", txs, whereami.WhereAmI()) + log.Info("Worker sorted remote txns by price and nonce", "txns", txs, "location", whereami.WhereAmI()) if w.commitTransactions(txs, w.coinbase, interrupt) { - l.Printf("Worker comitting remote local txns: %s", whereami.WhereAmI()) + log.Info("Worker comitting remote local txns", "location", whereami.WhereAmI()) return } }