From b41437b47a8ad3bc68edbfb8d9aea6b2fbbe9b05 Mon Sep 17 00:00:00 2001 From: Gavin Yu Date: Fri, 5 Jul 2024 17:04:47 +0800 Subject: [PATCH] refactor(taiko-client): rm tier fee related flag (#17750) --- packages/taiko-client/cmd/flags/prover.go | 22 --------------------- packages/taiko-client/prover/config.go | 21 -------------------- packages/taiko-client/prover/config_test.go | 9 --------- packages/taiko-client/prover/prover_test.go | 2 -- 4 files changed, 54 deletions(-) diff --git a/packages/taiko-client/cmd/flags/prover.go b/packages/taiko-client/cmd/flags/prover.go index 0ed60c8f513..1ee84c5b675 100644 --- a/packages/taiko-client/cmd/flags/prover.go +++ b/packages/taiko-client/cmd/flags/prover.go @@ -82,25 +82,6 @@ var ( Value: 0, EnvVars: []string{"PROVER_MIN_TAIKO_TOKEN_BALANCE"}, } - // Tier fee related. - MinOptimisticTierFee = &cli.Uint64Flag{ - Name: "minTierFee.optimistic", - Usage: "Minimum accepted fee for generating an optimistic proof", - Category: proverCategory, - EnvVars: []string{"MIN_TIER_FEE_OPTIMISTIC"}, - } - MinSgxTierFee = &cli.Uint64Flag{ - Name: "minTierFee.sgx", - Usage: "Minimum accepted fee for generating a SGX proof", - Category: proverCategory, - EnvVars: []string{"MIN_TIER_FEE_SGX"}, - } - MinSgxAndZkVMTierFee = &cli.Uint64Flag{ - Name: "minTierFee.sgxAndZkvm", - Usage: "Minimum accepted fee for generating a SGX + zkVM proof", - Category: proverCategory, - EnvVars: []string{"MIN_TIER_FEE_SGX_AND_ZKVM"}, - } // Running mode ContesterMode = &cli.BoolFlag{ Name: "mode.contester", @@ -218,9 +199,6 @@ var ProverFlags = MergeFlags(CommonFlags, []cli.Flag{ RaikoHostEndpoint, RaikoJWTPath, L1ProverPrivKey, - MinOptimisticTierFee, - MinSgxTierFee, - MinSgxAndZkVMTierFee, MinEthBalance, MinTaikoTokenBalance, StartingBlockID, diff --git a/packages/taiko-client/prover/config.go b/packages/taiko-client/prover/config.go index 9f56594fbea..8d9f7ec6051 100644 --- a/packages/taiko-client/prover/config.go +++ b/packages/taiko-client/prover/config.go @@ -45,9 +45,6 @@ type Config struct { ProveBlockGasLimit uint64 HTTPServerPort uint64 Capacity uint64 - MinOptimisticTierFee *big.Int - MinSgxTierFee *big.Int - MinSgxAndZkVMTierFee *big.Int MinEthBalance *big.Int MinTaikoTokenBalance *big.Int MaxExpiry time.Duration @@ -116,21 +113,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { } } - minOptimisticTierFee, err := utils.GWeiToWei(c.Float64(flags.MinOptimisticTierFee.Name)) - if err != nil { - return nil, err - } - - minSgxTierFee, err := utils.GWeiToWei(c.Float64(flags.MinSgxTierFee.Name)) - if err != nil { - return nil, err - } - - minSgxAndZkVMTierFee, err := utils.GWeiToWei(c.Float64(flags.MinSgxAndZkVMTierFee.Name)) - if err != nil { - return nil, err - } - minEthBalance, err := utils.EtherToWei(c.Float64(flags.MinEthBalance.Name)) if err != nil { return nil, err @@ -181,9 +163,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { ProveBlockGasLimit: c.Uint64(flags.TxGasLimit.Name), Capacity: c.Uint64(flags.ProverCapacity.Name), HTTPServerPort: c.Uint64(flags.ProverHTTPServerPort.Name), - MinOptimisticTierFee: minOptimisticTierFee, - MinSgxTierFee: minSgxTierFee, - MinSgxAndZkVMTierFee: minSgxAndZkVMTierFee, MinEthBalance: minEthBalance, MinTaikoTokenBalance: minTaikoTokenBalance, MaxExpiry: c.Duration(flags.MaxExpiry.Name), diff --git a/packages/taiko-client/prover/config_test.go b/packages/taiko-client/prover/config_test.go index 5176d7e3bf7..ca48df691f1 100644 --- a/packages/taiko-client/prover/config_test.go +++ b/packages/taiko-client/prover/config_test.go @@ -24,7 +24,6 @@ var ( taikoL2 = os.Getenv("TAIKO_L2_ADDRESS") allowance = 10.0 rpcTimeout = 5 * time.Second - minTierFee = 1024.0 ) func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() { @@ -48,10 +47,6 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() { s.True(c.ContesterMode) s.Equal(rpcTimeout, c.RPCTimeout) s.Equal(uint64(8), c.Capacity) - tierFeeGWei, err := utils.GWeiToWei(minTierFee) - s.Nil(err) - s.Equal(tierFeeGWei.Uint64(), c.MinOptimisticTierFee.Uint64()) - s.Equal(tierFeeGWei.Uint64(), c.MinSgxTierFee.Uint64()) s.Equal(c.L1NodeVersion, l1NodeVersion) s.Equal(c.L2NodeVersion, l2NodeVersion) s.Nil(new(Prover).InitFromCli(context.Background(), ctx)) @@ -77,8 +72,6 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() { "--" + flags.RPCTimeout.Name, "5s", "--" + flags.TxGasLimit.Name, "100000", "--" + flags.Dummy.Name, - "--" + flags.MinOptimisticTierFee.Name, fmt.Sprint(minTierFee), - "--" + flags.MinSgxTierFee.Name, fmt.Sprint(minTierFee), "--" + flags.ProverCapacity.Name, "8", "--" + flags.GuardianProverMajority.Name, os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"), "--" + flags.GuardianProverMinority.Name, os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS"), @@ -119,8 +112,6 @@ func (s *ProverTestSuite) SetupApp() *cli.App { &cli.BoolFlag{Name: flags.ProveUnassignedBlocks.Name}, &cli.DurationFlag{Name: flags.RPCTimeout.Name}, &cli.Uint64Flag{Name: flags.ProverCapacity.Name}, - &cli.Uint64Flag{Name: flags.MinOptimisticTierFee.Name}, - &cli.Uint64Flag{Name: flags.MinSgxTierFee.Name}, &cli.Uint64Flag{Name: flags.MaxProposedIn.Name}, &cli.StringFlag{Name: flags.Allowance.Name}, &cli.StringFlag{Name: flags.ContesterMode.Name}, diff --git a/packages/taiko-client/prover/prover_test.go b/packages/taiko-client/prover/prover_test.go index 7528c57a5b4..5ab5c16af62 100644 --- a/packages/taiko-client/prover/prover_test.go +++ b/packages/taiko-client/prover/prover_test.go @@ -494,8 +494,6 @@ func (s *ProverTestSuite) initProver( Dummy: true, ProveUnassignedBlocks: true, Capacity: 1024, - MinOptimisticTierFee: common.Big1, - MinSgxTierFee: common.Big1, Allowance: new(big.Int).Exp(big.NewInt(1_000_000_100), new(big.Int).SetUint64(uint64(decimal)), nil), RPCTimeout: 3 * time.Second, BackOffRetryInterval: 3 * time.Second,