Flashbots change up to v0.3

.github/workflows/go.yml

@@ -0,0 +1,64 @@
+name: Go
+
+on:
+ push:
+ pull_request:
+ branches: [ master ]
+
+jobs:
+
+ build:
+ name: Build
+ runs-on: ubuntu-latest
+ steps:
+
+ - name: Set up Go 1.x
+ uses: actions/setup-go@v2
+ with:
+ go-version: ^1.13
+ id: go
+
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v2
+
+ - name: Test
+ run: go test ./core ./miner/... ./internal/ethapi/... ./les/...
+
+ - name: Build
+ run: make geth
+
+ e2e:
+ name: End to End
+ runs-on: ubuntu-latest
+ steps:
+
+ - name: Set up Go 1.x
+ uses: actions/setup-go@v2
+ with:
+ go-version: ^1.13
+ id: go
+
+ - name: Use Node.js 12.x
+ uses: actions/setup-node@v1
+ with:
+ node-version: 12.x
+
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v2
+
+ - name: Build
+ run: make geth
+
+ - name: Check out the e2e code repo
+ uses: actions/checkout@v2
+ with:
+ repository: flashbots/mev-geth-demo
+ path: e2e
+
+ - run: cd e2e && yarn install
+ - run: |
+ cd e2e
+ GETH=`pwd`/../build/bin/geth ./run.sh &
+ sleep 15
+ yarn run demo-simple
+ yarn run demo-contract

cmd/geth/main.go

@@ -131,6 +131,7 @@ var (
  utils.MinerExtraDataFlag,
  utils.MinerRecommitIntervalFlag,
  utils.MinerNoVerifyFlag,
+ utils.MinerMaxMergedBundles,
  utils.NATFlag,
  utils.NoDiscoverFlag,
  utils.DiscoveryV5Flag,

cmd/geth/usage.go

@@ -189,6 +189,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
  utils.MinerExtraDataFlag,
  utils.MinerRecommitIntervalFlag,
  utils.MinerNoVerifyFlag,
+ utils.MinerMaxMergedBundles,
  },
  },
  {

cmd/utils/flags.go

@@ -474,6 +474,11 @@ var (
  Usage: "Time interval to recreate the block being mined",
  Value: ethconfig.Defaults.Miner.Recommit,
  }
+ MinerMaxMergedBundles = cli.IntFlag{
+ Name: "miner.maxmergedbundles",
+ Usage: "flashbots - The maximum amount of bundles to merge. The miner will run this many workers in parallel to calculate if the full block is more profitable with these additional bundles.",
+ Value: 3,
+ }
  MinerNoVerifyFlag = cli.BoolFlag{
  Name: "miner.noverify",
  Usage: "Disable remote sealing verification",
@@ -1406,6 +1411,8 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) {
  if ctx.GlobalIsSet(LegacyMinerGasTargetFlag.Name) {
  log.Warn("The generic --miner.gastarget flag is deprecated and will be removed in the future!")
  }
+
+ cfg.MaxMergedBundles = ctx.GlobalInt(MinerMaxMergedBundles.Name)
 }
 
 func setWhitelist(ctx *cli.Context, cfg *ethconfig.Config) {

core/tx_pool.go

@@ -251,11 +251,12 @@ type TxPool struct {
  locals *accountSet // Set of local transaction to exempt from eviction rules
  journal *txJournal // Journal of local transaction to back up to disk
 
- pending map[common.Address]*txList // All currently processable transactions
- queue map[common.Address]*txList // Queued but non-processable transactions
- beats map[common.Address]time.Time // Last heartbeat from each known account
- all *txLookup // All transactions to allow lookups
- priced *txPricedList // All transactions sorted by price
+ pending map[common.Address]*txList // All currently processable transactions
+ queue map[common.Address]*txList // Queued but non-processable transactions
+ beats map[common.Address]time.Time // Last heartbeat from each known account
+ mevBundles []types.MevBundle
+ all *txLookup // All transactions to allow lookups
+ priced *txPricedList // All transactions sorted by price
 
  chainHeadCh chan ChainHeadEvent
  chainHeadSub event.Subscription
@@ -557,6 +558,59 @@ func (pool *TxPool) Pending(enforceTips bool) map[common.Address]types.Transacti
  return pending
 }
 
+/// AllMevBundles returns all the MEV Bundles currently in the pool
+func (pool *TxPool) AllMevBundles() []types.MevBundle {
+ return pool.mevBundles
+}
+
+// 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) {
+ pool.mu.Lock()
+ defer pool.mu.Unlock()
+
+ // returned values
+ var ret []types.MevBundle
+ // rolled over values
+ var bundles []types.MevBundle
+
+ for _, bundle := range pool.mevBundles {
+ // Prune outdated bundles
+ if (bundle.MaxTimestamp != 0 && blockTimestamp > bundle.MaxTimestamp) || blockNumber.Cmp(bundle.BlockNumber) > 0 {
+ continue
+ }
+
+ // Roll over future bundles
+ if (bundle.MinTimestamp != 0 && blockTimestamp < bundle.MinTimestamp) || blockNumber.Cmp(bundle.BlockNumber) < 0 {
+ bundles = append(bundles, bundle)
+ continue
+ }
+
+ // return the ones which are in time
+ ret = append(ret, bundle)
+ // keep the bundles around internally until they need to be pruned
+ bundles = append(bundles, bundle)
+ }
+
+ pool.mevBundles = bundles
+ return ret, nil
+}
+
+// AddMevBundle adds a mev bundle to the pool
+func (pool *TxPool) AddMevBundle(txs types.Transactions, blockNumber *big.Int, minTimestamp, maxTimestamp uint64, revertingTxHashes []common.Hash) error {
+ pool.mu.Lock()
+ defer pool.mu.Unlock()
+
+ pool.mevBundles = append(pool.mevBundles, types.MevBundle{
+ Txs: txs,
+ BlockNumber: blockNumber,
+ MinTimestamp: minTimestamp,
+ MaxTimestamp: maxTimestamp,
+ RevertingTxHashes: revertingTxHashes,
+ })
+ return nil
+}
+
 // Locals retrieves the accounts currently considered local by the pool.
 func (pool *TxPool) Locals() []common.Address {
  pool.mu.Lock()

core/tx_pool_test.go

@@ -2561,3 +2561,13 @@ func BenchmarkPoolMultiAccountBatchInsert(b *testing.B) {
  pool.AddRemotesSync([]*types.Transaction{tx})
  }
 }
+
+func checkBundles(t *testing.T, pool *TxPool, block int64, timestamp uint64, expectedRes int, expectedRemaining int) {
+ res, _ := pool.MevBundles(big.NewInt(block), timestamp)
+ if len(res) != expectedRes {
+ t.Fatalf("expected returned bundles did not match got %d, expected %d", len(res), expectedRes)
+ }
+ if len(pool.mevBundles) != expectedRemaining {
+ t.Fatalf("expected remaining bundles did not match got %d, expected %d", len(pool.mevBundles), expectedRemaining)
+ }
+}

core/types/transaction.go

@@ -635,3 +635,11 @@ func copyAddressPtr(a *common.Address) *common.Address {
  cpy := *a
  return &cpy
 }
+
+type MevBundle struct {
+ Txs Transactions
+ BlockNumber *big.Int
+ MinTimestamp uint64
+ MaxTimestamp uint64
+ RevertingTxHashes []common.Hash
+}

eth/api_backend.go

@@ -239,6 +239,10 @@ func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction)
  return b.eth.txPool.AddLocal(signedTx)
 }
 
