[feat] add the new slash implementation and some missed RPC and CLI

proto/exocore/delegation/v1/query.proto

@@ -3,6 +3,7 @@ package exocore.delegation.v1;
 
 import "cosmos/query/v1/query.proto";
 import "cosmos_proto/cosmos.proto";
+import "exocore/delegation/v1/tx.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
@@ -69,6 +70,28 @@ message SingleDelegationInfoReq {
   string asset_id = 3 [(gogoproto.customname) = "AssetID"];
 }
 
+// UndelegationsReq is the request to obtain all delegations
+// by staker id and asset id.
+message UndelegationsReq {
+  // staker_id is the staker id.
+  string staker_id = 1 [(gogoproto.customname) = "StakerID"];
+  // asset_id is the asset id.
+  string asset_id = 2 [(gogoproto.customname) = "AssetID"];
+}
+
+// UndelegationsReq is the request to obtain all undelegations waiting to be completed
+// by height.
+message WaitCompleteUndelegationsReq {
+  // block_height is the block height to query.
+  uint64 block_height = 1;
+}
+
+// UndelegationRecordList is the response to query undelegations.
+message UndelegationRecordList {
+  // UndelegationRecord is the returned undelegations
+  repeated UndelegationRecord undelegations = 1;
+}
+
 // Query is the service API for the delegation module.
 service Query {
   // DelegationInfo queries the delegation information for {stakerID, assetID}.
@@ -82,5 +105,19 @@ service Query {
     option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/exocore/delegation/v1/QuerySingleDelegationInfo";
   }
+
+  // QueryUndelegations queries all undelegations for
+  // {staker, asset}.
+  rpc QueryUndelegations(UndelegationsReq) returns (UndelegationRecordList) {
+    option (cosmos.query.v1.module_query_safe) = true;
+    option (google.api.http).get = "/exocore/delegation/v1/QueryUndelegations";
+  }
+
+  // QueryWaitCompleteUndelegations queries all undelegations waiting to be completed by
+  // {height}.
+  rpc QueryWaitCompleteUndelegations(WaitCompleteUndelegationsReq) returns (UndelegationRecordList) {
+    option (cosmos.query.v1.module_query_safe) = true;
+    option (google.api.http).get = "/exocore/delegation/v1/QueryWaitCompleteUndelegations";
+  }
 }
 

proto/exocore/operator/v1/query.proto

