Peggy types updated

chain/peggy/types/ethereum.go

@@ -85,7 +85,7 @@ func (p PeggyDenom) TokenContract() (common.Address, error) {
 
 func NewPeggyDenom(tokenContract common.Address) PeggyDenom {
 	buf := make([]byte, 0, PeggyDenomLen)
-	buf = append(buf, (PeggyDenomPrefix + PeggyDenomSeparator)...)
+	buf = append(buf, PeggyDenomPrefix+PeggyDenomSeparator...)
 	buf = append(buf, tokenContract.Bytes()...)
 
 	return PeggyDenom(buf)

chain/peggy/types/events.go

@@ -1,26 +1,26 @@
 package types
 
 const (
-	EventTypeObservation               = "observation"
-	EventTypeOutgoingBatch             = "outgoing_batch"
-	EventTypeMultisigBootstrap         = "multisig_bootstrap"
-	EventTypeMultisigUpdateRequest     = "multisig_update_request"
-	EventTypeOutgoingBatchCanceled     = "outgoing_batch_canceled"
-	EventTypeBridgeWithdrawalReceived  = "withdrawal_received"
-	EventTypeBridgeDepositReceived     = "deposit_received"
+	EventTypeObservation   = "observation"
+	EventTypeOutgoingBatch = "outgoing_batch"
 
-	AttributeKeyAttestationID     = "attestation_id"
-	AttributeKeyAttestationIDs    = "attestation_ids"
-	AttributeKeyBatchConfirmKey   = "batch_confirm_key"
-	AttributeKeyValsetConfirmKey  = "valset_confirm_key"
-	AttributeKeyMultisigID        = "multisig_id"
-	AttributeKeyOutgoingBatchID   = "batch_id"
-	AttributeKeyOutgoingTXID      = "outgoing_tx_id"
-	AttributeKeyAttestationType   = "attestation_type"
-	AttributeKeyContract          = "bridge_contract"
-	AttributeKeyNonce             = "nonce"
-	AttributeKeyValsetNonce       = "valset_nonce"
-	AttributeKeyBatchNonce        = "batch_nonce"
-	AttributeKeyBridgeChainID     = "bridge_chain_id"
-	AttributeKeySetOperatorAddr   = "set_operator_address"
+	EventTypeMultisigUpdateRequest    = "multisig_update_request"
+	EventTypeOutgoingBatchCanceled    = "outgoing_batch_canceled"
+	EventTypeBridgeWithdrawalReceived = "withdrawal_received"
+	EventTypeBridgeDepositReceived    = "deposit_received"
+	EventTypeBridgeWithdrawCanceled   = "withdraw_canceled"
+
+	AttributeKeyAttestationID    = "attestation_id"
+	AttributeKeyBatchConfirmKey  = "batch_confirm_key"
+	AttributeKeyValsetConfirmKey = "valset_confirm_key"
+	AttributeKeyMultisigID       = "multisig_id"
+	AttributeKeyOutgoingBatchID  = "batch_id"
+	AttributeKeyOutgoingTXID     = "outgoing_tx_id"
+	AttributeKeyAttestationType  = "attestation_type"
+	AttributeKeyContract         = "bridge_contract"
+	AttributeKeyNonce            = "nonce"
+	AttributeKeyValsetNonce      = "valset_nonce"
+	AttributeKeyBatchNonce       = "batch_nonce"
+	AttributeKeyBridgeChainID    = "bridge_chain_id"
+	AttributeKeySetOperatorAddr  = "set_operator_address"
 )

chain/peggy/types/genesis.go

@@ -34,6 +34,9 @@ var (
 	// ParamsStoreKeyBridgeContractAddress stores the contract address
 	ParamsStoreKeyBridgeContractAddress = []byte("BridgeContractAddress")
 
+	// ParamsStoreKeyBridgeContractStartHeight stores the bridge contract deployed height
+	ParamsStoreKeyBridgeContractStartHeight = []byte("BridgeContractChainHeight")
+
 	// ParamsStoreKeyBridgeContractChainID stores the bridge chain id
 	ParamsStoreKeyBridgeContractChainID = []byte("BridgeChainID")
 
@@ -76,6 +79,9 @@ var (
 	//  ParamStoreUnbondSlashingValsetsWindow stores unbond slashing valset window
 	ParamStoreUnbondSlashingValsetsWindow = []byte("UnbondSlashingValsetsWindow")
 
+	// ParamStoreClaimSlashingEnabled stores ClaimSlashing is enabled or not
+	ParamStoreClaimSlashingEnabled = []byte("ClaimSlashingEnabled")
+
 	// Ensure that params implements the proper interface
 	_ paramtypes.ParamSet = &Params{}
 )
@@ -113,6 +119,7 @@ func DefaultParams() *Params {
 		SlashFractionConflictingClaim: sdk.NewDec(1).Quo(sdk.NewDec(1000)),
 		CosmosCoinDenom:               "inj",
 		UnbondSlashingValsetsWindow:   10000,
+		ClaimSlashingEnabled:          false,
 	}
 }
 
@@ -127,6 +134,9 @@ func (p Params) ValidateBasic() error {
 	if err := validateBridgeContractAddress(p.BridgeEthereumAddress); err != nil {
 		return sdkerrors.Wrap(err, "bridge contract address")
 	}
+	if err := validateBridgeContractStartHeight(p.BridgeContractStartHeight); err != nil {
+		return sdkerrors.Wrap(err, "bridge contract start height")
+	}
 	if err := validateBridgeChainID(p.BridgeChainId); err != nil {
 		return sdkerrors.Wrap(err, "bridge chain id")
 	}
@@ -169,6 +179,9 @@ func (p Params) ValidateBasic() error {
 	if err := validateUnbondSlashingValsetsWindow(p.UnbondSlashingValsetsWindow); err != nil {
 		return sdkerrors.Wrap(err, "unbond Slashing valset window")
 	}
+	if err := validateClaimSlashingEnabled(p.ClaimSlashingEnabled); err != nil {
+		return sdkerrors.Wrap(err, "claim slashing enabled")
+	}
 
 	return nil
 }
@@ -199,6 +212,8 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 		paramtypes.NewParamSetPair(ParamsStoreSlashFractionClaim, &p.SlashFractionClaim, validateSlashFractionClaim),
 		paramtypes.NewParamSetPair(ParamsStoreSlashFractionConflictingClaim, &p.SlashFractionConflictingClaim, validateSlashFractionConflictingClaim),
 		paramtypes.NewParamSetPair(ParamStoreUnbondSlashingValsetsWindow, &p.UnbondSlashingValsetsWindow, validateUnbondSlashingValsetsWindow),
+		paramtypes.NewParamSetPair(ParamStoreClaimSlashingEnabled, &p.ClaimSlashingEnabled, validateClaimSlashingEnabled),
+		paramtypes.NewParamSetPair(ParamsStoreKeyBridgeContractStartHeight, &p.BridgeContractStartHeight, validateBridgeContractStartHeight),
 	}
 }
 
@@ -244,6 +259,13 @@ func validateBridgeChainID(i interface{}) error {
 	return nil
 }
 
+func validateBridgeContractStartHeight(i interface{}) error {
+	if _, ok := i.(uint64); !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+	return nil
+}
+
 func validateTargetBatchTimeout(i interface{}) error {
 	val, ok := i.(uint64)
 	if !ok {
@@ -386,3 +408,11 @@ func validateCosmosCoinErc20Contract(i interface{}) error {
 
 	return ValidateEthAddress(v)
 }
+
+func validateClaimSlashingEnabled(i interface{}) error {
+	_, ok := i.(bool)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+	return nil
+}