Clean up

Author: meyer9

runner/network/mempool/fake_mempool.go

@@ -25,7 +25,6 @@ type FakeMempool interface {
 // StaticWorkloadMempool is a fake mempool that simulates a workload of transactions with no gas
 // or dependency tracking.
 type StaticWorkloadMempool struct {
-	chainID *big.Int
 	// needs to be thread safe to share between workers (could be converted to channel)
 	lock sync.Mutex
 	log  log.Logger
@@ -38,15 +37,14 @@ type StaticWorkloadMempool struct {
 	// sequencer txs included in payload attributes
 	currentBlockSequencerTxs [][]byte
 
-	chainId *big.Int
+	chainID *big.Int
 }
 
 func NewStaticWorkloadMempool(log log.Logger, chainID *big.Int) *StaticWorkloadMempool {
 	return &StaticWorkloadMempool{
-		chainID:      chainID,
 		log:          log,
 		addressNonce: make(map[common.Address]uint64),
-		chainId:      chainId,
+		chainID:      chainID,
 	}
 }
 

runner/payload/simulator/cmd/main.go

@@ -20,16 +20,6 @@ var flags = []cli.Flag{
 		Usage:    "RPC URL of the chain to fetch payloads from",
 		Required: true,
 	},
-	&cli.StringFlag{
-		Name:     "block-range",
-		Usage:    "Block range to fetch payloads from",
-		Required: false,
-	},
-	&cli.StringFlag{
-		Name:  "output",
-		Usage: "Path to the output JSON file",
-		Value: "stats.json",
-	},
 	&cli.IntFlag{
 		Name:  "sample-size",
 		Usage: "Number of payloads to sample",
@@ -60,8 +50,6 @@ func main() {
 		rpcURL := c.String("rpc-url")
 		chainID := c.String("chain-id")
 		genesisFilePath := c.String("genesis")
-		// blockRange := c.String("block-range")
-		// output := c.String("output")
 		sampleSize := c.Int("sample-size")
 
 		var genesis *core.Genesis

runner/payload/simulator/cmd/stats.go

@@ -349,6 +349,7 @@ func executeBlock(log log.Logger, client *ethclient.Client, parent *types.Block,
 	oracleKv := newPreimageOracle(db, codes, nodes)
 	oracleDb := NewOracleBackedDB(db, oracleKv, eth.ChainIDFromBig(genesis.Config.ChainID))
 
+	// copied from geth:
 	statedb, err := state.New(parent.Root(), state.NewDatabase(triedb.NewDatabase(rawdb.NewDatabase(oracleDb), nil), nil))
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to init state db around block %s (state %s): %w", parent.Hash().Hex(), parent.Root().Hex(), err)
@@ -373,12 +374,7 @@ func executeBlock(log log.Logger, client *ethclient.Client, parent *types.Block,
 		root := crypto.Keccak256Hash([]byte("fake-beacon-block-root"), header.Number.Bytes())
 		header.ParentBeaconRoot = &root
 
-		// Copied from op-program/client/l2/engineapi/block_processor.go
-		// TODO(client-pod#826)
-		// Unfortunately this is not part of any Geth environment setup,
-		// we just have to apply it, like how the Geth block-builder worker does.
 		context := core.NewEVMBlockContext(header, chainCtx, nil, genesis.Config, statedb)
-		// NOTE: Unlikely to be needed for the beacon block root, but we setup any precompile overrides anyways for forwards-compatibility
 		var precompileOverrides vm.PrecompileOverrides
 
 		vmenv := vm.NewEVM(context, statedb, genesis.Config, vm.Config{PrecompileOverrides: precompileOverrides, Tracer: blockTracer.Tracer()})