diff options
author | Péter Szilágyi <peterke@gmail.com> | 2019-09-17 20:50:34 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2019-09-17 20:55:06 +0800 |
commit | 056183c05634efeaee2bab6c3ace781f6da59cfc (patch) | |
tree | a36dc519beaf0f0a6f5bee44806d9bde0c51e96c | |
parent | 8d41e885e6c4bd8d6c1bd08d385165dd41f7edf1 (diff) | |
download | go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar.gz go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar.bz2 go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar.lz go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar.xz go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.tar.zst go-tangerine-056183c05634efeaee2bab6c3ace781f6da59cfc.zip |
core: dedup known transactions without global lock, track metrics
-rw-r--r-- | core/tx_pool.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go index e25877a1a..d67be96e5 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -97,7 +97,8 @@ var ( queuedNofundsMeter = metrics.NewRegisteredMeter("txpool/queued/nofunds", nil) // Dropped due to out-of-funds // General tx metrics - validMeter = metrics.NewRegisteredMeter("txpool/valid", nil) + knownTxMeter = metrics.NewRegisteredMeter("txpool/known", nil) + validTxMeter = metrics.NewRegisteredMeter("txpool/valid", nil) invalidTxMeter = metrics.NewRegisteredMeter("txpool/invalid", nil) underpricedTxMeter = metrics.NewRegisteredMeter("txpool/underpriced", nil) @@ -564,16 +565,15 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err e hash := tx.Hash() if pool.all.Get(hash) != nil { log.Trace("Discarding already known transaction", "hash", hash) + knownTxMeter.Mark(1) return false, fmt.Errorf("known transaction: %x", hash) } - // If the transaction fails basic validation, discard it if err := pool.validateTx(tx, local); err != nil { log.Trace("Discarding invalid transaction", "hash", hash, "err", err) invalidTxMeter.Mark(1) return false, err } - // 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 @@ -590,7 +590,6 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err e pool.removeTx(tx.Hash(), false) } } - // Try to replace an existing transaction in the pending pool from, _ := types.Sender(pool.signer, tx) // already validated if list := pool.pending[from]; list != nil && list.Overlaps(tx) { @@ -613,13 +612,11 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err e log.Trace("Pooled new executable transaction", "hash", hash, "from", from, "to", tx.To()) return old != nil, nil } - // New transaction isn't replacing a pending one, push into queue replaced, err = pool.enqueueTx(hash, tx) if err != nil { return false, err } - // Mark local addresses and journal local transactions if local { if !pool.locals.contains(from) { @@ -768,11 +765,18 @@ func (pool *TxPool) AddRemote(tx *types.Transaction) error { // addTxs attempts to queue a batch of transactions if they are valid. func (pool *TxPool) addTxs(txs []*types.Transaction, local, sync bool) []error { + // Filter out known ones without obtaining the pool lock or recovering signatures + for i := 0; i < len(txs); i++ { + if pool.all.Get(txs[i].Hash()) != nil { + knownTxMeter.Mark(1) + txs = append(txs[:i], txs[i+1:]...) + i-- + } + } // Cache senders in transactions before obtaining lock (pool.signer is immutable) for _, tx := range txs { types.Sender(pool.signer, tx) } - pool.mu.Lock() errs, dirtyAddrs := pool.addTxsLocked(txs, local) pool.mu.Unlock() @@ -796,7 +800,7 @@ func (pool *TxPool) addTxsLocked(txs []*types.Transaction, local bool) ([]error, dirty.addTx(tx) } } - validMeter.Mark(int64(len(dirty.accounts))) + validTxMeter.Mark(int64(len(dirty.accounts))) return errs, dirty } |