forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove a bunch of logging

Browse source
This commit is contained in:
Jared Wasinger 2025-04-08 18:02:21 +08:00
parent c5055a88b3
commit 098b362c9a
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/txpool/legacypool/legacypool.go
View file

@ -964,9 +964,6 @@ func (pool *LegacyPool) Add(txs []*types.Transaction, sync bool) []error {
pool.mu.Lock() pool.mu.Lock()
newErrs, dirtyAddrs := pool.addTxsLocked(news) newErrs, dirtyAddrs := pool.addTxsLocked(news)
pool.mu.Unlock() pool.mu.Unlock()
for _, new := range news {
fmt.Printf("prepare tx for queue %x\n", new.Hash())
}
var nilSlot = 0 var nilSlot = 0
for _, err := range newErrs { for _, err := range newErrs {
@ -981,7 +978,6 @@ func (pool *LegacyPool) Add(txs []*types.Transaction, sync bool) []error {
pool.requestPromoteExecutables(req) pool.requestPromoteExecutables(req)
if sync { if sync {
<-req.done <-req.done
fmt.Printf("done adding txs %v\n", txs[0])
} }
return errs return errs
} }
@ -1194,9 +1190,6 @@ func (pool *LegacyPool) scheduleReorgLoop() {
for { for {
// Launch next background reorg if needed // Launch next background reorg if needed
if curDone == nil && launchNextRun { if curDone == nil && launchNextRun {
fmt.Printf("initiating reorg with dones %v\n", nextDones)
fmt.Printf("initiating reorg with dirty accounts: %v\n", dirtyAccounts)
// Run the background reorg and announcements // Run the background reorg and announcements
go pool.runReorg(nextDone, reset, dirtyAccounts, queuedEvents) go pool.runReorg(nextDone, reset, dirtyAccounts, queuedEvents)
@ -1217,7 +1210,6 @@ func (pool *LegacyPool) scheduleReorgLoop() {
} else { } else {
reset.newHead = req.newHead reset.newHead = req.newHead
} }
fmt.Printf("reset: appending to next dones %v\n", req.done)
nextDones = append(nextDones, req.done) nextDones = append(nextDones, req.done)
launchNextRun = true launchNextRun = true
//pool.reorgDoneCh <- nextDone //pool.reorgDoneCh <- nextDone
@ -1225,7 +1217,6 @@ func (pool *LegacyPool) scheduleReorgLoop() {
case req := <-pool.reqPromoteCh: case req := <-pool.reqPromoteCh:
select { select {
case tx := <-pool.queueTxEventCh: case tx := <-pool.queueTxEventCh:
fmt.Printf("queue tx %x\n", tx.Hash())
// Queue up the event, but don't schedule a reorg. It's up to the caller to // Queue up the event, but don't schedule a reorg. It's up to the caller to
// request one later if they want the events sent. // request one later if they want the events sent.
addr, _ := types.Sender(pool.signer, tx) addr, _ := types.Sender(pool.signer, tx)
@ -1241,13 +1232,11 @@ func (pool *LegacyPool) scheduleReorgLoop() {
} else { } else {
dirtyAccounts.merge(req.set) dirtyAccounts.merge(req.set)
} }
fmt.Printf("promote executables: appending to next dones %v\n", req.done)
nextDones = append(nextDones, req.done) nextDones = append(nextDones, req.done)
launchNextRun = true launchNextRun = true
//pool.reorgDoneCh <- nextDone //pool.reorgDoneCh <- nextDone
case tx := <-pool.queueTxEventCh: case tx := <-pool.queueTxEventCh:
fmt.Printf("queue tx %x\n", tx.Hash())
// Queue up the event, but don't schedule a reorg. It's up to the caller to // Queue up the event, but don't schedule a reorg. It's up to the caller to
// request one later if they want the events sent. // request one later if they want the events sent.
addr, _ := types.Sender(pool.signer, tx) addr, _ := types.Sender(pool.signer, tx)
@ -1352,7 +1341,6 @@ func (pool *LegacyPool) runReorg(done chan struct{}, reset *txpoolResetRequest,
if _, ok := events[addr]; !ok { if _, ok := events[addr]; !ok {
events[addr] = NewSortedMap() events[addr] = NewSortedMap()
} }
fmt.Printf("promoted tx %v\n", tx.Hash())
events[addr].Put(tx) events[addr].Put(tx)
} }
if len(events) > 0 { if len(events) > 0 {
@ -1473,7 +1461,6 @@ func (pool *LegacyPool) promoteExecutables(accounts []common.Address) []*types.T
// Iterate over all accounts and promote any executable transactions // Iterate over all accounts and promote any executable transactions
gasLimit := pool.currentHead.Load().GasLimit gasLimit := pool.currentHead.Load().GasLimit
for _, addr := range accounts { for _, addr := range accounts {
fmt.Printf("promoteExecutables %x\n", addr)
list := pool.queue[addr] list := pool.queue[addr]
if list == nil { if list == nil {
continue // Just in case someone calls with a non existing account continue // Just in case someone calls with a non existing account