feat: Allow undelegation from bankrupt delegatee

planetarium · Jan 15, 2025 · 3bc8409 · 3bc8409
1 parent fa466c8
commit 3bc8409
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Lib9c/Action/ClaimStakeReward.cs b/Lib9c/Action/ClaimStakeReward.cs
@@ -149,7 +149,7 @@ public static IWorld Claim(
             var stakeRegularRewardSheet = sheets.GetSheet<StakeRegularRewardSheet>();
             // NOTE:
             var ncg = states.GetGoldCurrency();
-            var stakedNcg = states.GetStaked(stakeStateAddress);
+            var stakedNcg = states.GetStaked(context.Signer);
             var stakingLevel = Math.Min(
                 stakeRegularRewardSheet.FindLevelByStakedAmount(
                     context.Signer,

diff --git a/Lib9c/Delegation/Delegatee.cs b/Lib9c/Delegation/Delegatee.cs
@@ -227,7 +227,7 @@ public virtual BigInteger Bond(TDelegator delegator, FungibleAssetValue fav, lon
         public FungibleAssetValue Unbond(TDelegator delegator, BigInteger share, long height)
         {
             DistributeReward(delegator, height);
-            if (TotalShares.IsZero || TotalDelegated.RawValue.IsZero)
+            if (TotalShares.IsZero)
             {
                 throw new InvalidOperationException(
                     "Cannot unbond without bonding.");

diff --git a/Lib9c/Delegation/Delegator.cs b/Lib9c/Delegation/Delegator.cs
@@ -113,17 +113,20 @@ public virtual void Undelegate(
             }
 
             FungibleAssetValue fav = delegatee.Unbond((TDelegator)this, share, height);
-            unbondLockIn = unbondLockIn.LockIn(
-                fav, height, height + delegatee.UnbondingPeriod);
+
+            if (fav.Sign > 0)
+            {
+                unbondLockIn = unbondLockIn.LockIn(
+                    fav, height, height + delegatee.UnbondingPeriod);
+                AddUnbondingRef(delegatee, UnbondingFactory.ToReference(unbondLockIn));
+                Repository.SetUnbondLockIn(unbondLockIn);
+            }
 
             if (Repository.GetBond(delegatee, Address).Share.IsZero)
             {
                 Metadata.RemoveDelegatee(delegatee.Address);
             }
 
-            AddUnbondingRef(delegatee, UnbondingFactory.ToReference(unbondLockIn));
-
-            Repository.SetUnbondLockIn(unbondLockIn);
             Repository.SetDelegator((TDelegator)this);
         }