feat: add delay of commission rate change

kroma-chain-ops/genesis/config.go

@@ -283,9 +283,8 @@ type DeployConfig struct {
  ValidatorManagerMinRegisterAmount *hexutil.Big `json:"validatorManagerMinRegisterAmount"`
  // ValidatorManagerMinActivateAmount is the amount of the minimum activation amount.
  ValidatorManagerMinActivateAmount *hexutil.Big `json:"validatorManagerMinActivateAmount"`
- // ValidatorManagerCommissionMinChangeSeconds is the minimum duration of commission change in
- // seconds.
- ValidatorManagerCommissionMinChangeSeconds uint64 `json:"validatorManagerCommissionMinChangeSeconds"`
+ // ValidatorManagerCommissionChangeDelaySeconds is the delay to finalize the commission rate change in seconds.
+ ValidatorManagerCommissionChangeDelaySeconds uint64 `json:"validatorManagerCommissionChangeDelaySeconds"`
  // ValidatorManagerRoundDurationSeconds is the duration of one submission round in seconds.
  ValidatorManagerRoundDurationSeconds uint64 `json:"validatorManagerRoundDurationSeconds"`
  // ValidatorManagerJailPeriodSeconds is the duration of jail period in seconds.
@@ -550,8 +549,8 @@ func (d *DeployConfig) Check() error {
  if d.ValidatorManagerMinActivateAmount.ToInt().Cmp(d.ValidatorManagerMinRegisterAmount.ToInt()) < 0 {
  return fmt.Errorf("%w: ValidatorManagerMinActivateAmount must equal or more than ValidatorManagerMinRegisterAmount", ErrInvalidDeployConfig)
  }
- if d.ValidatorManagerCommissionMinChangeSeconds == 0 {
- return fmt.Errorf("%w: ValidatorManagerCommissionMinChangeSeconds cannot be 0", ErrInvalidDeployConfig)
+ if d.ValidatorManagerCommissionChangeDelaySeconds == 0 {
+ return fmt.Errorf("%w: ValidatorManagerCommissionChangeDelaySeconds cannot be 0", ErrInvalidDeployConfig)
  }
  if d.ValidatorManagerRoundDurationSeconds == 0 {
  return fmt.Errorf("%w: ValidatorManagerRoundDurationSeconds cannot be 0", ErrInvalidDeployConfig)

kroma-chain-ops/genesis/testdata/test-deploy-config-full.json

@@ -63,7 +63,7 @@
  "validatorManagerTrustedValidator": "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
  "validatorManagerMinRegisterAmount": "0x1",
  "validatorManagerMinActivateAmount": "0x2",
- "validatorManagerCommissionMinChangeSeconds": 2,
+ "validatorManagerCommissionChangeDelaySeconds": 2,
  "validatorManagerRoundDurationSeconds": 4,
  "validatorManagerJailPeriodSeconds": 2,
  "validatorManagerJailThreshold": 2,

kroma-devnet/devnet/__init__.py

@@ -294,8 +294,23 @@ def devnet_deploy(paths):
 
  # TODO(seolaoh): set termination index of ValidatorPool to a smaller value when V2 goes live
  log.info("Register to ValidatorManager contract to be a validator...")
- run_command(['docker', 'compose', 'exec', 'kroma-validator', 'kroma-validator', 'register',
- '--amount', '100', '--commission-rate', '5', '--commission-max-change-rate', '5'], cwd=paths.ops_bedrock_dir)
+ run_command(
+ [
+ 'docker',
+ 'compose',
+ 'exec',
+ 'kroma-validator',
+ 'kroma-validator',
+ 'register',
+ '--amount',
+ '100',
+ '--commission-rate',
+ '5',
+ '--withdraw-account',
+ '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+ ],
+ cwd=paths.ops_bedrock_dir,
+ )
  # [Kroma: END]
 
  log.info('Bringing up `artifact-server`')

kroma-validator/cmd/README.md

@@ -62,10 +62,10 @@ The following commands are available in Validator System V2:
 - `register` - Register as new validator to `ValidatorManager`.
  - `--amount [value]` - _(Required)_ The amount of tokens to delegate initially (in Wei).
  - `--commission-rate [value]` - _(Required)_ The initial commission rate of the validator (in %).
- - `--commission-max-change-rate [value]` - _(Required)_ The max change rate of the commission of the validator (in %).
+ - `--withdraw-account [value]` - _(Required)_ The address to withdraw deposited asset token.
 
  ```bash
- kroma-validator register --amount 100000000 --commission-rate 5 --commission-max-change-rate 5
+ kroma-validator register --amount 100000000 --commission-rate 5 --withdraw-account 0x0000000000000000000000000000000000000001
  ```
 
 - `activate` - Activate the validator in `ValidatorManager` to be eligible to submit output roots and create challenges.
@@ -80,11 +80,17 @@ The following commands are available in Validator System V2:
  kroma-validator unjail
  ```
 
-- `changeCommissionRate` - Change the commission rate of the validator in `ValidatorManager`.
+- `changeCommissionRate init` - Initiate the commission rate change of the validator in `ValidatorManager`.
  - `--commission-rate [value]` - _(Required)_ The new commission rate of the validator (in %).
 
  ```bash
- kroma-validator changeCommissionRate --commission-rate 5
+ kroma-validator changeCommissionRate init --commission-rate 5
+ ```
+
+- `changeCommissionRate finalize` - Finalize the commission rate change of the validator in `ValidatorManager`.
+
+ ```bash
+ kroma-validator changeCommissionRate finalize
  ```
 
 - `delegate` - Self-delegate asset tokens to the `AssetManager`.

kroma-validator/cmd/main.go

@@ -63,7 +63,6 @@ func main() {
  Flags: []cli.Flag{
  cmd.TokenAmountFlag,
  cmd.CommissionRateFlag,
- cmd.CommissionMaxChangeRateFlag,
  cmd.WithdrawAccountFlag,
  },
  Action: cmd.Register,
@@ -79,10 +78,21 @@ func main() {
  Action: cmd.Unjail,
  },
  {
- Name: "changeCommissionRate",
- Usage: "(EXPERIMENTAL) Change the commission rate of the validator in ValidatorManager",
- Flags: []cli.Flag{cmd.CommissionRateFlag},
- Action: cmd.ChangeCommissionRate,
+ Name: "changeCommissionRate",
+ Usage: "(EXPERIMENTAL) Change the commission rate of the validator in ValidatorManager",
+ Subcommands: []*cli.Command{
+ {
+ Name: "init",
+ Usage: "(EXPERIMENTAL) Initiate the commission rate change",
+ Flags: []cli.Flag{cmd.CommissionRateFlag},
+ Action: cmd.InitCommissionChange,
+ },
+ {
+ Name: "finalize",
+ Usage: "(EXPERIMENTAL) Finalize the commission rate change",
+ Action: cmd.FinalizeCommissionChange,
+ },
+ },
  },
  {
  Name: "delegate",

kroma-validator/cmd/validator/cmd.go

@@ -172,7 +172,6 @@ func Register(ctx *cli.Context) error {
  }
 
  commissionRate := uint8(ctx.Uint64("commission-rate"))
- commissionMaxChangeRate := uint8(ctx.Uint64("commission-max-change-rate"))
  withdrawAccount, err := opservice.ParseAddress(ctx.String(WithdrawAccountFlag.Name))
  if err != nil {
  return fmt.Errorf("failed to parse withdraw address: %w", err)
@@ -183,7 +182,7 @@ func Register(ctx *cli.Context) error {
  return fmt.Errorf("failed to get ValidatorManager ABI: %w", err)
  }
 
- txData, err := valMgrAbi.Pack("registerValidator", assets, commissionRate, commissionMaxChangeRate, withdrawAccount)
+ txData, err := valMgrAbi.Pack("registerValidator", assets, commissionRate, withdrawAccount)
  if err != nil {
  return fmt.Errorf("failed to create register validator transaction data: %w", err)
  }
@@ -257,7 +256,7 @@ func Unjail(ctx *cli.Context) error {
  return nil
 }
 
-func ChangeCommissionRate(ctx *cli.Context) error {
+func InitCommissionChange(ctx *cli.Context) error {
  commissionRate := uint8(ctx.Uint64("commission-rate"))
 
  txManager, err := newTxManager(ctx)
@@ -270,9 +269,37 @@ func ChangeCommissionRate(ctx *cli.Context) error {
  return fmt.Errorf("failed to get ValidatorManager ABI: %w", err)
  }
 
- txData, err := valMgrAbi.Pack("changeCommissionRate", commissionRate)
+ txData, err := valMgrAbi.Pack("initCommissionChange", commissionRate)
  if err != nil {
- return fmt.Errorf("failed to create change commission rate transaction data: %w", err)
+ return fmt.Errorf("failed to create init commission change transaction data: %w", err)
+ }
+
+ valMgrAddr, err := opservice.ParseAddress(ctx.String(flags.ValMgrAddressFlag.Name))
+ if err != nil {
+ return fmt.Errorf("failed to parse ValidatorManager address: %w", err)
+ }
+
+ if err = sendTransaction(txManager, valMgrAddr, txData, "0"); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func FinalizeCommissionChange(ctx *cli.Context) error {
+ txManager, err := newTxManager(ctx)
+ if err != nil {
+ return err
+ }
+
+ valMgrAbi, err := bindings.ValidatorManagerMetaData.GetAbi()
+ if err != nil {
+ return fmt.Errorf("failed to get ValidatorManager ABI: %w", err)
+ }
+
+ txData, err := valMgrAbi.Pack("finalizeCommissionChange")
+ if err != nil {
+ return fmt.Errorf("failed to create finalize commission change transaction data: %w", err)
  }
 
  valMgrAddr, err := opservice.ParseAddress(ctx.String(flags.ValMgrAddressFlag.Name))

kroma-validator/cmd/validator/flags.go

@@ -28,12 +28,6 @@ var CommissionRateFlag = &cli.Uint64Flag{
  Required: true,
 }
 
-var CommissionMaxChangeRateFlag = &cli.Uint64Flag{
- Name: "commission-max-change-rate",
- Usage: "The maximum changeable commission rate at once (in percentage). Maximum 100.",
- Required: true,
-}
-
 var WithdrawAccountFlag = &cli.StringFlag{
  Name: "withdraw-account",
  Usage: "Address to withdraw deposited asset token",

op-e2e/actions/l2_validator.go

@@ -181,7 +181,6 @@ func (v *L2Validator) ActRegisterValidator(t Testing, assets *big.Int) {
  "registerValidator",
  assets,
  uint8(10),
- uint8(2),
  v.address,
  )
  require.NoError(t, err)

op-e2e/e2eutils/validator/validator.go

@@ -95,7 +95,7 @@ func (h *Helper) RegisterToValMgr(priv *ecdsa.PrivateKey, amount *big.Int, withd
  _, err = wait.ForReceiptOK(context.Background(), h.l1Client, tx.Hash())
  require.NoError(h.t, err)
 
- tx, err = h.ValMgrContract.RegisterValidator(transactOpts, amount, uint8(10), uint8(2), withdrawAddr)
+ tx, err = h.ValMgrContract.RegisterValidator(transactOpts, amount, uint8(10), withdrawAddr)
  require.NoError(h.t, err)
 
  _, err = wait.ForReceiptOK(context.Background(), h.l1Client, tx.Hash())