Skip to content

Commit

Permalink
Cleanup and include old mev geth prs (ethereum#45)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
5 people authored and avalonche committed Mar 9, 2023
1 parent 4e90ca8 commit 0457382
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 366 deletions.
5 changes: 3 additions & 2 deletions core/txpool/txpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ func (pool *TxPool) loop() {
defer report.Stop()
defer evict.Stop()
defer journal.Stop()
defer privateTx.Stop()

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

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

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

pool.mevBundles = bundles
return ret, nil
return ret
}

// AddMevBundles adds a mev bundles to the pool
Expand Down
23 changes: 0 additions & 23 deletions infra/Dockerfile.node

This file was deleted.

23 changes: 0 additions & 23 deletions infra/Dockerfile.updater

This file was deleted.

99 changes: 0 additions & 99 deletions infra/start-mev-geth-node.sh

This file was deleted.

183 changes: 0 additions & 183 deletions infra/start-mev-geth-updater.sh

This file was deleted.

Loading

0 comments on commit 0457382

Please sign in to comment.