fix signing and tss pkg

Author: nkitlabs

pkg/tss/hash.go

@@ -71,7 +71,7 @@ func HashRound3Complain(
 			[]byte("round3Complain"),
 			pubNonce,
 			nonceSym,
-			oneTimePubJ,
+			oneTimePubI,
 			oneTimePubJ,
 			keySym,
 		),

pkg/tss/hash_test.go

@@ -45,7 +45,7 @@ func (suite *TSSTestSuite) TestHashRound3Complain() {
 
 	// Ensure the hash matches the expected value.
 	suite.Require().Nil(err)
-	suite.Require().Equal("955537bd86b09a963c27afff3fb965e897fda379ff04625b953da753843bc63a", hex.EncodeToString(hash))
+	suite.Require().Equal("1b8081d885dc6226a2737228e91270a27b488475079c3e2e46ba8accdfa928ce", hex.EncodeToString(hash))
 }
 
 func (suite *TSSTestSuite) TestHashRound3OwnPubKey() {

pkg/tss/testutil/test_case.go

@@ -650,7 +650,7 @@ func (e EncSecretShare) Value() []byte {
 	return e[0:32]
 }
 
-// Value return the nonce part of EncSecretShare
+// Nonce return the nonce part of EncSecretShare
 func (e EncSecretShare) Nonce() []byte {
 	return e[32:48]
 }

pkg/tss/types.go

@@ -304,7 +304,7 @@ func (s *KeeperTestSuite) TestFailedRequestSignatureReq() {
 			func() {
 				s.app.BandtssKeeper.SetCurrentGroupID(ctx, 1)
 			},
-			tsstypes.ErrGroupIsNotActive,
+			types.ErrNoActiveGroup,
 		},
 		{
 			"failure with fee is more than user's limit",
@@ -323,6 +323,7 @@ func (s *KeeperTestSuite) TestFailedRequestSignatureReq() {
 	for _, tc := range tcs {
 		s.Run(fmt.Sprintf("Case %s", tc.Msg), func() {
 			tc.Malleate()
+			defer tc.PostTest()
 
 			balancesBefore := s.app.BankKeeper.GetAllBalances(ctx, bandtesting.FeePayer.Address)
 			balancesModuleBefore := s.app.BankKeeper.GetAllBalances(
@@ -342,8 +343,6 @@ func (s *KeeperTestSuite) TestFailedRequestSignatureReq() {
 			// Check if the balances of payer and module account doesn't change
 			s.Require().Equal(balancesBefore, balancesAfter)
 			s.Require().Equal(balancesModuleBefore, balancesModuleAfter)
-
-			tc.PostTest()
 		})
 	}
 }

x/bandtss/keeper/msg_server_test.go

@@ -143,13 +143,15 @@ func (k Keeper) HandleCreateSigning(
 	if err != nil {
 		return 0, err
 	}
+	if currentGroup.Status != tsstypes.GROUP_STATUS_ACTIVE {
+		return 0, types.ErrNoActiveGroup
+	}
 
 	// charged fee if necessary; If found any coins that exceed limit then return error
 	feePerSigner := sdk.NewCoins()
-	totalFee := sdk.NewCoins()
 	if sender.String() != k.authority {
 		feePerSigner = k.GetParams(ctx).Fee
-		totalFee = feePerSigner.MulInt(sdk.NewInt(int64(currentGroup.Threshold)))
+		totalFee := feePerSigner.MulInt(sdk.NewInt(int64(currentGroup.Threshold)))
 		for _, fc := range totalFee {
 			limitAmt := feeLimit.AmountOf(fc.Denom)
 			if fc.Amount.GT(limitAmt) {
@@ -161,6 +163,12 @@ func (k Keeper) HandleCreateSigning(
 				)
 			}
 		}
+
+		// transfer fee to module account.
+		err = k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, totalFee)
+		if err != nil {
+			return 0, err
+		}
 	}
 
 	currentGroupSigning, err := k.tssKeeper.CreateSigning(ctx, currentGroup, content)
@@ -183,14 +191,6 @@ func (k Keeper) HandleCreateSigning(
 		replacingGroupSigningID = replacingGroupSigning.ID
 	}
 
-	// transfer fee to module account.
-	if !totalFee.IsZero() {
-		err = k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, totalFee)
-		if err != nil {
-			return 0, err
-		}
-	}
-
 	// save signing info
 	bandtssSigningID := k.AddSigning(ctx, types.Signing{
 		Fee:                     feePerSigner,

x/bandtss/keeper/signing.go

@@ -156,6 +156,7 @@ func (k Keeper) HandleExpiredSignings(ctx sdk.Context) {
 
 		// Remove all partial signatures from the store
 		k.DeletePartialSignatures(ctx, signing.ID)
+		k.DeletePartialSignatureCount(ctx, signing.ID)
 
 		// Set the last expired signing ID to the current signing ID
 		k.SetLastExpiredSigningID(ctx, currentSigningID)