wormchain: only latest guardian set is exempt from expiry (#3714)

wormhole-foundation · Jan 17, 2024 · 521cff4 · 521cff4
1 parent a858d76
commit 521cff4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/wormchain/x/wormhole/keeper/vaa.go b/wormchain/x/wormhole/keeper/vaa.go
@@ -33,7 +33,9 @@ func (k Keeper) CalculateQuorum(ctx sdk.Context, guardianSetIndex uint32) (int,
 		return 0, nil, types.ErrGuardianSetNotFound
 	}
 
-	if 0 < guardianSet.ExpirationTime && guardianSet.ExpirationTime < uint64(ctx.BlockTime().Unix()) {
+	latestGuardianSetIndex := k.GetLatestGuardianSetIndex(ctx)
+
+	if guardianSet.Index != latestGuardianSetIndex && guardianSet.ExpirationTime < uint64(ctx.BlockTime().Unix()) {
 		return 0, nil, types.ErrGuardianSetExpired
 	}
 

diff --git a/wormchain/x/wormhole/keeper/vaa_test.go b/wormchain/x/wormhole/keeper/vaa_test.go
@@ -56,25 +56,28 @@ func TestKeeperCalculateQuorum(t *testing.T) {
 
 	tests := []struct {
 		label            string
-		guardianSet      types.GuardianSet
+		guardianSets     []types.GuardianSet
 		guardianSetIndex uint32
 		quorum           int
 		willError        bool
 		err              error
 	}{
 
 		{label: "HappyPath",
-			guardianSet:      types.GuardianSet{Index: 0, Keys: addrsBytes, ExpirationTime: 0},
+			guardianSets:     []types.GuardianSet{{Index: 0, Keys: addrsBytes, ExpirationTime: 0}},
 			guardianSetIndex: 0,
 			quorum:           1,
 			willError:        false},
 		{label: "GuardianSetNotFound",
-			guardianSet:      types.GuardianSet{Index: 0, Keys: addrsBytes, ExpirationTime: 0},
+			guardianSets:     []types.GuardianSet{{Index: 0, Keys: addrsBytes, ExpirationTime: 0}},
 			guardianSetIndex: 1,
 			willError:        true,
 			err:              types.ErrGuardianSetNotFound},
 		{label: "GuardianSetExpired",
-			guardianSet:      types.GuardianSet{Index: 0, Keys: addrsBytes, ExpirationTime: 100},
+			guardianSets: []types.GuardianSet{
+				{Index: 0, Keys: addrsBytes, ExpirationTime: 0},
+				{Index: 1, Keys: addrsBytes, ExpirationTime: 0},
+			},
 			guardianSetIndex: 0,
 			willError:        true,
 			err:              types.ErrGuardianSetExpired},
@@ -83,7 +86,9 @@ func TestKeeperCalculateQuorum(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.label, func(t *testing.T) {
 			keeper, ctx := keepertest.WormholeKeeper(t)
-			keeper.AppendGuardianSet(ctx, tc.guardianSet)
+			for _, gs := range tc.guardianSets {
+				keeper.AppendGuardianSet(ctx, gs)
+			}
 			quorum, _, err := keeper.CalculateQuorum(ctx, tc.guardianSetIndex)
 
 			if tc.willError == true {