optimize dkg threshold validation

Author: keithsue

x/dlc/types/msg_create_dcm.go

@@ -6,6 +6,8 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	tsstypes "github.com/bitwaylabs/bitway/x/tss/types"
 )
 
 var _ sdk.Msg = &MsgCreateDCM{}
@@ -16,12 +18,12 @@ func (m *MsgCreateDCM) ValidateBasic() error {
 		return errorsmod.Wrap(err, "invalid authority address")
 	}
 
-	if m.Threshold == 0 {
-		return errorsmod.Wrap(ErrInvalidThreshold, "threshold must be greater than 0")
+	if len(m.Participants) < tsstypes.MinDKGParticipantNum {
+		return errorsmod.Wrapf(ErrInvalidParticipants, "participant number cannot be less than min dkg participant number %d", tsstypes.MinDKGParticipantNum)
 	}
 
-	if len(m.Participants) == 0 || len(m.Participants) < int(m.Threshold) {
-		return errorsmod.Wrap(ErrInvalidParticipants, "incorrect participant length")
+	if err := tsstypes.CheckDKGThreshold(len(m.Participants), int(m.Threshold)); err != nil {
+		return err
 	}
 
 	participants := make(map[string]bool)

x/dlc/types/params.go

@@ -6,6 +6,8 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+
+	tsstypes "github.com/bitwaylabs/bitway/x/tss/types"
 )
 
 var (
@@ -21,9 +23,6 @@ var (
 	// default nonce generation timeout duration
 	DefaultNonceGenerationTimeoutDuration = 24 * time.Hour // 24 hours
 
-	// minimum oracle participant number
-	MinOracleParticipantNum = uint32(3)
-
 	// default oracle participant number
 	DefaultOracleParticipantNum = uint32(3)
 
@@ -71,19 +70,11 @@ func (p Params) Validate() error {
 		return err
 	}
 
-	if len(p.AllowedOracleParticipants) > 0 && p.OracleParticipantNum > uint32(len(p.AllowedOracleParticipants)) {
-		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))
-	}
-
-	if p.OracleParticipantNum < MinOracleParticipantNum {
-		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be less than min oracle participant number %d", MinOracleParticipantNum)
-	}
-
-	if p.OracleParticipantThreshold == 0 || p.OracleParticipantThreshold > p.OracleParticipantNum {
-		return errorsmod.Wrapf(ErrInvalidParams, "invalid oracle participant threshold")
+	if err := validateOracleParticipantNum(p); err != nil {
+		return err
 	}
 
-	return nil
+	return tsstypes.CheckDKGThreshold(int(p.OracleParticipantNum), int(p.OracleParticipantThreshold))
 }
 
 // validateOracleParticipants validates the given oracle participants
@@ -102,3 +93,16 @@ func validateOracleParticipants(participants []string) error {
 
 	return nil
 }
+
+// validateOracleParticipantNum validates the given oracle participant num
+func validateOracleParticipantNum(p Params) error {
+	if p.OracleParticipantNum < uint32(tsstypes.MinDKGParticipantNum) {
+		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be less than min dkg participant number %d", tsstypes.MinDKGParticipantNum)
+	}
+
+	if len(p.AllowedOracleParticipants) > 0 && p.OracleParticipantNum > uint32(len(p.AllowedOracleParticipants)) {
+		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))
+	}
+
+	return nil
+}

x/tss/types/errors.go

@@ -18,6 +18,7 @@ var (
 	ErrUnauthorizedParticipant    = errorsmod.Register(ModuleName, 2003, "unauthorized participant")
 	ErrDKGCompletionAlreadyExists = errorsmod.Register(ModuleName, 2004, "dkg completion already exists")
 	ErrInvalidDKGCompletion       = errorsmod.Register(ModuleName, 2005, "invalid dkg completion")
+	ErrInvalidThreshold           = errorsmod.Register(ModuleName, 2006, "invalid threshold")
 
 	ErrSigningRequestDoesNotExist = errorsmod.Register(ModuleName, 3000, "signing request does not exist")
 	ErrInvalidSigningStatus       = errorsmod.Register(ModuleName, 3001, "invalid signing status")

x/tss/types/params.go

@@ -13,9 +13,6 @@ var (
 	// maximum moniker size
 	MaxMonikerLength = stakingtypes.MaxMonikerLength
 
-	// minimum DKG participant number
-	MinDKGParticipantNum = 3
-
 	// default DKG timeout duration
 	DefaultDKGTimeoutDuration = time.Duration(86400) * time.Second // 1 day
 )

x/tss/types/tss.go

@@ -12,12 +12,20 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/txscript"
 
+	errorsmod "cosmossdk.io/errors"
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/sideprotocol/side/bitcoin/crypto/hash"
 )
 
-const (
+var (
+	// minimum dkg participant number
+	MinDKGParticipantNum = 3
+
+	// minimum dkg threshold ratio
+	MinDKGThresholdRatio = sdkmath.LegacyMustNewDecFromStr("0.5")
+
 	// schnorr signature size
 	SchnorrSignatureSize = 64
 
@@ -131,3 +139,22 @@ func GetExpirationTime(currentTime time.Time, timeoutDuration time.Duration) tim
 
 	return currentTime.Add(timeoutDuration)
 }
+
+// CheckDKGThreshold checks if the given threshold is valid
+func CheckDKGThreshold(participantNum int, threshold int) error {
+	if threshold == 0 {
+		return errorsmod.Wrap(ErrInvalidThreshold, "dkg threshold must be greater than 0")
+	}
+
+	if threshold > participantNum {
+		return errorsmod.Wrapf(ErrInvalidThreshold, "dkg threshold cannot be greater than participant number %d", participantNum)
+	}
+
+	if MinDKGThresholdRatio.IsPositive() {
+		if int64(threshold) < MinDKGThresholdRatio.MulInt64(int64(participantNum)).TruncateInt64() {
+			return errorsmod.Wrapf(ErrInvalidThreshold, "dkg threshold ratio cannot be less than %s", MinDKGThresholdRatio)
+		}
+	}
+
+	return nil
+}