Update keyshare module begin block logic

Fairblock · Jun 22, 2023 · e1505c6 · e1505c6
1 parent 1bef14d
commit e1505c6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/x/keyshare/module.go b/x/keyshare/module.go
@@ -198,15 +198,19 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 		}
 	}
 
-	if foundQk && foundQc {
+	if foundQk {
 		if qk.Expiry > height {
-			am.keeper.SetActiveCommitments(ctx, qc)
 			am.keeper.SetActivePubKey(ctx, types.ActivePubKey(qk))
 			am.pepKeeper.SetActivePubKey(ctx, peptypes.ActivePubKey(qk))
+			if foundQc {
+				am.keeper.SetActiveCommitments(ctx, qc)
+			}
 		}
 		am.keeper.DeleteQueuedPubKey(ctx)
 		am.pepKeeper.DeleteQueuedPubKey(ctx)
-		am.keeper.DeleteQueuedCommitments(ctx)
+		if foundQc {
+			am.keeper.DeleteQueuedCommitments(ctx)
+		}
 	}
 }