Merge pull request #805 from planetarium/release/211

Release 211
planetarium · Nov 15, 2024 · 9cfd97f · 9cfd97f
2 parents 3fd50b2 + c13de1d
commit 9cfd97f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs b/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs
@@ -913,9 +913,9 @@ string network
                                 {
                                     fbAgents.Add(fbAvatarState.agentAddress.ToString());
 
-                                    if (fbOutputState.TryGetStakeStateV2(fbAvatarState.agentAddress, out StakeStateV2 fbStakeState2))
+                                    if (fbOutputState.TryGetStakeState(fbAvatarState.agentAddress, out StakeState fbStakeState2))
                                     {
-                                        var fbStakeStateAddress = StakeStateV2.DeriveAddress(fbAvatarState.agentAddress);
+                                        var fbStakeStateAddress = StakeState.DeriveAddress(fbAvatarState.agentAddress);
                                         var fbCurrency = fbOutputState.GetGoldCurrency();
                                         var fbStakedBalance = fbOutputState.GetBalance(fbStakeStateAddress, fbCurrency);
                                         _fbUsBulkFile.WriteLine(
@@ -1388,9 +1388,9 @@ string network
                             }
                             else
                             {
-                                if (outputState.TryGetStakeStateV2(avatarState.agentAddress, out StakeStateV2 stakeState2))
+                                if (outputState.TryGetStakeState(avatarState.agentAddress, out StakeState stakeState2))
                                 {
-                                    var stakeStateAddress = StakeStateV2.DeriveAddress(avatarState.agentAddress);
+                                    var stakeStateAddress = StakeState.DeriveAddress(avatarState.agentAddress);
                                     var currency = outputState.GetGoldCurrency();
                                     var stakedBalance = outputState.GetBalance(stakeStateAddress, currency);
                                     _usBulkFile.WriteLine(

diff --git a/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs b/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs
@@ -227,11 +227,11 @@ public void Migration(
                         if (!agents.Contains(avatarState.agentAddress.ToString()))
                         {
                             agents.Add(avatarState.agentAddress.ToString());
-                            if (outputState.TryGetStakeStateV2(
+                            if (outputState.TryGetStakeState(
                                     avatarState.agentAddress,
                                     out var stakeStateV2))
                             {
-                                var stakeAddress = StakeStateV2.DeriveAddress(avatarState.agentAddress);
+                                var stakeAddress = StakeState.DeriveAddress(avatarState.agentAddress);
                                 var currency = outputState.GetGoldCurrency();
                                 var stakedBalance = outputState.GetBalance(stakeAddress, currency);
                                 _usBulkFile.WriteLine(

diff --git a/NineChronicles.DataProvider/DataRendering/ClaimStakeRewardData.cs b/NineChronicles.DataProvider/DataRendering/ClaimStakeRewardData.cs
@@ -25,7 +25,7 @@ DateTimeOffset blockTime
         {
             long claimStakeStartBlockIndex;
             long claimStakeEndBlockIndex;
-            if (previousStates.TryGetStakeStateV2(signer, out var prevStakeStateV2))
+            if (previousStates.TryGetStakeState(signer, out var prevStakeStateV2))
             {
                 claimStakeStartBlockIndex = prevStakeStateV2.StartedBlockIndex;
                 claimStakeEndBlockIndex = prevStakeStateV2.ReceivedBlockIndex;

diff --git a/NineChronicles.DataProvider/DataRendering/Grinding/GrindingData.cs b/NineChronicles.DataProvider/DataRendering/Grinding/GrindingData.cs
@@ -66,9 +66,9 @@ DateTimeOffset blockTime
 
             var currency = previousStates.GetGoldCurrency();
             var stakedAmount = 0 * currency;
-            if (previousStates.TryGetStakeStateV2(signer, out _))
+            if (previousStates.TryGetStakeState(signer, out _))
             {
-                var stakeAddr = StakeStateV2.DeriveAddress(signer);
+                var stakeAddr = StakeState.DeriveAddress(signer);
                 stakedAmount = previousStates.GetBalance(stakeAddr, currency);
             }
             else

diff --git a/NineChronicles.DataProvider/DataRendering/MigrateMonsterCollectionData.cs b/NineChronicles.DataProvider/DataRendering/MigrateMonsterCollectionData.cs
@@ -19,7 +19,7 @@ public static MigrateMonsterCollectionModel GetMigrateMonsterCollectionInfo(
             DateTimeOffset blockTime
         )
         {
-            outputStates.TryGetStakeState(signer, out StakeState stakeState);
+            outputStates.TryGetStakeState(signer, out Nekoyume.Model.Stake.StakeState stakeState);
             var agentState = previousStates.GetAgentState(signer);
             if (agentState is null)
             {

diff --git a/NineChronicles.DataProvider/DataRendering/StakeData.cs b/NineChronicles.DataProvider/DataRendering/StakeData.cs
@@ -20,12 +20,12 @@ Guid actionId
         )
         {
             var currency = outputStates.GetGoldCurrency();
-            var stakeAddress = StakeStateV2.DeriveAddress(signer);
+            var stakeAddress = StakeState.DeriveAddress(signer);
             FungibleAssetValue previousAmount;
             FungibleAssetValue newAmount;
             long prevStakeStartBlockIndex;
             long newStakeStartBlockIndex;
-            if (previousStates.TryGetStakeStateV2(signer, out var prevStakeStateV2))
+            if (previousStates.TryGetStakeState(signer, out var prevStakeStateV2))
             {
                 previousAmount = previousStates.GetBalance(stakeAddress, currency);
                 prevStakeStartBlockIndex = prevStakeStateV2.StartedBlockIndex;
@@ -36,7 +36,7 @@ Guid actionId
                 prevStakeStartBlockIndex = 0;
             }
 
-            if (outputStates.TryGetStakeStateV2(signer, out var stakeStateV2))
+            if (outputStates.TryGetStakeState(signer, out var stakeStateV2))
             {
                 newAmount = outputStates.GetBalance(stakeAddress, currency);
                 newStakeStartBlockIndex = stakeStateV2.StartedBlockIndex;

diff --git a/NineChronicles.Headless b/NineChronicles.Headless