+func (b *EthAPIBackend) SendBundle(ctx context.Context, txs types.Transactions, blockNumber rpc.BlockNumber, minTimestamp uint64, maxTimestamp uint64, revertingTxHashes []common.Hash) error {
+ return b.eth.txPool.AddMevBundle(txs, big.NewInt(blockNumber.Int64()), minTimestamp, maxTimestamp, revertingTxHashes)
+}
+
 func (b *EthAPIBackend) GetPoolTransactions() (types.Transactions, error) {
  pending := b.eth.txPool.Pending(false)
  var txs types.Transactions

infra/Dockerfile.node

@@ -0,0 +1,23 @@
+# Build Geth in a stock Go builder container
+FROM golang:1.15-alpine as builder
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git
+
+ADD . /go-ethereum
+RUN cd /go-ethereum && make geth
+
+# Pull Geth into a second stage deploy alpine container
+FROM alpine:latest
+
+ENV PYTHONUNBUFFERED=1
+RUN apk add --update --no-cache groff less python3 curl jq ca-certificates && ln -sf python3 /usr/bin/python
+RUN python3 -m ensurepip
+RUN pip3 install --no-cache --upgrade pip setuptools awscli
+
+COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
+
+COPY ./infra/start-mev-geth-node.sh /root/start-mev-geth-node.sh
+RUN chmod 755 /root/start-mev-geth-node.sh
+
+EXPOSE 8545 8546 30303 30303/udp
+ENTRYPOINT ["/root/start-mev-geth-node.sh"]

infra/Dockerfile.updater

@@ -0,0 +1,23 @@
+# Build Geth in a stock Go builder container
+FROM golang:1.15-alpine as builder
+
+RUN apk add --no-cache make gcc musl-dev linux-headers git
+
+ADD . /go-ethereum
+RUN cd /go-ethereum && make geth
+
+# Pull Geth into a second stage deploy alpine container
+FROM alpine:latest
+
+ENV PYTHONUNBUFFERED=1
+RUN apk add --update --no-cache groff less python3 curl jq ca-certificates && ln -sf python3 /usr/bin/python
+RUN python3 -m ensurepip
+RUN pip3 install --no-cache --upgrade pip setuptools awscli
+
+COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
+
+COPY ./infra/start-mev-geth-updater.sh /root/start-mev-geth-updater.sh
+RUN chmod 755 /root/start-mev-geth-updater.sh
+
+EXPOSE 8545 8546 30303 30303/udp
+ENTRYPOINT ["/root/start-mev-geth-updater.sh"]