revert flags

cmd/geth/config.go

@@ -177,11 +177,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		cfg.Eth.OverrideVerkle = &v
 	}
-	// CHANGE(limechain): tx lists configuration options
-	if ctx.IsSet(utils.MaxProposedTxListsPerEpochFlag.Name) {
-		v := ctx.Uint64(utils.MaxProposedTxListsPerEpochFlag.Name)
-		cfg.Eth.MaxProposedTxListsPerEpoch = v
-	}
 
 	backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 

cmd/geth/main.go

@@ -148,8 +148,6 @@ var (
 		configFileFlag,
 		utils.LogDebugFlag,
 		utils.LogBacktraceAtFlag,
-		// CHANGE(limechain): tx lists configuration flags
-		utils.MaxProposedTxListsPerEpochFlag,
 	}, utils.NetworkFlags, utils.DatabaseFlags)
 
 	rpcFlags = []cli.Flag{

cmd/utils/flags.go

@@ -281,24 +281,6 @@ var (
 		Value:    ethconfig.Defaults.TransactionHistory,
 		Category: flags.StateCategory,
 	}
-	// CHANGE(limechain):
-	// Transaction list settings
-	// TxPoolLocals = &cli.StringSliceFlag{
-	// 	Name:     "txPool.locals",
-	// 	Usage:    "Comma separated accounts to treat as locals (priority inclusion)",
-	// 	Category: flags.TxListsCategory,
-	// }
-	// TxPoolLocalsOnly = &cli.BoolFlag{
-	// 	Name:     "txPool.localsOnly",
-	// 	Usage:    "If set to true, proposer will only propose transactions of local accounts",
-	// 	Value:    false,
-	// 	Category: flags.TxListsCategory,
-	// }
-	MaxProposedTxListsPerEpochFlag = &cli.Uint64Flag{
-		Name:     "preconf.maxtxlists",
-		Usage:    "Maximum number of transaction lists which will be proposed inside one proposing epoch",
-		Category: flags.TxListsCategory,
-	}
 	// Transaction pool settings
 	TxPoolLocalsFlag = &cli.StringFlag{
 		Name:     "txpool.locals",

core/rawdb/tx_list_config.go

@@ -16,10 +16,12 @@ var (
 )
 
 type TxListConfig struct {
-	Beneficiary       common.Address // L1 proposer address
-	BaseFee           *big.Int       // base fee calculated in the protocol contract
-	BlockMaxGasLimit  uint64         // hard-coded in the protocol contract config
-	MaxBytesPerTxList uint64
+	Beneficiary          common.Address // L1 proposer address
+	BaseFee              *big.Int       // base fee calculated in the protocol contract
+	BlockMaxGasLimit     uint64         // hard-coded in the protocol contract config
+	MaxBytesPerTxList    uint64
+	MaxTransactionsLists uint64
+	Locals               []string // TODO(limechain): []common.Address
 }
 
 func ReadTxListConfig(db ethdb.Database) *TxListConfig {

eth/backend.go

@@ -249,8 +249,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		return nil, err
 	}
 
-	// CHANGE(limechain): tx lists configuration options
-	eth.miner = miner.New(eth, &config.Miner, eth.blockchain.Config(), eth.EventMux(), eth.engine, eth.isLocalBlock, config.MaxProposedTxListsPerEpoch)
+	eth.miner = miner.New(eth, &config.Miner, eth.blockchain.Config(), eth.EventMux(), eth.engine, eth.isLocalBlock)
 	eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))
 
 	eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), stack.Config().AllowUnprotectedTxs, eth, nil}

eth/ethconfig/config.go

