Merge pull request #190 from CosmWasm/gov_events_181

Cleanup event attribute keys

x/wasm/handler.go

@@ -3,16 +3,11 @@ package wasm
 import (
 	"fmt"
 
+	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-const (
-	AttributeKeyContract = "contract_address"
-	AttributeKeyCodeID   = "code_id"
-	AttributeSigner      = "signer"
-)
-
 // NewHandler returns a handler for "bank" type messages.
 func NewHandler(k Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
@@ -84,8 +79,8 @@ func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) (*sdk.Result,
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", codeID)),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", codeID)),
 	)
 
 	return &sdk.Result{
@@ -104,9 +99,9 @@ func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) (
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", msg.Code)),
-		sdk.NewAttribute(AttributeKeyContract, contractAddr.String()),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", msg.Code)),
+		sdk.NewAttribute(types.AttributeKeyContract, contractAddr.String()),
 	)
 
 	return &sdk.Result{
@@ -125,8 +120,8 @@ func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) (*sdk.Res
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()),
 	)
 
 	res.Events = append(events, ourEvent)
@@ -143,8 +138,8 @@ func handleMigration(ctx sdk.Context, k Keeper, msg *MsgMigrateContract) (*sdk.R
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()),
 	)
 	res.Events = append(events, ourEvent)
 	return res, nil
@@ -158,8 +153,8 @@ func handleUpdateContractAdmin(ctx sdk.Context, k Keeper, msg *MsgUpdateAdmin) (
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()),
 	)
 	return &sdk.Result{
 		Events: append(events, ourEvent),
@@ -174,8 +169,8 @@ func handleClearContractAdmin(ctx sdk.Context, k Keeper, msg *MsgClearAdmin) (*s
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, ModuleName),
-		sdk.NewAttribute(AttributeSigner, msg.Sender.String()),
-		sdk.NewAttribute(AttributeKeyContract, msg.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeySigner, msg.Sender.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, msg.Contract.String()),
 	)
 	return &sdk.Result{
 		Events: append(events, ourEvent),

x/wasm/internal/keeper/proposal_handler.go

@@ -9,13 +9,6 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
-const ( // TODO: same as in handler
-
-	AttributeKeyContract = "contract_address"
-	AttributeKeyCodeID   = "code_id"
-	AttributeSigner      = "signer"
-)
-
 // NewWasmProposalHandler creates a new governance Handler for wasm proposals
 func NewWasmProposalHandler(k Keeper, enabledProposalTypes []types.ProposalType) govtypes.Handler {
 	enabledTypes := make(map[string]struct{}, len(enabledProposalTypes))
@@ -59,8 +52,7 @@ func handleStoreCodeProposal(ctx sdk.Context, k Keeper, p types.StoreCodeProposa
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		//sdk.NewAttribute(AttributeSigner, p.RunAs.String()), // todo: creator is not signer. rename attribute?
-		sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", codeID)),
+		sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", codeID)),
 	)
 	ctx.EventManager().EmitEvent(ourEvent)
 	return nil
@@ -79,9 +71,8 @@ func handleInstantiateProposal(ctx sdk.Context, k Keeper, p types.InstantiateCon
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		//sdk.NewAttribute(AttributeSigner, p.RunAs.String()),
-		sdk.NewAttribute(AttributeKeyCodeID, fmt.Sprintf("%d", p.Code)),
-		sdk.NewAttribute(AttributeKeyContract, contractAddr.String()),
+		sdk.NewAttribute(types.AttributeKeyCodeID, fmt.Sprintf("%d", p.Code)),
+		sdk.NewAttribute(types.AttributeKeyContract, contractAddr.String()),
 	)
 	ctx.EventManager().EmitEvent(ourEvent)
 	return nil
@@ -100,8 +91,7 @@ func handleMigrateProposal(ctx sdk.Context, k Keeper, p types.MigrateContractPro
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		//sdk.NewAttribute(AttributeSigner, p.RunAs.String()),
-		sdk.NewAttribute(AttributeKeyContract, p.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()),
 	)
 	ctx.EventManager().EmitEvents(append(res.Events, ourEvent))
 	return nil
@@ -119,8 +109,7 @@ func handleUpdateAdminProposal(ctx sdk.Context, k Keeper, p types.UpdateAdminPro
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		//sdk.NewAttribute(AttributeSigner, p.RunAs.String()),
-		sdk.NewAttribute(AttributeKeyContract, p.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()),
 	)
 	ctx.EventManager().EmitEvent(ourEvent)
 	return nil
@@ -137,8 +126,7 @@ func handleClearAdminProposal(ctx sdk.Context, k Keeper, p types.ClearAdminPropo
 	ourEvent := sdk.NewEvent(
 		sdk.EventTypeMessage,
 		sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-		//sdk.NewAttribute(AttributeSigner, p.RunAs.String()),
-		sdk.NewAttribute(AttributeKeyContract, p.Contract.String()),
+		sdk.NewAttribute(types.AttributeKeyContract, p.Contract.String()),
 	)
 	ctx.EventManager().EmitEvent(ourEvent)
 	return nil

x/wasm/internal/types/keys.go

@@ -23,6 +23,12 @@ const (
 	RouterKey = ModuleName
 )
 
+const ( // event attributes
+	AttributeKeyContract = "contract_address"
+	AttributeKeyCodeID   = "code_id"
+	AttributeKeySigner   = "signer"
+)
+
 // nolint
 var (
 	KeyLastCodeID     = []byte("lastCodeId")