bugfix: fix logic error in dpos methods

planetarium · Apr 9, 2024 · 939328c · 939328c
1 parent 24bca50
commit 939328c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/Lib9c/Action/DPoS/Control/Bond.cs b/Lib9c/Action/DPoS/Control/Bond.cs
@@ -81,8 +81,6 @@ internal static (IWorld, FungibleAssetValue) Cancel(
             Address delegationAddress,
             IImmutableSet<Currency> nativeTokens)
         {
-            long blockHeight = ctx.BlockIndex;
-
             // Currency check
             if (!share.Currency.Equals(Asset.Share))
             {

diff --git a/Lib9c/Action/DPoS/Control/DelegateCtrl.cs b/Lib9c/Action/DPoS/Control/DelegateCtrl.cs
@@ -9,6 +9,7 @@
 using Nekoyume.Action.DPoS.Model;
 using Nekoyume.Action.DPoS.Util;
 using Nekoyume.Module;
+using Serilog;
 
 namespace Nekoyume.Action.DPoS.Control
 {
@@ -122,6 +123,12 @@ internal static IWorld Distribute(
                     delegation.LatestDistributeHeight,
                     blockHeight);
 
+                // Skip if there is no reward to distribute.
+                if (delegationRewardSum.RawValue == 0)
+                {
+                    continue;
+                }
+
                 if (!(ValidatorCtrl.TokenPortionByShare(
                     states,
                     delegation.ValidatorAddress,

diff --git a/Lib9c/Action/DPoS/Control/ValidatorCtrl.cs b/Lib9c/Action/DPoS/Control/ValidatorCtrl.cs
@@ -214,12 +214,17 @@ internal static IWorld Unbond(
             validator.UnbondingCompletionBlockHeight = blockHeight + UnbondingSet.Period;
             if (validator.Status == BondingStatus.Bonded)
             {
-                states = states.TransferAsset(
-                    ctx,
-                    ReservedAddress.BondedPool,
-                    ReservedAddress.UnbondedPool,
-                    Asset.GovernanceFromConsensus(
-                        states.GetBalance(validator.Address, Asset.ConsensusToken)));
+                var consensusToken = states.GetBalance(validator.Address, Asset.ConsensusToken);
+                if (consensusToken.RawValue > 0)
+                {
+                    // Transfer consensus token to unbonded pool if remaining.
+                    states = states.TransferAsset(
+                        ctx,
+                        ReservedAddress.BondedPool,
+                        ReservedAddress.UnbondedPool,
+                        Asset.GovernanceFromConsensus(
+                            states.GetBalance(validator.Address, Asset.ConsensusToken)));
+                }
             }
 
             validator.Status = BondingStatus.Unbonding;