diff --git a/app/app_testing/app_testing.go b/app/app_testing/app_testing.go index 171dea6f..9d38ae5e 100644 --- a/app/app_testing/app_testing.go +++ b/app/app_testing/app_testing.go @@ -274,6 +274,7 @@ func TestSimAppEnforceStakingForVestingTokens(t *testing.T) { } } + /* #nosec */ for _, share := range sharePerValidators { require.Equal(t, sdk.NewDec(3_500_001_000_000), share) } diff --git a/app/app_testing/test_helpers.go b/app/app_testing/test_helpers.go index 61e3c24f..a81db014 100644 --- a/app/app_testing/test_helpers.go +++ b/app/app_testing/test_helpers.go @@ -68,8 +68,11 @@ func (s *AppTestSuite) Setup() { GRPCQueryRouter: s.App.GRPCQueryRouter(), Ctx: s.Ctx, } - s.App.BankKeeper.SetParams(s.Ctx, banktypes.NewParams(true)) - s.App.WasmKeeper.SetParams(s.Ctx, wasmtypes.DefaultParams()) + err := s.App.BankKeeper.SetParams(s.Ctx, banktypes.NewParams(true)) + s.Require().NoError(err) + err = s.App.WasmKeeper.SetParams(s.Ctx, wasmtypes.DefaultParams()) + s.Require().NoError(err) + s.App.TokenFactoryKeeper.SetParams(s.Ctx, tokenfactorytypes.DefaultParams()) s.App.DistrKeeper.SetFeePool(s.Ctx, distrtypes.InitialFeePool()) } diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go index 4eb655da..48d2e231 100644 --- a/x/tokenfactory/keeper/before_send.go +++ b/x/tokenfactory/keeper/before_send.go @@ -76,6 +76,7 @@ func (k Keeper) Hooks() Hooks { // TrackBeforeSend calls the before send listener contract surpresses any errors func (h Hooks) TrackBeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) { + /* #nosec */ _ = h.k.callBeforeSendListener(ctx, from, to, amount, false) } diff --git a/x/tokenfactory/migrations/v2/store.go b/x/tokenfactory/migrations/v2/store.go index 619bffa3..3943b18c 100644 --- a/x/tokenfactory/migrations/v2/store.go +++ b/x/tokenfactory/migrations/v2/store.go @@ -9,7 +9,7 @@ import ( func MigrateStore(ctx sdk.Context, subspace paramtypes.Subspace) error { var params types.Params subspace.GetParamSet(ctx, ¶ms) - params.DenomCreationGasConsume = uint64(types.DefaultCreationGasFee) + params.DenomCreationGasConsume = types.DefaultCreationGasFee subspace.SetParamSet(ctx, ¶ms) return nil } diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index 020e4edb..94dd7768 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -79,7 +79,8 @@ func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Rout // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { - types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) //nolint:errcheck + /* #nosec */ + types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) } // GetTxCmd returns the x/tokenfactory module's root tx command. diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index 9ee67c9a..33287472 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -49,6 +49,7 @@ func (m MsgCreateDenom) GetSignBytes() []byte { } func (m MsgCreateDenom) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -91,6 +92,7 @@ func (m MsgMint) GetSignBytes() []byte { } func (m MsgMint) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -134,6 +136,7 @@ func (m MsgBurn) GetSignBytes() []byte { } func (m MsgBurn) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -179,6 +182,7 @@ func (m MsgForceTransfer) GetSignBytes() []byte { } func (m MsgForceTransfer) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -220,6 +224,7 @@ func (m MsgChangeAdmin) GetSignBytes() []byte { } func (m MsgChangeAdmin) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -260,6 +265,7 @@ func (m MsgSetDenomMetadata) GetSignBytes() []byte { } func (m MsgSetDenomMetadata) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } @@ -303,6 +309,7 @@ func (m MsgSetBeforeSendHook) GetSignBytes() []byte { } func (m MsgSetBeforeSendHook) GetSigners() []sdk.AccAddress { + /* #nosec */ sender, _ := sdk.AccAddressFromBech32(m.Sender) return []sdk.AccAddress{sender} } diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 44c2ff07..178a2412 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -13,7 +13,7 @@ var ( KeyDenomCreationGasConsume = []byte("DenomCreationGasConsume") // chosen as an arbitrary large number, less than the max_gas_wanted_per_tx in config. - DefaultCreationGasFee = 1_000_000 + DefaultCreationGasFee = uint64(1_000_000) ) // ParamTable for gamm module. @@ -32,8 +32,9 @@ func NewParams(denomCreationFee sdk.Coins, denomCreationGasConsume uint64) Param func DefaultParams() Params { return Params{ // For choice, see: https://github.com/osmosis-labs/osmosis/pull/4983 - DenomCreationFee: sdk.NewCoins(sdk.NewInt64Coin("uluna", 10000000)), - DenomCreationGasConsume: uint64(DefaultCreationGasFee), + DenomCreationFee: sdk.NewCoins(sdk.NewInt64Coin("uluna", 10000000)), + /* #nosec */ + DenomCreationGasConsume: DefaultCreationGasFee, } }