Skip to content

Commit

Permalink
chore: review feedback improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanchriswhite committed Sep 30, 2024
1 parent db366f6 commit 0839ae4
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 21 deletions.
4 changes: 3 additions & 1 deletion config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ genesis:
gateway:
params:
# TODO_MAINNET: Determine realistic amount for minimum gateway stake amount.
min_stake: 100
min_stake:
amount: "1000000" # 1 POKT
denom: upokt
gatewayList:
- address: pokt15vzxjqklzjtlz7lahe8z2dfe9nm5vxwwmscne4
stake:
Expand Down
16 changes: 16 additions & 0 deletions tools/scripts/params/gateway_all.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"body": {
"messages": [
{
"@type": "/poktroll.gateway.MsgUpdateParams",
"authority": "pokt10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t",
"params": {
"min_stake": {
"amount": "1000000",
"denom": "upokt"
}
}
}
]
}
}
5 changes: 4 additions & 1 deletion tools/scripts/params/gateway_min_stake.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"@type": "/poktroll.gateway.MsgUpdateParam",
"authority": "pokt10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t",
"name": "min_stake",
"as_int64": "42"
"as_coin": {
"amount": "1000000",
"denom": "upokt"
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion x/gateway/keeper/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestGetParams(t *testing.T) {
require.EqualValues(t, params, k.GetParams(ctx))
}

func TestParams_ValidateMinRelayDifficulty(t *testing.T) {
func TestParams_ValidateMinStake(t *testing.T) {
tests := []struct {
desc string
minStake any
Expand Down
25 changes: 8 additions & 17 deletions x/gateway/types/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,18 @@ func ValidateMinStake(minStakeAny any) error {
return ErrGatewayParamInvalid.Wrap("missing min_stake")
}

if err := ValidateMinStakeDenom(minStakeCoin); err != nil {
return err
if minStakeCoin.Denom != volatile.DenomuPOKT {
return ErrGatewayParamInvalid.Wrapf(
"invalid min_stake denom %q; expected %q",
minStakeCoin.Denom, volatile.DenomuPOKT,
)
}

if err := ValidateMinStakeAboveZero(minStakeCoin); err != nil {
return err
if minStakeCoin.IsZero() || minStakeCoin.IsNegative() {
return ErrGatewayParamInvalid.Wrapf("invalid min_stake amount: %s <= 0", minStakeCoin)
}

return nil
}

func ValidateMinStakeDenom(minStakeCoin *cosmostypes.Coin) error {
if minStakeCoin.Denom != volatile.DenomuPOKT {
return ErrGatewayParamInvalid.Wrapf("min stake denom must be %s: %s", volatile.DenomuPOKT, minStakeCoin)
return ErrGatewayParamInvalid.Wrapf("invalid min_stake amount denom %s", minStakeCoin)
}
return nil
}

func ValidateMinStakeAboveZero(minStakeCoin *cosmostypes.Coin) error {
if minStakeCoin.Amount.Int64() <= 0 {
return ErrGatewayParamInvalid.Wrapf("min stake amount must be greater than zero: %s", minStakeCoin)
}
return nil
}
2 changes: 1 addition & 1 deletion x/proof/keeper/msg_server_update_param_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestMsgUpdateParam_UpdateMinRelayDifficultyBitsOnly(t *testing.T) {
// Ensure the default values are different from the new values we want to set
require.NotEqual(t, expectedRelayDifficultyTargetHash, defaultParams.RelayDifficultyTargetHash)

// Update the min relay difficulty bits
// Update the min stake.
updateParamMsg := &prooftypes.MsgUpdateParam{
Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(),
Name: prooftypes.ParamRelayDifficultyTargetHash,
Expand Down

0 comments on commit 0839ae4

Please sign in to comment.