@@ -16,6 +16,42 @@ message GetOperatorInfoReq {
   [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
+// QueryOperatorUSDValueRequest is the request to obtain the USD value for operator.
+message QueryOperatorUSDValueRequest {
+  // operator_addr is the operator address,its type should be a sdk.AccAddress
+  string operator_addr = 1
+  [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // avs_address is the AVS address opted-in by the operator
+  string avs_address = 2
+  [(gogoproto.customname) = "AVSAddress"];
+}
+
+// QueryAVSUSDValueRequest is the request to obtain the USD value for AVS.
+message QueryAVSUSDValueRequest {
+  // avs_address is the AVS address opted-in by the operator
+  string avs_address = 1
+  [(gogoproto.customname) = "AVSAddress"];
+}
+
+// QueryOperatorSlashInfoRequest is the request to obtain the slash information for the specified
+// operator and AVS
+message QueryOperatorSlashInfoRequest {
+  // operator_addr is the operator address,its type should be a sdk.AccAddress
+  string operator_addr = 1
+  [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // avs_address is the AVS address opted-in by the operator
+  string avs_address = 2
+  [(gogoproto.customname) = "AVSAddress"];
+}
+
+// QueryOperatorSlashInfoResponse is the response for GetOperatorSlashInfoRequest
+message QueryOperatorSlashInfoResponse{
+  // AllSlashInfo the key is slashID, the value is the specified slash information
+  // It's okay to use a map here, because it won't be used to store state, only in
+  // the response to an RPC call
+  map<string, OperatorSlashInfo> all_slash_info = 1;
+}
+
 // QueryOperatorConsKeyRequest is the request to obtain the consensus public key of the operator
 message QueryOperatorConsKeyRequest {
   // addr is the ACC address of operator
@@ -27,21 +63,36 @@ message QueryOperatorConsKeyRequest {
 // QueryOperatorConsKeyResponse is the response for QueryOperatorConsKeyRequest
 message QueryOperatorConsKeyResponse {
   // public_key is the consensus public key of the operator
-  tendermint.crypto.PublicKey public_key = 1 [ (gogoproto.nullable) = false ];
+  tendermint.crypto.PublicKey public_key = 1 [(gogoproto.nullable) = false];
 }
 
 // Query defines the gRPC querier service.
 service Query {
   // OperatorInfo queries the operator information.
   rpc GetOperatorInfo(GetOperatorInfoReq) returns(OperatorInfo){
-    option (google.api.http).get = "/exocore/delegation/v1/GetOperatorInfo";
+    option (google.api.http).get = "/exocore/operator/v1/GetOperatorInfo";
   }
 
   // QueryOperatorConsKeyForChainID queries the consensus public key for the operator
   rpc QueryOperatorConsKeyForChainID(QueryOperatorConsKeyRequest) returns (QueryOperatorConsKeyResponse) {
     option (google.api.http) = {
-      get: "/exocore/operator_consent/v1/GetOperatorConsKey/{addr}/{chain_id}"
+      get: "/exocore/operator/v1/GetOperatorConsKey/{addr}/{chain_id}"
     };
   }
+
+  // QueryOperatorUSDValue queries the opted-in USD value for the operator
+  rpc QueryOperatorUSDValue(QueryOperatorUSDValueRequest) returns(DecValueField){
+    option (google.api.http).get = "/exocore/operator/v1/QueryOperatorUSDValue";
+  }
+
+  // QueryAVSUSDValue queries the USD value for the AVS
+  rpc QueryAVSUSDValue(QueryAVSUSDValueRequest) returns(DecValueField){
+    option (google.api.http).get = "/exocore/operator/v1/QueryAVSUSDValue";
+  }
+
+  // QueryOperatorSlashInfo queries the slash information for the specified operator and AVS
+  rpc QueryOperatorSlashInfo(QueryOperatorSlashInfoRequest) returns(QueryOperatorSlashInfoResponse){
+    option (google.api.http).get = "/exocore/operator/v1/QueryOperatorSlashInfo";
+  }
 }
 

proto/exocore/operator/v1/tx.proto

@@ -92,6 +92,56 @@
   SLASH_TYPE_NO_INSTANTANEOUS_SLASH = 2;
 }
 
+// SlashFromUndelegation records the slash detail from the undelegation
+message SlashFromUndelegation {
+  // staker_id is the staker id.
+  string staker_id = 1 [(gogoproto.customname) = "StakerID"];
+  // asset_id is the asset id.
+  string asset_id = 2 [(gogoproto.customname) = "AssetID"];
+  // amount is the slashed amount from the undelegation.
+  string amount = 3
+  [
+    (cosmos_proto.scalar) = "cosmos.Int",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+// SlashFromAssetsPool records the slash detail from the operator assets pool
+message SlashFromAssetsPool {
+  // asset_id is the asset id.
+  string asset_id = 1 [(gogoproto.customname) = "AssetID"];
+  // amount is the slashed amount from the assets pool.
+  string amount = 2
+  [
+    (cosmos_proto.scalar) = "cosmos.Int",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+
+// SlashAssetsInfo is the slashed assets information
+message SlashExecutionInfo {
+  // slash_proportion is the new calculated proportion when execute the slash
+  string slash_proportion = 1
+  [
+    (cosmos_proto.scalar) = "cosmos.Dec",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false
+  ];
+  // slash_value is the usd value of all slashed assets
+  string slash_value = 2
+  [
+    (cosmos_proto.scalar) = "cosmos.Dec",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false
+  ];
+  // SlashUndelegations records all slash info related to the undelegation
+  repeated SlashFromUndelegation slash_undelegations = 3;
+  // SlashFromAssetsPool records all slash info related to the assets pool
+  repeated SlashFromAssetsPool slash_assets_pool = 4;
+}
+
 // OperatorSlashInfo is the slash info of operator
 message OperatorSlashInfo {
   // slash_contract is the address of slash contract
@@ -100,19 +150,19 @@
   int64 submitted_height = 2;
   // event_height is the exocore block height at which the slash event occurs
   int64 event_height = 3;
-  // processed_height is the exocore block height at which the slash event is processed
-  int64 processed_height = 4;
   // is_vetoed is a flag to indicate if this slash is vetoed
-  bool is_vetoed = 5;
+  bool is_vetoed = 4;
   // slash_proportion is the proportion of assets that need to be slashed
-  string slash_proportion = 6
+  string slash_proportion = 5
   [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  // type indicates the slash type.
-  SlashType slash_type = 7;
+  // slash_type indicates the slash type of specified AVS.
+  uint32 slash_type = 6;
+  // SlashExecutionInfo stores the slashed execution information
+  SlashExecutionInfo execution_info = 7;
 }
 
 // RegisterOperatorReq is the request to register a new operator.

x/assets/keeper/operator_asset.go

@@ -16,7 +16,7 @@ func (k Keeper) GetOperatorAssetInfos(ctx sdk.Context, operatorAddr sdk.Address,
 		ret[assetID] = state
 		return nil
 	}
-	err = k.IteratorAssetsForOperator(ctx, operatorAddr.String(), assetsFilter, opFunc)
+	err = k.IteratorAssetsForOperator(ctx, false, operatorAddr.String(), assetsFilter, opFunc)
 	if err != nil {
 		return nil, err
 	}
@@ -96,7 +96,7 @@ func (k Keeper) UpdateOperatorAssetState(ctx sdk.Context, operatorAddr sdk.Addre
 // IteratorAssetsForOperator iterates all assets for the specified operator
 // if `assetsFilter` is nil, the `opFunc` will handle all assets, it equals to an iterator without filter
 // if `assetsFilter` isn't nil, the `opFunc` will only handle the assets that is in the filter map.
-func (k Keeper) IteratorAssetsForOperator(ctx sdk.Context, operator string, assetsFilter map[string]interface{}, opFunc func(assetID string, state *assetstype.OperatorAssetInfo) error) error {
+func (k Keeper) IteratorAssetsForOperator(ctx sdk.Context, isUpdate bool, operator string, assetsFilter map[string]interface{}, opFunc func(assetID string, state *assetstype.OperatorAssetInfo) error) error {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), assetstype.KeyPrefixOperatorAssetInfos)
 	iterator := sdk.KVStorePrefixIterator(store, []byte(operator))
 	defer iterator.Close()
@@ -116,6 +116,11 @@ func (k Keeper) IteratorAssetsForOperator(ctx sdk.Context, operator string, asse
 		if err != nil {
 			return err
 		}
+		if isUpdate {
+			// store the updated state
+			bz := k.cdc.MustMarshal(&amounts)
+			store.Set(iterator.Key(), bz)
+		}
 	}
 	return nil
 }