Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit f0445c3

Browse files
RuterigelfandCode0x2ngotchacJolly23
authored andcommitted
Cleanup and include old mev geth prs (#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 <eugene@linux.com> Co-authored-by: 0x2 <75550506+Code0x2@users.noreply.github.com> Co-authored-by: Nicolas Gotchac <ngotchac@gmail.com> Co-authored-by: Jolly Zhao <zhaolei@pm.me>
1 parent 61e65cf commit f0445c3

8 files changed

Lines changed: 48 additions & 366 deletions

File tree

core/txpool/txpool.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ func (pool *TxPool) loop() {
372372
defer report.Stop()
373373
defer evict.Stop()
374374
defer journal.Stop()
375+
defer privateTx.Stop()
375376

376377
// Notify tests that the init phase is done
377378
close(pool.initDoneCh)
@@ -596,7 +597,7 @@ func (pool *TxPool) AllMevBundles() []types.MevBundle {
596597

597598
// MevBundles returns a list of bundles valid for the given blockNumber/blockTimestamp
598599
// also prunes bundles that are outdated
599-
func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) ([]types.MevBundle, error) {
600+
func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) []types.MevBundle {
600601
pool.mu.Lock()
601602
defer pool.mu.Unlock()
602603

@@ -624,7 +625,7 @@ func (pool *TxPool) MevBundles(blockNumber *big.Int, blockTimestamp uint64) ([]t
624625
}
625626

626627
pool.mevBundles = bundles
627-
return ret, nil
628+
return ret
628629
}
629630

630631
// 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)