fix: Fix inactive vals and min stake handling in ConsumerAdditionProposal conversion (#2181)

* Add inactive vals and min stake to Chain struct

* Add allow_inactive_vals and min_stake to consumer chain query result

* Add inactive vals and min stake to consumer chain getter test

* Fix regression

* Revert extra logging changes

* Remove e2e scenario

Author: p-offtermatt

proto/interchain_security/ccv/provider/v1/query.proto

@@ -187,6 +187,11 @@ message Chain {
   repeated string allowlist = 7;
   // Corresponds to a list of provider consensus addresses of validators that CANNOT validate the consumer chain.
   repeated string denylist = 8;
+  // Corresponds to the minimal amount of (provider chain) stake required to validate on the consumer chain.
+  uint64 min_stake = 9;
+  // Corresponds to whether inactive validators are allowed to validate the consumer chain.
+  bool allow_inactive_vals = 10;
+  
 }
 
 message QueryValidatorConsumerAddrRequest {

tests/e2e/actions.go

@@ -299,7 +299,9 @@ func (tr Chain) submitConsumerAdditionProposal(
    "validator_set_cap": %d,
    "allowlist": %s,
    "denylist": %s,
-   "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn"
+   "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn",
+   "allow_inactive_vals": %t,
+   "min_stake": "%d"
   }
  ],
 "metadata": "ipfs://CID",
@@ -327,6 +329,8 @@ func (tr Chain) submitConsumerAdditionProposal(
 		action.ValidatorSetCap,
 		action.Allowlist,
 		action.Denylist,
+		action.AllowInactiveVals,
+		action.MinStake,
 		action.Deposit)
 
 	//#nosec G204 -- bypass unsafe quoting warning (no production code)
@@ -587,13 +591,14 @@ type SubmitConsumerModificationProposalAction struct {
 	ValidatorSetCap    uint32
 	Allowlist          []string
 	Denylist           []string
+	AllowInactiveVals  bool
+	MinStake           uint64
 }
 
 func (tr Chain) submitConsumerModificationProposal(
 	action SubmitConsumerModificationProposalAction,
 	verbose bool,
 ) {
-
 	template := `
 
 {
@@ -609,8 +614,8 @@ func (tr Chain) submitConsumerModificationProposal(
 	"allowlist": %s,
 	"denylist": %s,
     "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn",
-    "min_stake": "0",
-    "allow_inactive_vals": false
+    "min_stake": %d,
+    "allow_inactive_vals": %t
   }
  ],
 "metadata": "ipfs://CID",
@@ -629,6 +634,8 @@ func (tr Chain) submitConsumerModificationProposal(
 		action.Allowlist,
 		action.Denylist,
 		action.Deposit,
+		action.MinStake,
+		action.AllowInactiveVals,
 	)
 
 	// #nosec G204 -- bypass unsafe quoting warning (no production code)

x/ccv/provider/keeper/grpc_query.go

@@ -95,6 +95,10 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, chainID string) (types.Chain,
 		strDenylist[i] = addr.String()
 	}
 
+	allowInactiveVals := k.AllowsInactiveValidators(ctx, chainID)
+
+	minStake, _ := k.GetMinStake(ctx, chainID)
+
 	return types.Chain{
 		ChainId:            chainID,
 		ClientId:           clientID,
@@ -104,6 +108,8 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, chainID string) (types.Chain,
 		ValidatorsPowerCap: validatorsPowerCap,
 		Allowlist:          strAllowlist,
 		Denylist:           strDenylist,
+		AllowInactiveVals:  allowInactiveVals,
+		MinStake:           minStake,
 	}, nil
 }
 

x/ccv/provider/keeper/grpc_query_test.go

@@ -280,6 +280,15 @@ func TestGetConsumerChain(t *testing.T) {
 		{},
 	}
 
+	allowInactiveVals := []bool{true, false, true, false}
+
+	minStakes := []math.Int{
+		math.NewInt(0),
+		math.NewInt(100),
+		math.NewInt(200),
+		math.NewInt(300),
+	}
+
 	expectedGetAllOrder := []types.Chain{}
 	for i, chainID := range chainIDs {
 		clientID := fmt.Sprintf("client-%d", len(chainIDs)-i)
@@ -289,6 +298,8 @@ func TestGetConsumerChain(t *testing.T) {
 		pk.SetValidatorSetCap(ctx, chainID, validatorSetCaps[i])
 		pk.SetValidatorsPowerCap(ctx, chainID, validatorPowerCaps[i])
 		pk.SetMinimumPowerInTopN(ctx, chainID, expectedMinPowerInTopNs[i])
+		pk.SetInactiveValidatorsAllowed(ctx, chainID, allowInactiveVals[i])
+		pk.SetMinStake(ctx, chainID, minStakes[i].Uint64())
 		for _, addr := range allowlists[i] {
 			pk.SetAllowlist(ctx, chainID, addr)
 		}
@@ -315,6 +326,8 @@ func TestGetConsumerChain(t *testing.T) {
 				ValidatorsPowerCap: validatorPowerCaps[i],
 				Allowlist:          strAllowlist,
 				Denylist:           strDenylist,
+				AllowInactiveVals:  allowInactiveVals[i],
+				MinStake:           minStakes[i].Uint64(),
 			})
 	}
 

x/ccv/provider/keeper/hooks.go

@@ -180,6 +180,8 @@ func (h Hooks) GetConsumerAdditionFromProp(
 			ValidatorSetCap:                   sdkMsg.ValidatorSetCap,
 			Allowlist:                         sdkMsg.Allowlist,
 			Denylist:                          sdkMsg.Denylist,
+			MinStake:                          sdkMsg.MinStake,
+			AllowInactiveVals:                 sdkMsg.AllowInactiveVals,
 		}
 		return proposal, true
 	}

x/ccv/provider/keeper/proposal.go

@@ -44,6 +44,8 @@ func (k Keeper) HandleConsumerAdditionProposal(ctx sdk.Context, proposal *types.
 		ValidatorSetCap:                   proposal.ValidatorSetCap,
 		Allowlist:                         proposal.Allowlist,
 		Denylist:                          proposal.Denylist,
+		MinStake:                          proposal.MinStake,
+		AllowInactiveVals:                 proposal.AllowInactiveVals,
 	}
 
 	return k.HandleLegacyConsumerAdditionProposal(ctx, &p)