Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased

### Added

- Emit `update_params`, `fund_pool`, `change_schedule`, and `reward_distributed` events from x/rewards
- Emit `update_params` and `set_denom_metadata` events from tokenfactory
- Emit `update_params`, `update_fee_tokens`, `module_disabled` and `token_disabled` events on fee abstraction
- Emit `update_params` event on oracle module

### Fixed

- Refactor `PerformSetMetadata` in wasmbinding to delegate to `msgServer.SetDenomMetadata`, ensuring the `EnableSetMetadata` capability check is enforced
Expand Down
11 changes: 10 additions & 1 deletion wasmbinding/tokenfactory/message_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,16 @@ func PerformSetMetadata(f *tokenfactorykeeper.Keeper, ctx sdk.Context, contractA

msgServer := tokenfactorykeeper.NewMsgServerImpl(*f)
_, err := msgServer.SetDenomMetadata(ctx, tokenfactorytypes.NewMsgSetDenomMetadata(contractAddr.String(), bankMetadata))
return err
if err != nil {
return err
}

ctx.EventManager().EmitEvent(sdk.NewEvent(
tokenfactorytypes.TypeMsgSetDenomMetadata,
sdk.NewAttribute(tokenfactorytypes.AttributeDenom, denom),
))

return nil
}

// GetFullDenom is a function, not method, so the message_plugin can use it
Expand Down
10 changes: 10 additions & 0 deletions x/feeabstraction/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper

import (
"context"
"strconv"
"strings"

"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -81,6 +82,10 @@ func (ms MsgServer) UpdateParams(ctx context.Context, msg *types.MsgUpdateParams
return nil, err
}

sdkCtx.EventManager().EmitEvent(sdk.NewEvent(
types.TypeEventUpdateParams,
))

// Return the response
return &types.MsgUpdateParamsResponse{}, nil
}
Expand Down Expand Up @@ -137,6 +142,11 @@ func (ms MsgServer) UpdateFeeTokens(ctx context.Context, msg *types.MsgUpdateFee
return nil, sdkerrors.ErrInvalidRequest.Wrapf("failed to update fee tokens: %s", err)
}

sdkCtx.EventManager().EmitEvent(sdk.NewEvent(
types.TypeEventUpdateFeeTokens,
sdk.NewAttribute(types.TypeAttributeTokenCount, strconv.Itoa(len(msg.Tokens.Items))),
))

// Return the response
return &types.MsgUpdateFeeTokensResponse{}, nil
}
Expand Down
13 changes: 12 additions & 1 deletion x/feeabstraction/keeper/oracle.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@ func (k Keeper) CalculateFeeTokenPrices(ctx sdk.Context) error {
// Disable fee abstraction if there is no pricing
k.Logger(ctx).Debug("%s has no price, feeabstraction disabled", params.NativeOracleDenom)
params.Enabled = false
return k.Params.Set(ctx, params)
if err := k.Params.Set(ctx, params); err != nil {
return err
}
ctx.EventManager().EmitEvent(sdk.NewEvent(
types.TypeEventModuleDisabled,
sdk.NewAttribute(types.TypeAttributeOracleDenom, params.NativeOracleDenom),
))
return nil
Comment thread
jhelison marked this conversation as resolved.
}

// Iterate all the tokens
Expand Down Expand Up @@ -94,6 +101,10 @@ func (k Keeper) calculatePriceTokens(
token.Enabled = false
token.Price = math.LegacyZeroDec()
updateTokens = append(updateTokens, token)
ctx.EventManager().EmitEvent(sdk.NewEvent(
types.TypeEventTokenDisabled,
sdk.NewAttribute(types.TypeAttributeDenom, token.Denom),
))
continue
}

Expand Down
9 changes: 9 additions & 0 deletions x/feeabstraction/types/msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ var (
TypeAttributeOriginalFeeAmount = "original_fee"
TypeAttributeConvertedFee = "converted_fee"
TypeAttributePrice = "price"

TypeEventUpdateParams = "update_params"
TypeEventUpdateFeeTokens = "update_fee_tokens"
TypeEventModuleDisabled = "module_disabled"
TypeEventTokenDisabled = "token_disabled"

TypeAttributeTokenCount = "token_count"
TypeAttributeOracleDenom = "oracle_denom"
TypeAttributeDenom = "denom"
)

