feat(contracts): modify deploy scripts (#365)

* chore(contracts): update bindings and snapshot

* feat(contracts): modify deploy scripts

* refac(contracts): reduce local vars in `Colosseum` to reduce code size

* chore(chain-ops): set `ValidatorPool` termination index to 10 in devnet

kroma-chain-ops/genesis/config.go

@@ -287,8 +287,10 @@ type DeployConfig struct {
 	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.
-	ValidatorManagerJailPeriodSeconds uint64 `json:"validatorManagerJailPeriodSeconds"`
+	// ValidatorManagerSoftJailPeriodSeconds is the duration of jail period in seconds in output non-submissions penalty.
+	ValidatorManagerSoftJailPeriodSeconds uint64 `json:"validatorManagerSoftJailPeriodSeconds"`
+	// ValidatorManagerHardJailPeriodSeconds is the duration of jail period in seconds in slashing penalty.
+	ValidatorManagerHardJailPeriodSeconds uint64 `json:"validatorManagerHardJailPeriodSeconds"`
 	// ValidatorManagerJailThreshold is the threshold of output non-submission to be jailed.
 	ValidatorManagerJailThreshold uint64 `json:"validatorManagerJailThreshold"`
 	// ValidatorManagerMaxFinalizations is the max number of output finalizations when distributing
@@ -299,14 +301,12 @@ type DeployConfig struct {
 
 	// AssetManagerKgh represents the address of the KGH NFT contract.
 	AssetManagerKgh common.Address `json:"assetManagerKgh"`
-	// AssetManagerKghManager represents the address of the KGH manager contract.
-	AssetManagerKghManager common.Address `json:"assetManagerKghManager"`
-	// AssetManagerUndelegationPeriod is the duration of undelegation period in seconds.
-	AssetManagerUndelegationPeriod uint64 `json:"assetManagerUndelegationPeriod"`
-	// AssetManagerSlashingRate is the slashing rate of challenge loser's total asset.
-	AssetManagerSlashingRate uint64 `json:"assetManagerSlashingRate"`
-	// AssetManagerMinSlashingAmount is the amount of the minimum slashing amount.
-	AssetManagerMinSlashingAmount *hexutil.Big `json:"assetManagerMinSlashingAmount"`
+	// AssetManagerVault represents the address of the validator reward vault.
+	AssetManagerVault common.Address `json:"assetManagerVault"`
+	// AssetManagerMinDelegationPeriod is the duration of minimum delegation period in seconds.
+	AssetManagerMinDelegationPeriod uint64 `json:"assetManagerMinDelegationPeriod"`
+	// AssetManagerBondAmount is the bond amount.
+	AssetManagerBondAmount *hexutil.Big `json:"assetManagerBondAmount"`
 
 	ColosseumCreationPeriodSeconds uint64      `json:"colosseumCreationPeriodSeconds"`
 	ColosseumBisectionTimeout      uint64      `json:"colosseumBisectionTimeout"`
@@ -555,8 +555,11 @@ func (d *DeployConfig) Check() error {
 	if d.ValidatorManagerRoundDurationSeconds == 0 {
 		return fmt.Errorf("%w: ValidatorManagerRoundDurationSeconds cannot be 0", ErrInvalidDeployConfig)
 	}
-	if d.ValidatorManagerJailPeriodSeconds == 0 {
-		return fmt.Errorf("%w: ValidatorManagerJailPeriodSeconds cannot be 0", ErrInvalidDeployConfig)
+	if d.ValidatorManagerSoftJailPeriodSeconds == 0 {
+		return fmt.Errorf("%w: ValidatorManagerSoftJailPeriodSeconds cannot be 0", ErrInvalidDeployConfig)
+	}
+	if d.ValidatorManagerHardJailPeriodSeconds == 0 {
+		return fmt.Errorf("%w: ValidatorManagerHardJailPeriodSeconds cannot be 0", ErrInvalidDeployConfig)
 	}
 	if d.ValidatorManagerJailThreshold == 0 {
 		return fmt.Errorf("%w: ValidatorManagerJailThreshold cannot be 0", ErrInvalidDeployConfig)
@@ -570,17 +573,14 @@ func (d *DeployConfig) Check() error {
 	if d.AssetManagerKgh == (common.Address{}) {
 		return fmt.Errorf("%w: AssetManagerKgh cannot be address(0)", ErrInvalidDeployConfig)
 	}
-	if d.AssetManagerKghManager == (common.Address{}) {
-		return fmt.Errorf("%w: AssetManagerKghManager cannot be address(0)", ErrInvalidDeployConfig)
-	}
-	if d.AssetManagerUndelegationPeriod == 0 {
-		return fmt.Errorf("%w: AssetManagerUndelegationPeriod cannot be 0", ErrInvalidDeployConfig)
+	if d.AssetManagerVault == (common.Address{}) {
+		return fmt.Errorf("%w: AssetManagerVault cannot be address(0)", ErrInvalidDeployConfig)
 	}
-	if d.AssetManagerSlashingRate == 0 {
-		return fmt.Errorf("%w: AssetManagerSlashingRate cannot be 0", ErrInvalidDeployConfig)
+	if d.AssetManagerMinDelegationPeriod == 0 {
+		return fmt.Errorf("%w: AssetManagerMinDelegationPeriod cannot be 0", ErrInvalidDeployConfig)
 	}
-	if d.AssetManagerMinSlashingAmount == nil {
-		return fmt.Errorf("%w: AssetManagerMinSlashingAmount cannot be nil", ErrInvalidDeployConfig)
+	if d.AssetManagerBondAmount == nil {
+		return fmt.Errorf("%w: AssetManagerBondAmount cannot be nil", ErrInvalidDeployConfig)
 	}
 	if d.L2OutputOracleSubmissionInterval*d.L2BlockTime != d.ValidatorManagerRoundDurationSeconds*2 {
 		return fmt.Errorf("%w: double of ValidatorManagerRoundDurationSeconds must equal to L2OutputOracleSubmissionInterval", ErrInvalidDeployConfig)

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

@@ -65,15 +65,15 @@
   "validatorManagerMinActivateAmount": "0x2",
   "validatorManagerCommissionChangeDelaySeconds": 2,
   "validatorManagerRoundDurationSeconds": 4,
-  "validatorManagerJailPeriodSeconds": 2,
+  "validatorManagerSoftJailPeriodSeconds": 1,
+  "validatorManagerHardJailPeriodSeconds": 2,
   "validatorManagerJailThreshold": 2,
   "validatorManagerMaxFinalizations": 10,
   "validatorManagerBaseReward": "0x1",
   "assetManagerKgh": "0xff000000000000000000000000000000000000ff",
-  "assetManagerKghManager": "0xff000000000000000000000000000000000000fe",
-  "assetManagerUndelegationPeriod": 2,
-  "assetManagerSlashingRate": 10,
-  "assetManagerMinSlashingAmount": "0x1",
+  "assetManagerVault": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
+  "assetManagerMinDelegationPeriod": 2,
+  "assetManagerBondAmount": "0xa",
   "securityCouncilOwners": [
     "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
     "0x71be63f3384f5fb98995898a86b02fb2426c5788",

kroma-devnet/devnet/__init__.py

@@ -292,7 +292,6 @@ def devnet_deploy(paths):
     run_command(['docker', 'compose', 'exec', 'kroma-validator',
                  'kroma-validator', 'deposit', '--amount', '1000000000'], cwd=paths.ops_bedrock_dir)
 
-    # 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(
         [

op-e2e/e2eutils/secrets.go

@@ -25,7 +25,7 @@ var DefaultMnemonicConfig = &MnemonicConfig{
 	Alice:            "m/44'/60'/0'/0/4",
 	SequencerP2P:     "m/44'/60'/0'/0/5",
 	Bob:              "m/44'/60'/0'/0/7",
-	Mallory:          "m/44'/60'/0'/0/8",
+	Mallory:          "m/44'/60'/0'/0/8", // 0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
 	SysCfgOwner:      "m/44'/60'/0'/0/0",
 
 	// [Kroma: START],