fix: Block leaving guild while unbonding

planetarium · Jan 22, 2025 · d966331 · d966331
1 parent c9f098f
commit d966331
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/.Lib9c.Tests/Action/Guild/QuitGuildTest.cs b/.Lib9c.Tests/Action/Guild/QuitGuildTest.cs
@@ -222,12 +222,25 @@ private void ExecuteWithFixture(IQuitGuildFixture fixture)
         var expectedTotalGG = slashedGG - expectedAgengGG;
         var expectedTotalShares = totalShare - agentShare;
         var quitGuild = new QuitGuild();
+
+        world = EnsureToStake(world, agentAddress, agentNCG.Currency * 50, height++);
         var actionContext = new ActionContext
         {
             PreviousState = world,
             Signer = agentAddress,
             BlockIndex = height++,
         };
+
+        Assert.Throws<InvalidOperationException>(() => world = quitGuild.Execute(actionContext));
+        height += ValidatorDelegatee.DefaultUnbondingPeriod;
+        world = EnsureToReleaseUnbonding(world, agentAddress, height++);
+        actionContext = new ActionContext
+        {
+            PreviousState = world,
+            Signer = agentAddress,
+            BlockIndex = height++,
+        };
+
         world = quitGuild.Execute(actionContext);
         var delegatee = new GuildRepository(world, new ActionContext { }).GetDelegatee(validatorKey.Address);
         world = EnsureToReleaseUnbonding(
@@ -241,9 +254,10 @@ private void ExecuteWithFixture(IQuitGuildFixture fixture)
 
         Assert.Throws<FailedLoadStateException>(
             () => guildRepository.GetGuildParticipant(agentAddress));
-        Assert.Equal(expectedTotalGG, guildDelegatee.TotalDelegated);
+        var comparerGG = new FungibleAssetValueEqualityComparer(GGEpsilon);
+        Assert.Equal(expectedTotalGG, guildDelegatee.TotalDelegated, comparerGG);
         Assert.Equal(expectedTotalShares, guildDelegatee.TotalShares);
-        Assert.Equal(expectedTotalGG, validatorDelegatee.TotalDelegated);
+        Assert.Equal(expectedTotalGG, validatorDelegatee.TotalDelegated, comparerGG);
         Assert.Equal(expectedTotalShares, validatorDelegatee.TotalShares);
     }
 

diff --git a/.Lib9c.Tests/Action/Guild/RemoveGuildTest.cs b/.Lib9c.Tests/Action/Guild/RemoveGuildTest.cs
@@ -301,7 +301,18 @@ private void ExecuteWithFixture(IRemoveGuildFixture fixture)
         {
             PreviousState = world,
             Signer = masterAddress,
-            BlockIndex = height,
+            BlockIndex = height++,
+        };
+        Assert.Throws<InvalidOperationException>(() => removeGuild.Execute(actionContext));
+
+        height += ValidatorDelegatee.DefaultUnbondingPeriod;
+        world = EnsureToReleaseUnbonding(world, masterAddress, height++);
+
+        actionContext = new ActionContext
+        {
+            PreviousState = world,
+            Signer = masterAddress,
+            BlockIndex = height++,
         };
         world = removeGuild.Execute(actionContext);
 

diff --git a/Lib9c/Module/Guild/GuildModule.cs b/Lib9c/Module/Guild/GuildModule.cs
@@ -103,6 +103,12 @@ public static GuildRepository RemoveGuild(
                 throw new InvalidOperationException("There are remained participants in the guild.");
             }
 
+            if (repository.GetDelegator(signer).UnbondingRefs.Count > 0)
+            {
+                throw new InvalidOperationException(
+                    $"The signer cannot remove guild while unbonding");
+            }
+
             var delegatee = repository.GetDelegatee(guild.ValidatorAddress);
             var bond = repository.GetBond(delegatee, signer);
             if (bond.Share > 0)

diff --git a/Lib9c/Module/Guild/GuildParticipantModule.cs b/Lib9c/Module/Guild/GuildParticipantModule.cs
@@ -117,6 +117,12 @@ public static GuildRepository LeaveGuild(
                     "The signer is a guild master. Guild master cannot quit the guild.");
             }
 
+            if (repository.GetDelegator(agentAddress).UnbondingRefs.Count > 0)
+            {
+                throw new InvalidOperationException(
+                    $"The signer cannot leave guild while unbonding");
+            }
+
             var height = repository.ActionContext.BlockIndex;
             var guildParticipant = repository.GetGuildParticipant(agentAddress);
             var delegatee = repository.GetDelegatee(guild.ValidatorAddress);