@@ -160,9 +160,6 @@ type Config struct {
 
 	// OverrideVerkle (TODO: remove after the fork)
 	OverrideVerkle *uint64 `toml:",omitempty"`
-
-	// CHANGE(limechain): tx lists configuration options
-	MaxProposedTxListsPerEpoch uint64 `toml:",omitempty"`
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain config.

eth/taiko_api_backend.go

@@ -84,6 +84,8 @@ func (a *TaikoAuthAPIBackend) UpdateConfigAndSlots(
 	blockMaxGasLimit uint64,
 	maxBytesPerTxList uint64,
 	beneficiary common.Address,
+	locals []string,
+	maxTransactionsLists uint64,
 ) error {
 	offset := currentSlot % 32
 	firstEpochSlot := currentSlot - offset
@@ -92,10 +94,12 @@ func (a *TaikoAuthAPIBackend) UpdateConfigAndSlots(
 	db := a.eth.ChainDb()
 
 	rawdb.WriteTxListConfig(db, &rawdb.TxListConfig{
-		Beneficiary:       beneficiary,
-		BaseFee:           baseFee,
-		BlockMaxGasLimit:  blockMaxGasLimit,
-		MaxBytesPerTxList: maxBytesPerTxList,
+		Beneficiary:          beneficiary,
+		BaseFee:              baseFee,
+		BlockMaxGasLimit:     blockMaxGasLimit,
+		MaxBytesPerTxList:    maxBytesPerTxList,
+		Locals:               locals,
+		MaxTransactionsLists: maxTransactionsLists,
 	})
 
 	rawdb.WriteCurrentL1Slot(db, currentSlot)

internal/flags/categories.go

@@ -37,8 +37,6 @@ const (
 	MiscCategory       = "MISC"
 	TestingCategory    = "TESTING"
 	DeprecatedCategory = "ALIASED (deprecated)"
-	// CHANGE(limechain):
-	TxListsCategory = "TRANSACTION LISTS"
 )
 
 func init() {

miner/miner.go

@@ -81,16 +81,15 @@ type Miner struct {
 	wg sync.WaitGroup
 }
 
-// CHANGE(limechain): tx lists configuration options
-func New(eth Backend, config *Config, chainConfig *params.ChainConfig, mux *event.TypeMux, engine consensus.Engine, isLocalBlock func(header *types.Header) bool, maxTransactionLists uint64) *Miner {
+func New(eth Backend, config *Config, chainConfig *params.ChainConfig, mux *event.TypeMux, engine consensus.Engine, isLocalBlock func(header *types.Header) bool) *Miner {
 	miner := &Miner{
 		mux:     mux,
 		eth:     eth,
 		engine:  engine,
 		exitCh:  make(chan struct{}),
 		startCh: make(chan struct{}),
 		stopCh:  make(chan struct{}),
-		worker:  newWorker(config, chainConfig, engine, eth, mux, isLocalBlock, true, maxTransactionLists),
+		worker:  newWorker(config, chainConfig, engine, eth, mux, isLocalBlock, true),
 	}
 	miner.wg.Add(1)
 	go miner.update()

miner/miner_test.go

@@ -324,7 +324,7 @@ func createMiner(t *testing.T) (*Miner, *event.TypeMux, func(skipMiner bool)) {
 	// Create event Mux
 	mux := new(event.TypeMux)
 	// Create Miner
-	miner := New(backend, &config, chainConfig, mux, engine, nil, 1)
+	miner := New(backend, &config, chainConfig, mux, engine, nil)
 	cleanup := func(skipMiner bool) {
 		bc.Stop()
 		engine.Close()

miner/worker.go

@@ -375,7 +375,7 @@ func (w *worker) ResetTxPoolSnapshot() {
 	log.Warn("Tx pool snapshot has been reset")
 }
 
-func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus.Engine, eth Backend, mux *event.TypeMux, isLocalBlock func(header *types.Header) bool, init bool, maxTransactionLists uint64) *worker {
+func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus.Engine, eth Backend, mux *event.TypeMux, isLocalBlock func(header *types.Header) bool, init bool) *worker {
 	worker := &worker{
 		config:             config,
 		chainConfig:        chainConfig,
@@ -428,7 +428,7 @@ func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus
 	go worker.newWorkLoop(recommit)
 	go worker.resultLoop()
 	go worker.taskLoop()
-	go worker.txListLoop(maxTransactionLists)
+	go worker.txListLoop()
 
 	// Submit first work to initialize pending state.
 	if init {
@@ -850,12 +850,9 @@ func (w *worker) resultLoop() {
 }
 
 // txListLoop polls new txs from the pool and updates the tx lists.
-func (w *worker) txListLoop(maxTransactionLists uint64) {
+func (w *worker) txListLoop() {
 	defer w.wg.Done()
 
-	// TODO(limechain):
-	localAddresses := []string{}
-
 	for {
 		select {
 		case <-w.exitCh:
@@ -880,8 +877,8 @@ func (w *worker) txListLoop(maxTransactionLists uint64) {
 				txListConfig.BaseFee,
 				txListConfig.BlockMaxGasLimit,
 				txListConfig.MaxBytesPerTxList,
-				localAddresses,
-				maxTransactionLists,
+				txListConfig.Locals,
+				txListConfig.MaxTransactionsLists,
 			)
 			if err != nil {
 				log.Error("Building tx list", "error", err)

miner/worker_test.go

@@ -162,7 +162,7 @@ func (b *testWorkerBackend) newRandomTx(creation bool) *types.Transaction {
 func newTestWorker(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database, blocks int) (*worker, *testWorkerBackend) {
 	backend := newTestWorkerBackend(t, chainConfig, engine, db, blocks)
 	backend.txPool.Add(pendingTxs, true, false)
-	w := newWorker(testConfig, chainConfig, engine, backend, new(event.TypeMux), nil, false, 1)
+	w := newWorker(testConfig, chainConfig, engine, backend, new(event.TypeMux), nil, false)
 	w.setEtherbase(testBankAddress)
 	return w, backend
 }