feat(taiko-client): remove an unused flag for proposer (#18709)

taikoxyz · Jan 6, 2025 · 6fb1fd2 · 6fb1fd2
1 parent 6c0ef37
commit 6fb1fd2
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 31 deletions.
diff --git a/packages/taiko-client/cmd/flags/proposer.go b/packages/taiko-client/cmd/flags/proposer.go
@@ -2,8 +2,6 @@ package flags
 
 import (
 	"github.com/urfave/cli/v2"
-
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/version"
 )
 
 // Required flags used by proposer.
@@ -69,14 +67,6 @@ var (
 		Value:    0,
 		EnvVars:  []string{"EPOCH_ALLOW_ZERO_INTERVAL"},
 	}
-	// Proposing metadata related.
-	ExtraData = &cli.StringFlag{
-		Name:     "extraData",
-		Usage:    "Block extra data set by the proposer (default = client version)",
-		Value:    version.CommitVersion(),
-		Category: proposerCategory,
-		EnvVars:  []string{"EXTRA_DATA"},
-	}
 	// Transactions pool related.
 	TxPoolLocals = &cli.StringSliceFlag{
 		Name:     "txPool.locals",
@@ -113,11 +103,12 @@ var (
 		EnvVars:  []string{"L1_FALLBACK_TO_CALLDATA"},
 	}
 	RevertProtectionEnabled = &cli.BoolFlag{
-		Name:     "revertProtection",
-		Usage:    "Enable revert protection with the support of endpoint and contract",
+		Name: "l1.revertProtection",
+		Usage: "Enable revert protection within your ProverSet contract, " +
+			"this is effective only if your PBS service supports revert protection",
 		Value:    false,
 		Category: proposerCategory,
-		EnvVars:  []string{"REVERT_PROTECTION"},
+		EnvVars:  []string{"L1_REVERT_PROTECTION"},
 	}
 )
 
@@ -132,7 +123,6 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	ProposeInterval,
 	TxPoolLocals,
 	TxPoolLocalsOnly,
-	ExtraData,
 	MinGasUsed,
 	MinTxListBytes,
 	MinTip,

diff --git a/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go b/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
@@ -68,7 +68,6 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
 		ProposeInterval:            1024 * time.Hour,
 		MaxProposedTxListsPerEpoch: 1,
-		ExtraData:                  "test",
 		TxmgrConfigs: &txmgr.CLIConfig{
 			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,

diff --git a/packages/taiko-client/proposer/config.go b/packages/taiko-client/proposer/config.go
@@ -23,7 +23,6 @@ type Config struct {
 	*rpc.ClientConfig
 	L1ProposerPrivKey          *ecdsa.PrivateKey
 	L2SuggestedFeeRecipient    common.Address
-	ExtraData                  string
 	ProposeInterval            time.Duration
 	LocalAddresses             []common.Address
 	LocalAddressesOnly         bool
@@ -93,7 +92,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(l2SuggestedFeeRecipient),
-		ExtraData:                  c.String(flags.ExtraData.Name),
 		ProposeInterval:            c.Duration(flags.ProposeInterval.Name),
 		LocalAddresses:             localAddresses,
 		LocalAddressesOnly:         c.Bool(flags.TxPoolLocalsOnly.Name),

diff --git a/packages/taiko-client/proposer/proposer.go b/packages/taiko-client/proposer/proposer.go
@@ -122,7 +122,6 @@ func (p *Proposer) InitFromConfig(
 		cfg.TaikoL1Address,
 		cfg.ProverSetAddress,
 		cfg.ProposeBlockTxGasLimit,
-		cfg.ExtraData,
 		p.chainConfig,
 		p.txmgrSelector,
 		cfg.RevertProtectionEnabled,

diff --git a/packages/taiko-client/proposer/proposer_test.go b/packages/taiko-client/proposer/proposer_test.go
@@ -79,7 +79,6 @@ func (s *ProposerTestSuite) SetupTest() {
 		MinProposingInternal:       0,
 		ProposeInterval:            1024 * time.Hour,
 		MaxProposedTxListsPerEpoch: 1,
-		ExtraData:                  "test",
 		ProposeBlockTxGasLimit:     10_000_000,
 		FallbackToCalldata:         true,
 		TxmgrConfigs: &txmgr.CLIConfig{

diff --git a/packages/taiko-client/proposer/transaction_builder/blob.go b/packages/taiko-client/proposer/transaction_builder/blob.go
@@ -25,7 +25,6 @@ type BlobTransactionBuilder struct {
 	proverSetAddress        common.Address
 	l2SuggestedFeeRecipient common.Address
 	gasLimit                uint64
-	extraData               string
 	chainConfig             *config.ChainConfig
 	revertProtectionEnabled bool
 }
@@ -38,7 +37,6 @@ func NewBlobTransactionBuilder(
 	proverSetAddress common.Address,
 	l2SuggestedFeeRecipient common.Address,
 	gasLimit uint64,
-	extraData string,
 	chainConfig *config.ChainConfig,
 	revertProtectionEnabled bool,
 ) *BlobTransactionBuilder {
@@ -49,7 +47,6 @@ func NewBlobTransactionBuilder(
 		proverSetAddress,
 		l2SuggestedFeeRecipient,
 		gasLimit,
-		extraData,
 		chainConfig,
 		revertProtectionEnabled,
 	}

diff --git a/packages/taiko-client/proposer/transaction_builder/calldata.go b/packages/taiko-client/proposer/transaction_builder/calldata.go
@@ -24,7 +24,6 @@ type CalldataTransactionBuilder struct {
 	taikoL1Address          common.Address
 	proverSetAddress        common.Address
 	gasLimit                uint64
-	extraData               string
 	chainConfig             *config.ChainConfig
 	revertProtectionEnabled bool
 }
@@ -37,7 +36,6 @@ func NewCalldataTransactionBuilder(
 	taikoL1Address common.Address,
 	proverSetAddress common.Address,
 	gasLimit uint64,
-	extraData string,
 	chainConfig *config.ChainConfig,
 	revertProtectionEnabled bool,
 ) *CalldataTransactionBuilder {
@@ -48,7 +46,6 @@ func NewCalldataTransactionBuilder(
 		taikoL1Address,
 		proverSetAddress,
 		gasLimit,
-		extraData,
 		chainConfig,
 		revertProtectionEnabled,
 	}

diff --git a/packages/taiko-client/proposer/transaction_builder/calldata_test.go b/packages/taiko-client/proposer/transaction_builder/calldata_test.go
@@ -38,7 +38,6 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		common.Address{},
 		0,
-		"test",
 		chainConfig,
 		false,
 	)
@@ -49,7 +48,6 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 		common.Address{},
 		common.HexToAddress(os.Getenv("TAIKO_L2")),
 		10_000_000,
-		"test",
 		chainConfig,
 		false,
 	)

diff --git a/packages/taiko-client/proposer/transaction_builder/fallback.go b/packages/taiko-client/proposer/transaction_builder/fallback.go
@@ -37,7 +37,6 @@ func NewBuilderWithFallback(
 	taikoL1Address common.Address,
 	proverSetAddress common.Address,
 	gasLimit uint64,
-	extraData string,
 	chainConfig *config.ChainConfig,
 	txmgrSelector *utils.TxMgrSelector,
 	revertProtectionEnabled bool,
@@ -58,7 +57,6 @@ func NewBuilderWithFallback(
 			proverSetAddress,
 			l2SuggestedFeeRecipient,
 			gasLimit,
-			extraData,
 			chainConfig,
 			revertProtectionEnabled,
 		)
@@ -71,7 +69,6 @@ func NewBuilderWithFallback(
 		taikoL1Address,
 		proverSetAddress,
 		gasLimit,
-		extraData,
 		chainConfig,
 		revertProtectionEnabled,
 	)

diff --git a/packages/taiko-client/proposer/transaction_builder/fallback_test.go b/packages/taiko-client/proposer/transaction_builder/fallback_test.go
@@ -130,7 +130,6 @@ func (s *TransactionBuilderTestSuite) newTestBuilderWithFallback(
 		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		common.Address{},
 		10_000_000,
-		"test_fallback_builder",
 		chainConfig,
 		txmgrSelector,
 		true,