feat: allow removing txns from pool via CLI/RPC (#1041)

scroll-tech · Oct 9, 2024 · 8daafb6 · 8daafb6
1 parent d226deb
commit 8daafb6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/eth/api_backend.go b/eth/api_backend.go
@@ -314,6 +314,10 @@ func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction)
 	return b.eth.txPool.Add([]*types.Transaction{signedTx}, true, false)[0]
 }
 
+func (b *EthAPIBackend) RemoveTx(txHash common.Hash) {
+	b.eth.txPool.RemoveTx(txHash, true)
+}
+
 func (b *EthAPIBackend) GetPoolTransactions() (types.Transactions, error) {
 	pending := b.eth.txPool.Pending(false)
 	var txs types.Transactions

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -237,6 +237,11 @@ func (s *TxPoolAPI) Status() map[string]hexutil.Uint {
 	}
 }
 
+// RemoveTransactionByHash evicts a transaction from the pool.
+func (s *PublicTxPoolAPI) RemoveTransactionByHash(ctx context.Context, hash common.Hash) {
+	s.b.RemoveTx(hash)
+}
+
 // Inspect retrieves the content of the transaction pool and flattens it into an
 // easily inspectable list.
 func (s *TxPoolAPI) Inspect() map[string]map[string]map[string]string {

diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
@@ -76,6 +76,7 @@ type Backend interface {
 
 	// Transaction pool API
 	SendTx(ctx context.Context, signedTx *types.Transaction) error
+	RemoveTx(txHash common.Hash)
 	GetTransaction(ctx context.Context, txHash common.Hash) (*types.Transaction, common.Hash, uint64, uint64, error)
 	GetPoolTransactions() (types.Transactions, error)
 	GetPoolTransaction(txHash common.Hash) *types.Transaction

diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
@@ -800,6 +800,11 @@ web3._extend({
 			call: 'txpool_contentFrom',
 			params: 1,
 		}),
+		new web3._extend.Method({
+			name: 'removeTransactionByHash',
+			call: 'txpool_removeTransactionByHash',
+			params: 1
+		}),
 	]
 });
 `