// NewMessageUpdateParams creates a new MsgUpdateParams instance
Expand Down
6 changes: 6 additions & 0 deletions x/oracle/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ func (ms msgServer) UpdateParams(ctx context.Context, req *types.MsgUpdateParams
return nil, err
}

sdkCtx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeParamsUpdated,
),
})

// Return an empty response
return &types.MsgUpdateParamsResponse{}, nil
}
1 change: 1 addition & 0 deletions x/oracle/types/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const (
EventTypeFeedDelegate = "feed_delegate"
EventTypeAggregateVote = "aggregate_vote"
EventTypeEndSlashWindow = "end_slash_window"
EventTypeParamsUpdated = "update_params"
)

// Oracle module Attribute key
Expand Down
6 changes: 6 additions & 0 deletions x/rewards/keeper/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) error {
return err
}

ctx.EventManager().EmitEvent(sdk.NewEvent(
types.EventTypeRewardDistributed,
sdk.NewAttribute(types.AttributeKeyAmount, amountToDistribute.String()),
sdk.NewAttribute(types.AttributeKeyTotalReleased, schedule.ReleasedAmount.String()),
))
Comment thread
jhelison marked this conversation as resolved.

k.WriteRewardMetrics(ctx, amountToDistribute, schedule.ReleasedAmount)

return nil
Expand Down
15 changes: 15 additions & 0 deletions x/rewards/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ func (k msgServer) UpdateParams(ctx context.Context, msg *types.MsgUpdateParams)
return nil, err
}

sdk.UnwrapSDKContext(ctx).EventManager().EmitEvent(sdk.NewEvent(
types.EventTypeUpdateParams,
))

return &types.MsgUpdateParamsResponse{}, nil
}

Expand All @@ -62,6 +66,12 @@ func (k msgServer) FundPool(ctx context.Context, msg *types.MsgFundPool) (*types
return nil, err
}

sdk.UnwrapSDKContext(ctx).EventManager().EmitEvent(sdk.NewEvent(
types.EventTypeFundPool,
sdk.NewAttribute(types.AttributeKeySender, msg.Sender),
sdk.NewAttribute(types.AttributeKeyAmount, msg.Amount.String()),
))

return &types.MsgFundPoolResponse{}, nil
}

Expand Down Expand Up @@ -91,5 +101,10 @@ func (k msgServer) ChangeSchedule(ctx context.Context, msg *types.MsgChangeSched
return nil, fmt.Errorf("failed to set release schedule: %w", err)
}

sdkCtx.EventManager().EmitEvent(sdk.NewEvent(
types.EventTypeChangeSchedule,
sdk.NewAttribute(types.AttributeKeyTotalAmount, schedule.TotalAmount.String()),
))

return &types.MsgChangeScheduleResponse{}, nil
}
13 changes: 13 additions & 0 deletions x/rewards/types/events.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package types

const (
EventTypeUpdateParams = "update_params"
EventTypeFundPool = "fund_pool"
EventTypeChangeSchedule = "change_schedule"
EventTypeRewardDistributed = "reward_distributed"

AttributeKeySender = "sender"
AttributeKeyAmount = "amount"
AttributeKeyTotalReleased = "total_released"
AttributeKeyTotalAmount = "total_amount"
)
4 changes: 4 additions & 0 deletions x/tokenfactory/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,5 +226,9 @@ func (server msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdate
return nil, err
}

ctx.EventManager().EmitEvent(sdk.NewEvent(
types.TypeMsgUpdateParams,
))

return &types.MsgUpdateParamsResponse{}, nil
}
1 change: 1 addition & 0 deletions x/tokenfactory/types/msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const (
TypeMsgForceTransfer = "force_transfer"
TypeMsgChangeAdmin = "change_admin"
TypeMsgSetDenomMetadata = "set_denom_metadata"
TypeMsgUpdateParams = "update_params"
)

var _ sdk.Msg = &MsgCreateDenom{}
Expand Down
Loading