Skip to content

Commit 83a14be

Browse files
RuterigelfandCode0x2ngotchacJolly23
authored andcommitted
Cleanup and include old mev geth prs (flashbots#45)
* Remove old infra scripts * core: tx_pool not return `error` in `MevBundles()` * Adjust worker to not consider error returned from MevBundles * Update web3ext.go * internal/ethapi: Fix context not being used * fix: dev: add defer privateTx.Stop() Co-authored-by: eugene <[email protected]> Co-authored-by: 0x2 <[email protected]> Co-authored-by: Nicolas Gotchac <[email protected]> Co-authored-by: Jolly Zhao <[email protected]>
1 parent e3b059f commit 83a14be

File tree

8 files changed

+48
-366
lines changed

8 files changed

+48
-366
lines changed

core/txpool/txpool.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ func (pool *TxPool) loop() {
364364
defer report.Stop()
365365
defer evict.Stop()
366366
defer journal.Stop()
367+
defer privateTx.Stop()
367368

368369
// Notify tests that the init phase is done
369370
close(pool.initDoneCh)
@@ -588,7 +589,7 @@ func (pool *TxPool) AllMevBundles() []types.MevBundle {
588589

589590
// MevBundles returns a list of bundles valid for the given blockNumber/blockTimestamp
590591
// also prunes bundles that are outdated
591-
func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) ([]types.MevBundle, error) {
592+
func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) []types.MevBundle {
592593
pool.mu.Lock()
593594
defer pool.mu.Unlock()
594595

@@ -616,7 +617,7 @@ func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) ([]t
616617
}
617618

618619
pool.mevBundles = bundles
619-
return ret, nil
620+
return ret
620621
}
621622

622623
// AddMevBundles adds a mev bundles to the pool

infra/Dockerfile.node

Lines changed: 0 additions & 23 deletions
This file was deleted.

infra/Dockerfile.updater

Lines changed: 0 additions & 23 deletions
This file was deleted.

infra/start-mev-geth-node.sh

Lines changed: 0 additions & 99 deletions
This file was deleted.

infra/start-mev-geth-updater.sh

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)