optimize tss signing event

Author: keithsue

x/tss/keeper/signing.go

@@ -1,6 +1,9 @@
 package keeper
 
 import (
+	"fmt"
+	"strings"
+
 	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -108,7 +111,15 @@ func (k Keeper) InitiateSigningRequest(ctx sdk.Context, module string, scopedId
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			types.EventTypeInitiateSigning,
-			types.GetSigningRequestEventAttributes(req.Id, module, scopedId, ty, intent, pubKey, sigHashes, options)...),
+			sdk.NewAttribute(types.AttributeKeyId, fmt.Sprintf("%d", req.Id)),
+			sdk.NewAttribute(types.AttributeKeyModule, module),
+			sdk.NewAttribute(types.AttributeKeyScopedId, scopedId),
+			sdk.NewAttribute(types.AttributeKeyType, fmt.Sprintf("%d", ty)),
+			sdk.NewAttribute(types.AttributeKeyIntent, fmt.Sprintf("%d", intent)),
+			sdk.NewAttribute(types.AttributeKeyPubKey, pubKey),
+			sdk.NewAttribute(types.AttributeKeySigHashes, strings.Join(sigHashes, types.AttributeValueSeparator)),
+			sdk.NewAttribute(types.AttributeKeyOption, types.GetSigningOption(ty, options)),
+		),
 	)
 
 	return req

x/tss/types/events.go

@@ -1,12 +1,5 @@
 package types
 
-import (
-	fmt "fmt"
-	"strings"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
 // TSS module event types
 const (
 	EventTypeInitiateDKG     = "initiate_dkg"
@@ -29,52 +22,26 @@ const (
 
 	AttributeKeyParticipant = "participant"
 
-	AttributeKeyPubKey       = "pub_key"
-	AttributeKeySigHashes    = "sig_hashes"
-	AttributeKeyNonce        = "nonce"
-	AttributeKeyAdaptorPoint = "adaptor_point"
+	AttributeKeyPubKey    = "pub_key"
+	AttributeKeySigHashes = "sig_hashes"
+	AttributeKeyOption    = "option"
 )
 
 const (
 	AttributeValueSeparator = ","
 )
 
-// GetSigningRequestEventAttributes gets the event attributes for the signing request
-func GetSigningRequestEventAttributes(id uint64, module string, scopedId string, ty SigningType, intent int32, pubKey string, sigHashes []string, options *SigningOptions) []sdk.Attribute {
-	attributes := []sdk.Attribute{}
-
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyId, fmt.Sprintf("%d", id)))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyModule, module))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyScopedId, scopedId))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyType, fmt.Sprintf("%d", ty)))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyIntent, fmt.Sprintf("%d", intent)))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeyPubKey, pubKey))
-	attributes = append(attributes, sdk.NewAttribute(AttributeKeySigHashes, strings.Join(sigHashes, AttributeValueSeparator)))
-
-	if options != nil {
-		attributes = append(attributes, GetSigningOptionAttribute(ty, options))
-	}
-
-	return attributes
-}
-
-// GetSigningOptionAttribute gets the event attribute for the signing option
+// GetSigningOption gets the signing option according to the given signing type and options
 // Assume that the options match the signing type
-func GetSigningOptionAttribute(signingType SigningType, options *SigningOptions) sdk.Attribute {
+func GetSigningOption(signingType SigningType, options *SigningOptions) string {
 	switch signingType {
 	case SigningType_SIGNING_TYPE_SCHNORR_WITH_COMMITMENT:
-		return sdk.Attribute{
-			Key:   AttributeKeyNonce,
-			Value: options.Nonce,
-		}
+		return options.Nonce
 
 	case SigningType_SIGNING_TYPE_SCHNORR_ADAPTOR:
-		return sdk.Attribute{
-			Key:   AttributeKeyAdaptorPoint,
-			Value: options.AdaptorPoint,
-		}
+		return options.AdaptorPoint
 
 	default:
-		return sdk.Attribute{}
+		return ""
 	}
 }