diff --git a/cmd/geth/main.go b/cmd/geth/main.go index f137e8df82..24760af5e0 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -441,6 +441,7 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend) { // Set the gas price to the limits from the CLI and start mining gasprice := utils.GlobalBig(ctx, utils.MinerGasPriceFlag.Name) ethBackend.TxPool().SetGasPrice(gasprice) + ethBackend.TxPool().SetIsMiner(true) // start mining threads := ctx.GlobalInt(utils.MinerThreadsFlag.Name) if err := ethBackend.StartMining(threads); err != nil { diff --git a/core/rawdb/accessors_skipped_txs.go b/core/rawdb/accessors_skipped_txs.go index 3481a955c8..5378c28c2b 100644 --- a/core/rawdb/accessors_skipped_txs.go +++ b/core/rawdb/accessors_skipped_txs.go @@ -158,6 +158,16 @@ func ReadSkippedTransaction(db ethdb.Reader, txHash common.Hash) *SkippedTransac return &stxV2 } +// IsSkippedTransaction checks if a transaction exists as a skipped transaction in the database. +func IsSkippedTransaction(db ethdb.Reader, txHash common.Hash) bool { + exists, err := db.Has(SkippedTransactionKey(txHash)) + if err != nil { + log.Error("Failed to check skipped transaction", "hash", txHash.String(), "err", err) + return false + } + return exists +} + // writeSkippedTransactionHash writes the hash of a skipped transaction to the database. func writeSkippedTransactionHash(db ethdb.KeyValueWriter, index uint64, txHash common.Hash) { if err := db.Put(SkippedTransactionHashKey(index), txHash[:]); err != nil { diff --git a/core/tx_pool.go b/core/tx_pool.go index 14124e7633..533547dc26 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -29,8 +29,10 @@ import ( "github.com/scroll-tech/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common/prque" "github.com/scroll-tech/go-ethereum/consensus/misc" + "github.com/scroll-tech/go-ethereum/core/rawdb" "github.com/scroll-tech/go-ethereum/core/state" "github.com/scroll-tech/go-ethereum/core/types" + "github.com/scroll-tech/go-ethereum/ethdb" "github.com/scroll-tech/go-ethereum/event" "github.com/scroll-tech/go-ethereum/log" "github.com/scroll-tech/go-ethereum/metrics" @@ -109,11 +111,12 @@ var ( queuedEvictionMeter = metrics.NewRegisteredMeter("txpool/queued/eviction", nil) // Dropped due to lifetime // General tx metrics - knownTxMeter = metrics.NewRegisteredMeter("txpool/known", nil) - validTxMeter = metrics.NewRegisteredMeter("txpool/valid", nil) - invalidTxMeter = metrics.NewRegisteredMeter("txpool/invalid", nil) - underpricedTxMeter = metrics.NewRegisteredMeter("txpool/underpriced", nil) - overflowedTxMeter = metrics.NewRegisteredMeter("txpool/overflowed", nil) + knownTxMeter = metrics.NewRegisteredMeter("txpool/known", nil) + knownSkippedTxMeter = metrics.NewRegisteredMeter("txpool/known/skipped", nil) + validTxMeter = metrics.NewRegisteredMeter("txpool/valid", nil) + invalidTxMeter = metrics.NewRegisteredMeter("txpool/invalid", nil) + underpricedTxMeter = metrics.NewRegisteredMeter("txpool/underpriced", nil) + overflowedTxMeter = metrics.NewRegisteredMeter("txpool/overflowed", nil) // throttleTxMeter counts how many transactions are rejected due to too-many-changes between // txpool reorgs. throttleTxMeter = metrics.NewRegisteredMeter("txpool/throttle", nil) @@ -154,6 +157,8 @@ type blockChain interface { StateAt(root common.Hash) (*state.StateDB, error) SubscribeChainHeadEvent(ch chan<- ChainHeadEvent) event.Subscription + + Database() ethdb.Database } // TxPoolConfig are the configuration parameters of the transaction pool. @@ -279,6 +284,8 @@ type TxPool struct { initDoneCh chan struct{} // is closed once the pool is initialized (for tests) changesSinceReorg int // A counter for how many drops we've performed in-between reorg. + + isMiner atomic.Bool } type txpoolResetRequest struct { @@ -492,6 +499,17 @@ func (pool *TxPool) SetGasPrice(price *big.Int) { log.Info("Transaction pool price threshold updated", "price", price) } +// SetIsMiner updates the miner status of the node. +func (pool *TxPool) SetIsMiner(isMiner bool) { + pool.isMiner.Store(isMiner) + log.Info("Transaction pool miner status updated", "isMiner", isMiner) +} + +// IsMiner returns the current miner status of the node. +func (pool *TxPool) IsMiner() bool { + return pool.isMiner.Load() +} + // Nonce returns the next nonce of an account, with all transactions executable // by the pool already applied on top. func (pool *TxPool) Nonce(addr common.Address) uint64 { @@ -767,6 +785,13 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err e knownTxMeter.Mark(1) return false, ErrAlreadyKnown } + + if pool.IsMiner() && rawdb.IsSkippedTransaction(pool.chain.Database(), hash) { + log.Trace("Discarding already known skipped transaction", "hash", hash) + knownSkippedTxMeter.Mark(1) + return false, ErrAlreadyKnown + } + // Make the local flag. If it's from local source or it's from the network but // the sender is marked as local previously, treat it as the local transaction. isLocal := local || pool.locals.containsTx(tx) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index ca99bf1a78..22e498718f 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -35,6 +35,7 @@ import ( "github.com/scroll-tech/go-ethereum/core/state" "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/crypto" + "github.com/scroll-tech/go-ethereum/ethdb" "github.com/scroll-tech/go-ethereum/event" "github.com/scroll-tech/go-ethereum/params" "github.com/scroll-tech/go-ethereum/trie" @@ -97,6 +98,10 @@ func (bc *testBlockChain) SubscribeChainHeadEvent(ch chan<- ChainHeadEvent) even return bc.chainHeadFeed.Subscribe(ch) } +func (bc *testBlockChain) Database() ethdb.Database { + return nil +} + func transaction(nonce uint64, gaslimit uint64, key *ecdsa.PrivateKey) *types.Transaction { return pricedTransaction(nonce, gaslimit, big.NewInt(1), key) } diff --git a/miner/miner_test.go b/miner/miner_test.go index 56f6c1f2da..8209617111 100644 --- a/miner/miner_test.go +++ b/miner/miner_test.go @@ -91,6 +91,10 @@ func (bc *testBlockChain) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) return bc.chainHeadFeed.Subscribe(ch) } +func (bc *testBlockChain) Database() ethdb.Database { + return nil +} + func TestMiner(t *testing.T) { miner, mux := createMiner(t) miner.Start(common.HexToAddress("0x12345")) diff --git a/params/version.go b/params/version.go index 01721495ad..44aa95662f 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 7 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release + VersionPatch = 1 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )