refactor(taiko-client): rm unused code and refactor (#17723)

Co-authored-by: maskpp <[email protected]>

packages/taiko-client/cmd/flags/proposer.go

@@ -146,13 +146,6 @@ var (
 		Value:   false,
 		EnvVars: []string{"L1_BLOB_ALLOWED"},
 	}
-	L1BlockBuilderTip = &cli.Uint64Flag{
-		Name:     "l1.blockBuilderTip",
-		Usage:    "Amount you wish to tip the L1 block builder",
-		Value:    0,
-		Category: proposerCategory,
-		EnvVars:  []string{"L1_BLOCK_BUILDER_TIP"},
-	}
 )
 
 // ProposerFlags All proposer flags.
@@ -180,5 +173,4 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	MaxTierFeePriceBumps,
 	ProposeBlockIncludeParentMetaHash,
 	BlobAllowed,
-	L1BlockBuilderTip,
 }, TxmgrFlags)

packages/taiko-client/driver/chain_syncer/blob/syncer_test.go

@@ -217,7 +217,6 @@ func (s *BlobSyncerTestSuite) initProposer() {
 		SgxTierFee:                 common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
-		L1BlockBuilderTip:          common.Big0,
 		TxmgrConfigs: &txmgr.CLIConfig{
 			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
 			NumConfirmations:          0,

packages/taiko-client/driver/chain_syncer/chain_syncer_test.go

@@ -69,7 +69,6 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
 		ExtraData:                  "test",
-		L1BlockBuilderTip:          common.Big0,
 		TxmgrConfigs: &txmgr.CLIConfig{
 			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
 			NumConfirmations:          0,

packages/taiko-client/driver/driver_test.go

@@ -313,7 +313,6 @@ func (s *DriverTestSuite) InitProposer() {
 		SgxTierFee:                 common.Big256,
 		MaxTierFeePriceBumps:       3,
 		TierFeePriceBump:           common.Big2,
-		L1BlockBuilderTip:          common.Big0,
 		TxmgrConfigs: &txmgr.CLIConfig{
 			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
 			NumConfirmations:          0,

packages/taiko-client/proposer/config.go

@@ -45,7 +45,6 @@ type Config struct {
 	IncludeParentMetaHash      bool
 	BlobAllowed                bool
 	TxmgrConfigs               *txmgr.CLIConfig
-	L1BlockBuilderTip          *big.Int
 }
 
 // NewConfigFromCliContext initializes a Config instance from
@@ -132,7 +131,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		MaxTierFeePriceBumps:       c.Uint64(flags.MaxTierFeePriceBumps.Name),
 		IncludeParentMetaHash:      c.Bool(flags.ProposeBlockIncludeParentMetaHash.Name),
 		BlobAllowed:                c.Bool(flags.BlobAllowed.Name),
-		L1BlockBuilderTip:          new(big.Int).SetUint64(c.Uint64(flags.L1BlockBuilderTip.Name)),
 		TxmgrConfigs: pkgFlags.InitTxmgrConfigsFromCli(
 			c.String(flags.L1WSEndpoint.Name),
 			l1ProposerPrivKey,

packages/taiko-client/proposer/proposer.go

@@ -3,6 +3,7 @@ package proposer
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"math/rand"
 	"sync"
@@ -23,7 +24,6 @@ import (
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/metrics"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/utils"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc"
-	selector "github.com/taikoxyz/taiko-mono/packages/taiko-client/proposer/prover_selector"
 	builder "github.com/taikoxyz/taiko-mono/packages/taiko-client/proposer/transaction_builder"
 )
 
@@ -43,9 +43,6 @@ type Proposer struct {
 	tiers    []*rpc.TierProviderTierWithID
 	tierFees []encoding.TierFee
 
-	// Prover selector
-	proverSelector selector.ProverSelector
-
 	// Transaction builder
 	txBuilder builder.ProposeBlockTransactionBuilder
 
@@ -112,26 +109,10 @@ func (p *Proposer) InitFromConfig(ctx context.Context, cfg *Config, txMgr *txmgr
 		}
 	}
 
-	if p.proverSelector, err = selector.NewETHFeeEOASelector(
-		&protocolConfigs,
-		p.rpc,
-		p.proposerAddress,
-		cfg.TaikoL1Address,
-		cfg.ProverSetAddress,
-		p.tierFees,
-		cfg.TierFeePriceBump,
-		cfg.ProverEndpoints,
-		cfg.MaxTierFeePriceBumps,
-	); err != nil {
-		return err
-	}
-
 	if cfg.BlobAllowed {
 		p.txBuilder = builder.NewBlobTransactionBuilder(
 			p.rpc,
 			p.L1ProposerPrivKey,
-			p.proverSelector,
-			p.Config.L1BlockBuilderTip,
 			cfg.TaikoL1Address,
 			cfg.ProverSetAddress,
 			cfg.L2SuggestedFeeRecipient,
@@ -142,8 +123,6 @@ func (p *Proposer) InitFromConfig(ctx context.Context, cfg *Config, txMgr *txmgr
 		p.txBuilder = builder.NewCalldataTransactionBuilder(
 			p.rpc,
 			p.L1ProposerPrivKey,
-			p.proverSelector,
-			p.Config.L1BlockBuilderTip,
 			cfg.L2SuggestedFeeRecipient,
 			cfg.TaikoL1Address,
 			cfg.ProverSetAddress,
@@ -349,9 +328,30 @@ func (p *Proposer) ProposeTxList(
 		return err
 	}
 
+	proverAddress := p.proposerAddress
+	if p.Config.ClientConfig.ProverSetAddress != rpc.ZeroAddress {
+		proverAddress = p.Config.ClientConfig.ProverSetAddress
+	}
+
+	ok, err := rpc.CheckProverBalance(
+		ctx,
+		p.rpc,
+		proverAddress,
+		p.TaikoL1Address,
+		p.protocolConfigs.LivenessBond,
+	)
+
+	if err != nil {
+		log.Warn("Failed to check prover balance", "error", err)
+		return err
+	}
+
+	if !ok {
+		return errors.New("insufficient prover balance")
+	}
+
 	txCandidate, err := p.txBuilder.Build(
 		ctx,
-		p.tierFees,
 		p.IncludeParentMetaHash,
 		compressedTxListBytes,
 	)

packages/taiko-client/proposer/proposer_test.go

@@ -84,7 +84,6 @@ func (s *ProposerTestSuite) SetupTest() {
 		TierFeePriceBump:           common.Big2,
 		MaxTierFeePriceBumps:       3,
 		ExtraData:                  "test",
-		L1BlockBuilderTip:          common.Big0,
 		ProposeBlockTxGasLimit:     10_000_000,
 		TxmgrConfigs: &txmgr.CLIConfig{
 			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
@@ -115,8 +114,6 @@ func (s *ProposerTestSuite) TestProposeTxLists() {
 	txBuilder := builder.NewBlobTransactionBuilder(
 		p.rpc,
 		p.L1ProposerPrivKey,
-		p.proverSelector,
-		p.Config.L1BlockBuilderTip,
 		cfg.TaikoL1Address,
 		cfg.ProverSetAddress,
 		cfg.L2SuggestedFeeRecipient,
@@ -137,7 +134,6 @@ func (s *ProposerTestSuite) TestProposeTxLists() {
 
 		candidate, err := txBuilder.Build(
 			p.ctx,
-			p.tierFees,
 			p.IncludeParentMetaHash,
 			compressedTxListBytes,
 		)
@@ -255,16 +251,6 @@ func (s *ProposerTestSuite) TestProposeEmptyBlockOp() {
 	s.Nil(s.p.ProposeOp(context.Background()))
 }
 
-func (s *ProposerTestSuite) TestAssignProverSuccessFirstRound() {
-	s.SetL1Automine(false)
-	defer s.SetL1Automine(true)
-
-	fee, err := s.p.proverSelector.AssignProver(context.Background(), s.p.tierFees)
-
-	s.Nil(err)
-	s.Equal(fee.Uint64(), s.p.OptimisticTierFee.Uint64())
-}
-
 func (s *ProposerTestSuite) TestUpdateProposingTicker() {
 	s.p.ProposeInterval = 1 * time.Hour
 	s.NotPanics(s.p.updateProposingTicker)