Merge branch 'main' into release/v5.0.x

OmniFlix · Sep 11, 2024 · 2f7481a · 2f7481a
2 parents e9a0918 + 765e962
commit 2f7481a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go
@@ -36,7 +36,7 @@ func CreateV5UpgradeHandler(
 		govParams.ExpeditedThreshold = "0.7"
 		expeditedVotingPeriod := time.Hour * 24
 		govParams.ExpeditedVotingPeriod = &expeditedVotingPeriod
-		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin("uflix", sdkmath.NewIntWithDecimal(2500, 6)))
+		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin("uflix", sdkmath.NewIntWithDecimal(15000, 6)))
 
 		err = keepers.GovKeeper.Params.Set(ctx, govParams)
 		if err != nil {

diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go
@@ -9,14 +9,14 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-var maxTotalBypassMinFeeMsgGasUsage = 2_000_000
+var maxTotalBypassMinFeeMsgGasUsage = uint64(2_000_000)
 
 // DefaultParams returns default parameters
 func DefaultParams() Params {
 	return Params{
 		MinimumGasPrices:                sdk.DecCoins(nil),
 		BypassMinFeeMsgTypes:            []string{},
-		MaxTotalBypassMinFeeMsgGasUsage: uint64(maxTotalBypassMinFeeMsgGasUsage),
+		MaxTotalBypassMinFeeMsgGasUsage: maxTotalBypassMinFeeMsgGasUsage,
 	}
 }
 

diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go
@@ -346,7 +346,7 @@ func NewModifyDenomMetadataCmd() *cobra.Command {
 					},
 					{
 						Denom:    ticker,
-						Exponent: uint32(exponent), //nolint:all
+						Exponent: uint32(exponent),
 						Aliases:  []string{fullDenom},
 					},
 				},