diff --git a/CHANGELOG.md b/CHANGELOG.md index 85c233be0078..8a7940f3b84d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,6 +112,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ + [\#9980](https://github.com/cosmos/cosmos-sdk/pull/9980) Returning the error when the invalid argument is passed to bank query total supply cli. + [\#10061](https://github.com/cosmos/cosmos-sdk/pull/10061) Ensure that `LegacyAminoPubKey` struct correctly unmarshals from JSON * (server) [#10016](https://github.com/cosmos/cosmos-sdk/issues/10016) Fix marshaling of index-events into server config file. +* (x/feegrant) [\#10049](https://github.com/cosmos/cosmos-sdk/issues/10049) Fixed the error message when `period` or `period-limit` flag is not set on a feegrant grant transaction. ### State Machine Breaking diff --git a/x/feegrant/client/cli/tx.go b/x/feegrant/client/cli/tx.go index 44b673d809b0..66022abfa90a 100644 --- a/x/feegrant/client/cli/tx.go +++ b/x/feegrant/client/cli/tx.go @@ -125,25 +125,28 @@ Examples: return err } - if periodClock > 0 && periodLimit != nil { - periodReset := getPeriodReset(periodClock) - if exp != "" && periodReset.Sub(expiresAtTime) > 0 { - return fmt.Errorf("period(%d) cannot reset after expiration(%v)", periodClock, exp) - } - - periodic := feegrant.PeriodicAllowance{ - Basic: basic, - Period: getPeriod(periodClock), - PeriodReset: getPeriodReset(periodClock), - PeriodSpendLimit: periodLimit, - PeriodCanSpend: periodLimit, - } - - grant = &periodic - - } else { - return fmt.Errorf("invalid number of args %d", len(args)) + if periodClock <= 0 { + return fmt.Errorf("period clock was not set") } + + if periodLimit == nil { + return fmt.Errorf("period limit was not set") + } + + periodReset := getPeriodReset(periodClock) + if exp != "" && periodReset.Sub(expiresAtTime) > 0 { + return fmt.Errorf("period (%d) cannot reset after expiration (%v)", periodClock, exp) + } + + periodic := feegrant.PeriodicAllowance{ + Basic: basic, + Period: getPeriod(periodClock), + PeriodReset: getPeriodReset(periodClock), + PeriodSpendLimit: periodLimit, + PeriodCanSpend: periodLimit, + } + + grant = &periodic } allowedMsgs, err := cmd.Flags().GetStringSlice(FlagAllowedMsgs)