fix(chore): fix gosec issues (cosmos#1881)

* gosec improvements

* fix gosec issues

* defer to close iterator

* add gas adjustment

app/export.go

@@ -70,7 +70,10 @@ func (app *GaiaApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [
 
 	// withdraw all validator commission
 	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
-		_, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator())
+		_, err := app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator())
+		if err != nil {
+			app.Logger().Error(err.Error(), "ValOperatorAddress", val.GetOperator())
+		}
 		return false
 	})
 
@@ -86,7 +89,11 @@ func (app *GaiaApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [
 		if err != nil {
 			panic(err)
 		}
-		_, _ = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr)
+
+		_, err = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr)
+		if err != nil {
+			panic(err)
+		}
 	}
 
 	// clear validator slash events
@@ -165,6 +172,7 @@ func (app *GaiaApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [
 
 	counter := int16(0)
 
+	defer iter.Close()
 	for ; iter.Valid(); iter.Next() {
 		addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
 		validator, found := app.StakingKeeper.GetValidator(ctx, addr)
@@ -181,8 +189,6 @@ func (app *GaiaApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [
 		counter++
 	}
 
-	iter.Close()
-
 	_, err := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx)
 	if err != nil {
 		panic(err)

cmd/gaiad/cmd/testnet.go

@@ -67,15 +67,42 @@ Example:
 			serverCtx := server.GetServerContextFromCmd(cmd)
 			config := serverCtx.Config
 
-			outputDir, _ := cmd.Flags().GetString(flagOutputDir)
-			keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-			chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
-			minGasPrices, _ := cmd.Flags().GetString(server.FlagMinGasPrices)
-			nodeDirPrefix, _ := cmd.Flags().GetString(flagNodeDirPrefix)
-			nodeDaemonHome, _ := cmd.Flags().GetString(flagNodeDaemonHome)
-			startingIPAddress, _ := cmd.Flags().GetString(flagStartingIPAddress)
-			numValidators, _ := cmd.Flags().GetInt(flagNumValidators)
-			algo, _ := cmd.Flags().GetString(flags.FlagKeyAlgorithm)
+			outputDir, err := cmd.Flags().GetString(flagOutputDir)
+			if err != nil {
+				return err
+			}
+			keyringBackend, err := cmd.Flags().GetString(flags.FlagKeyringBackend)
+			if err != nil {
+				return err
+			}
+			chainID, err := cmd.Flags().GetString(flags.FlagChainID)
+			if err != nil {
+				return err
+			}
+			minGasPrices, err := cmd.Flags().GetString(server.FlagMinGasPrices)
+			if err != nil {
+				return err
+			}
+			nodeDirPrefix, err := cmd.Flags().GetString(flagNodeDirPrefix)
+			if err != nil {
+				return err
+			}
+			nodeDaemonHome, err := cmd.Flags().GetString(flagNodeDaemonHome)
+			if err != nil {
+				return err
+			}
+			startingIPAddress, err := cmd.Flags().GetString(flagStartingIPAddress)
+			if err != nil {
+				return err
+			}
+			numValidators, err := cmd.Flags().GetInt(flagNumValidators)
+			if err != nil {
+				return err
+			}
+			algo, err := cmd.Flags().GetString(flags.FlagKeyAlgorithm)
+			if err != nil {
+				return err
+			}
 
 			return InitTestnet(
 				clientCtx, cmd, config, mbm, genBalIterator, outputDir, chainID, minGasPrices,

tests/e2e/e2e_exec_test.go

@@ -33,6 +33,7 @@ const (
 	flagOutput          = "output"
 	flagChainID         = "chain-id"
 	flagSpendLimit      = "spend-limit"
+	flagGasAdjustment   = "gas-adjustment"
 	flagFeeGranter      = "fee-granter"
 	flagBroadcastMode   = "broadcast-mode"
 	flagKeyringBackend  = "keyring-backend"
@@ -55,6 +56,7 @@ func applyOptions(chainID string, options []flagOption) map[string]interface{} {
 		flagGas:            "auto",
 		flagFrom:           "alice",
 		flagBroadcastMode:  "sync",
+		flagGasAdjustment:  "1.5",
 		flagChainID:        chainID,
 		flagHome:           gaiaHomePath,
 		flagFees:           standardFees.String(),

tests/e2e/genesis.go

@@ -172,7 +172,7 @@ func modifyGenesis(path, moniker, amountStr string, addrAll []sdk.AccAddress, gl
 	stakingGenState.Params.BondDenom = denom
 	stakingGenStateBz, err := cdc.MarshalJSON(stakingGenState)
 	if err != nil {
-		return fmt.Errorf("failed to marshal staking genesis state: %w", err)
+		return fmt.Errorf("failed to marshal staking genesis state: %s", err)
 	}
 	appState[stakingtypes.ModuleName] = stakingGenStateBz
 

tests/e2e/validator.go

@@ -60,7 +60,7 @@ func (v *validator) configDir() string {
 //nolint:unused // this is called during e2e tests
 func (v *validator) createConfig() error {
 	p := path.Join(v.configDir(), "config")
-	return os.MkdirAll(p, 0o755)
+	return os.MkdirAll(p, 0755)
 }
 
 //nolint:unused // this is called during e2e tests

x/globalfee/ante/fee.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/gaia/v8/x/globalfee"
 )
 
-const maxBypassMinFeeMsgGasUsage = uint64(200_000)
+const maxBypassMinFeeMsgGasUsage uint64 = 200_000
 
 // FeeWithBypassDecorator will check if the transaction's fee is at least as large
 // as the local validator's minimum gasFee (defined in validator config) and global fee, and the fee denom should be in the global fees' denoms.

x/icamauth/client/cli/tx.go

@@ -58,7 +58,10 @@ func getRegisterAccountCmd() *cobra.Command {
 
 	cmd.Flags().AddFlagSet(fsConnectionID)
 	cmd.Flags().AddFlagSet(fsVersion)
-	_ = cmd.MarkFlagRequired(FlagConnectionID)
+	err := cmd.MarkFlagRequired(FlagConnectionID)
+	if err != nil {
+		panic(err)
+	}
 
 	flags.AddTxFlagsToCmd(cmd)
 
@@ -105,7 +108,10 @@ func getSubmitTxCmd() *cobra.Command {
 	}
 
 	cmd.Flags().AddFlagSet(fsConnectionID)
-	_ = cmd.MarkFlagRequired(FlagConnectionID)
+	err := cmd.MarkFlagRequired(FlagConnectionID)
+	if err != nil {
+		panic(err)
+	}
 
 	flags.AddTxFlagsToCmd(cmd)