Merge pull request #2126 from planetarium/release/4

release: version 4
planetarium · Jul 11, 2023 · 4fe61b8 · 4fe61b8
2 parents 14ca945 + ced0918
commit 4fe61b8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/Lib9c b/Lib9c
diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs
@@ -191,7 +191,9 @@ public void ClaimStakeReward(string addressString, int expectedCode)
         [InlineData(ClaimStakeReward2.ObsoletedIndex, typeof(ClaimStakeReward2))]
         [InlineData(ClaimStakeReward2.ObsoletedIndex + 1, typeof(ClaimStakeReward3))]
         [InlineData(ClaimStakeReward3.ObsoleteBlockIndex, typeof(ClaimStakeReward3))]
-        [InlineData(ClaimStakeReward3.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward))]
+        [InlineData(ClaimStakeReward3.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward4))]
+        [InlineData(ClaimStakeReward4.ObsoleteBlockIndex, typeof(ClaimStakeReward4))]
+        [InlineData(ClaimStakeReward4.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward))]
         [InlineData(long.MaxValue, typeof(ClaimStakeReward))]
         public void ClaimStakeRewardWithBlockIndex(long blockIndex, Type expectedActionType)
         {
@@ -217,8 +219,8 @@ public void ClaimStakeRewardWithBlockIndex(long blockIndex, Type expectedActionT
 
         [Theory]
         [InlineData(0, 0, -1)]
-        [InlineData(1, 4, 0)]
-        [InlineData(5, 5, -1)]
+        [InlineData(1, 5, 0)]
+        [InlineData(6, 6, -1)]
         public void ClaimStakeRewardWithActionVersion(
             int actionVersionMin,
             int actionVersionMax,

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/TxCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/TxCommandTest.cs
@@ -103,6 +103,7 @@ public void Sign_Stake(bool gas)
         [InlineData(null, 2, true)]
         [InlineData(null, 3, false)]
         [InlineData(null, 4, true)]
+        [InlineData(null, 5, false)]
         public void Sign_ClaimStakeReward(long? blockIndex, int? actionVersion, bool gas)
         {
             var filePath = Path.Combine(Path.GetTempPath(), Path.GetTempFileName());

diff --git a/NineChronicles.Headless.Executable/Commands/TxCommand.cs b/NineChronicles.Headless.Executable/Commands/TxCommand.cs
@@ -72,6 +72,7 @@ public void Sign(
                     nameof(ClaimStakeReward1) => new ClaimStakeReward1(),
                     nameof(ClaimStakeReward2) => new ClaimStakeReward2(),
                     nameof(ClaimStakeReward3) => new ClaimStakeReward3(),
+                    nameof(ClaimStakeReward4) => new ClaimStakeReward4(),
                     nameof(ClaimStakeReward) => new ClaimStakeReward(),
                     nameof(TransferAsset) => new TransferAsset(),
                     nameof(MigrateMonsterCollection) => new MigrateMonsterCollection(),

diff --git a/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs b/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs
@@ -56,27 +56,8 @@ public StakeStateType()
             Field<NonNullGraphType<LongGraphType>>(
                 "claimableBlockIndex",
                 description: "The block index the user can claim rewards.",
-                resolve: context =>
-                {
-                    var stakeState = context.Source.StakeState;
-                    if (context.Source.BlockIndex >= ActionObsoleteConfig.V100290ObsoleteIndex)
-                    {
-                        if (stakeState.ReceivedBlockIndex > 0)
-                        {
-                            long lastStep = Math.DivRem(
-                                stakeState.ReceivedBlockIndex - stakeState.StartedBlockIndex,
-                                StakeState.RewardInterval,
-                                out _
-                            );
-
-                            return stakeState.StartedBlockIndex + (lastStep + 1) * StakeState.RewardInterval;
-                        }
-
-                        return stakeState.StartedBlockIndex + StakeState.RewardInterval;
-                    }
-
-                    return Math.Max(stakeState.StartedBlockIndex, stakeState.ReceivedBlockIndex) + StakeState.RewardInterval;
-                });
+                resolve: context => context.Source.StakeState.GetClaimableBlockIndex(
+                    context.Source.BlockIndex));
             Field<NonNullGraphType<StakeAchievementsType>>(
                 nameof(StakeState.Achievements),
                 description: "The staking achievements.",
+306 −0		.Lib9c.Tests/Action/ClaimStakeReward4Test.cs
+49 −12		.Lib9c.Tests/Action/ClaimStakeRewardTest.cs
+4 −0		.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs
+46 −0		.Lib9c.Tests/Model/State/StakeStateTest.cs
+1 −1		Lib9c/Action/ClaimStakeReward.cs
+333 −0		Lib9c/Action/ClaimStakeReward4.cs
+8 −2		Lib9c/Action/Factory/ClaimStakeRewardFactory.cs
+2 −3		Lib9c/ActionObsoleteConfig.cs
+96 −17		Lib9c/Model/State/StakeState.cs