Update create pub key tx to include number of validators & aggregate …

…key according to that

go.mod

@@ -7,6 +7,7 @@ require (
 	cosmossdk.io/errors v1.0.0-beta.7
 	cosmossdk.io/math v1.0.1
 	github.com/FairBlock/DistributedIBE v0.0.0-20230528025616-f58fb2b93eaf
+	github.com/armon/go-metrics v0.4.1
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cometbft/cometbft-db v0.8.0
 	github.com/cosmos/cosmos-sdk v0.47.3
@@ -47,7 +48,6 @@ require (
 	github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/aws/aws-sdk-go v1.44.203 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect

proto/fairyring/keyshare/pub_key.proto

@@ -7,10 +7,12 @@ message ActivePubKey {
   string publicKey = 1;
   string creator = 2;
   uint64 expiry = 3;
+  uint64 numberOfValidators = 4;
 }
 
 message QueuedPubKey {
   string publicKey = 1;
   string creator = 2;
   uint64 expiry = 3;
+  uint64 numberOfValidators = 4;
 }

proto/fairyring/keyshare/tx.proto

@@ -50,6 +50,7 @@ message MsgCreateLatestPubKey {
            string creator     = 1;
            string publicKey   = 2;
   repeated string commitments = 3;
+           uint64 numberOfValidators = 4;
 }
 
 message MsgCreateLatestPubKeyResponse {}

x/keyshare/client/cli/tx_latest_pub_key.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fairyring/x/keyshare/types"
+	"github.com/spf13/cast"
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -12,9 +13,9 @@ import (
 
 func CmdCreateLatestPubKey() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create-latest-pub-key [public-key] [commitments]",
+		Use:   "create-latest-pub-key [public-key] [commitments] [number-of-validators]",
 		Short: "Create a latest public key",
-		Args:  cobra.ExactArgs(2),
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 
 			// Get value arguments
@@ -23,6 +24,11 @@ func CmdCreateLatestPubKey() *cobra.Command {
 			commitmentStr := args[1]
 			commitments := strings.Split(commitmentStr, ",")
 
+			numberOfValidators, err := cast.ToUint64E(args[2])
+			if err != nil {
+				return err
+			}
+
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
@@ -32,6 +38,7 @@ func CmdCreateLatestPubKey() *cobra.Command {
 				clientCtx.GetFromAddress().String(),
 				argPublicKey,
 				commitments,
+				numberOfValidators,
 			)
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},

x/keyshare/keeper/msg_server_pub_key.go

@@ -29,6 +29,10 @@ func (k msgServer) CreateLatestPubKey(goCtx context.Context, msg *types.MsgCreat
 		return nil, types.ErrEmptyCommitments
 	}
 
+	if msg.NumberOfValidators == 0 {
+		return nil, types.ErrInvalidNumberOfValidators
+	}
+
 	commitments := types.Commitments{
 		Commitments: msg.Commitments,
 	}
@@ -40,9 +44,10 @@ func (k msgServer) CreateLatestPubKey(goCtx context.Context, msg *types.MsgCreat
 	}
 
 	var queuedPubKey = types.QueuedPubKey{
-		Creator:   msg.Creator,
-		PublicKey: msg.PublicKey,
-		Expiry:    expHeight,
+		Creator:            msg.Creator,
+		PublicKey:          msg.PublicKey,
+		Expiry:             expHeight,
+		NumberOfValidators: msg.NumberOfValidators,
 	}
 
 	k.SetQueuedCommitments(
@@ -70,6 +75,7 @@ func (k msgServer) CreateLatestPubKey(goCtx context.Context, msg *types.MsgCreat
 			sdk.NewAttribute(types.QueuedPubKeyCreatedEventExpiryHeight, strconv.FormatUint(expHeight, 10)),
 			sdk.NewAttribute(types.QueuedPubKeyCreatedEventCreator, msg.Creator),
 			sdk.NewAttribute(types.QueuedPubKeyCreatedEventPubkey, msg.PublicKey),
+			sdk.NewAttribute(types.QueuedPubKeyCreatedEventNumberOfValidators, strconv.FormatUint(msg.NumberOfValidators, 10)),
 		),
 	)
 

x/keyshare/keeper/msg_server_send_keyshare.go

@@ -129,10 +129,17 @@ func (k msgServer) SendKeyshare(goCtx context.Context, msg *types.MsgSendKeyshar
 		stateKeyShares = append(stateKeyShares, eachKeyShare)
 	}
 
+	// Get the active public key for aggregating
+	activePubKey, found := k.GetActivePubKey(ctx)
+
+	if !found {
+		return nil, types.ErrPubKeyNotFound
+	}
+
 	expectedThreshold := sdk.NewDecFromInt(
 		sdk.NewInt(types.KeyAggregationThresholdNumerator)).Quo(
 		sdk.NewDecFromInt(sdk.NewInt(types.KeyAggregationThresholdDenominator))).MulInt64(
-		int64(len(validatorList))).Ceil().TruncateInt64()
+		int64(activePubKey.NumberOfValidators)).Ceil().TruncateInt64()
 
 	// Emit KeyShare Submitted Event
 	ctx.EventManager().EmitEvent(
@@ -162,13 +169,6 @@ func (k msgServer) SendKeyshare(goCtx context.Context, msg *types.MsgSendKeyshar
 		}, nil
 	}
 
-	// Get the active public key for aggregating
-	activePubKey, found := k.pepKeeper.GetActivePubKey(ctx)
-
-	if !found {
-		return nil, types.ErrPubKeyNotFound
-	}
-
 	// Parse & append all the keyshare for aggregation
 	var listOfShares []distIBE.ExtractedKey
 	var listOfCommitment []distIBE.Commitment

x/keyshare/module.go

@@ -207,7 +207,11 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 	if foundQk {
 		if qk.Expiry > height {
 			am.keeper.SetActivePubKey(ctx, types.ActivePubKey(qk))
-			am.pepKeeper.SetActivePubKey(ctx, peptypes.ActivePubKey(qk))
+			am.pepKeeper.SetActivePubKey(ctx, peptypes.ActivePubKey{
+				PublicKey: qk.PublicKey,
+				Creator:   qk.Creator,
+				Expiry:    qk.Expiry,
+			})
 			if foundQc {
 				am.keeper.SetActiveCommitments(ctx, qc)
 			}

x/keyshare/types/errors.go

@@ -32,7 +32,7 @@ var (
 	ErrInvalidCommitmentLength        = sdkerrors.Register(ModuleName, 1122, "invalid commitment length")
 	ErrInvalidVersion                 = sdkerrors.Register(ModuleName, 1123, "invalid version")
 	ErrRequestNotFound                = sdkerrors.Register(ModuleName, 1124, "no request found with this identity")
-	ErrNoAggregatedKeyshare           = sdkerrors.Register(ModuleName, 1125, "aggregated keyshare has not been generated")
+	ErrInvalidNumberOfValidators      = sdkerrors.Register(ModuleName, 1125, "invalid number of validators")
 	ErrAddressAlreadyAuthorized       = sdkerrors.Register(ModuleName, 1900, "address is already authorized")
 	ErrAuthorizedAddrNotFound         = sdkerrors.Register(ModuleName, 1901, "target authorized address not found")
 	ErrNotAuthorizedAddrCreator       = sdkerrors.Register(ModuleName, 1902, "sender is not the creator of target authorized address")

x/keyshare/types/keys.go

@@ -83,6 +83,7 @@ const (
 	QueuedPubKeyCreatedEventExpiryHeight             = "queued-pubkey-created-expiry-height"
 	QueuedPubKeyCreatedEventCreator                  = "queued-pubkey-created-creator"
 	QueuedPubKeyCreatedEventPubkey                   = "queued-pubkey-created-pubkey"
+	QueuedPubKeyCreatedEventNumberOfValidators       = "number-of-validators"
 )
 
 const (

x/keyshare/types/messages_latest_pub_key.go

@@ -19,11 +19,13 @@ func NewMsgCreateLatestPubKey(
 	creator string,
 	publicKey string,
 	commitments []string,
+	numberOfValidators uint64,
 ) *MsgCreateLatestPubKey {
 	return &MsgCreateLatestPubKey{
-		Creator:     creator,
-		PublicKey:   publicKey,
-		Commitments: commitments,
+		Creator:            creator,
+		PublicKey:          publicKey,
+		Commitments:        commitments,
+		NumberOfValidators: numberOfValidators,
 	}
 }
 
@@ -67,5 +69,8 @@ func (msg *MsgCreateLatestPubKey) ValidateBasic() error {
 			return ErrInvalidCommitment.Wrapf("expected hex encoded commitment, got: %s", c)
 		}
 	}
+	if msg.NumberOfValidators == 0 {
+		return ErrInvalidNumberOfValidators.Wrapf("expected at least 1 validator, got: %d", msg.NumberOfValidators)
+	}
 	return nil
 }