Merge pull request #2687 from planetarium/chore/apply-dynamic-unbondi…

…ng-period

Apply dynamic unbonding period

NineChronicles.Headless/BlockChainService.cs

@@ -357,18 +357,6 @@ public UnaryResult<byte[]> GetBalanceByStateRootHash(
             return new UnaryResult<byte[]>(encoded);
         }
 
-        public UnaryResult<byte[]> GetUnbondClaimableHeightByBlockHash(
-            byte[] blockHashBytes, byte[] addressBytes)
-        {
-            var blockHash = new BlockHash(blockHashBytes);
-            var address = new Address(addressBytes);
-            var worldState = _worldStateRepository.GetWorldState(blockHash);
-            var result = GetUnbondClaimableHeight(worldState, address);
-
-            byte[] encoded = _codec.Encode(result);
-            return new UnaryResult<byte[]>(encoded);
-        }
-
         public UnaryResult<byte[]> GetUnbondClaimableHeightByStateRootHash(
             byte[] stateRootHashBytes, byte[] addressBytes)
         {
@@ -381,18 +369,6 @@ public UnaryResult<byte[]> GetUnbondClaimableHeightByStateRootHash(
             return new UnaryResult<byte[]>(encoded);
         }
 
-        public UnaryResult<byte[]> GetClaimableRewardsByBlockHash(
-            byte[] blockHashBytes, byte[] addressBytes)
-        {
-            var blockHash = new BlockHash(blockHashBytes);
-            var address = new Address(addressBytes);
-            var worldState = _worldStateRepository.GetWorldState(blockHash);
-            var result = GetClaimableRewards(worldState, address);
-
-            byte[] encoded = _codec.Encode(result);
-            return new UnaryResult<byte[]>(encoded);
-        }
-
         public UnaryResult<byte[]> GetClaimableRewardsByStateRootHash(
             byte[] stateRootHashBytes, byte[] addressBytes)
         {
@@ -405,18 +381,6 @@ public UnaryResult<byte[]> GetClaimableRewardsByStateRootHash(
             return new UnaryResult<byte[]>(encoded);
         }
 
-        public UnaryResult<byte[]> GetDelegationInfoByBlockHash(
-            byte[] blockHashBytes, byte[] addressBytes)
-        {
-            var blockHash = new BlockHash(blockHashBytes);
-            var address = new Address(addressBytes);
-            var worldState = _worldStateRepository.GetWorldState(blockHash);
-            var result = GetDelegationInfo(worldState, address);
-
-            byte[] encoded = _codec.Encode(result);
-            return new UnaryResult<byte[]>(encoded);
-        }
-
         public UnaryResult<byte[]> GetDelegationInfoByStateRootHash(
             byte[] stateRootHashBytes, byte[] addressBytes)
         {
@@ -429,18 +393,6 @@ public UnaryResult<byte[]> GetDelegationInfoByStateRootHash(
             return new UnaryResult<byte[]>(encoded);
         }
 
-        public UnaryResult<byte[]> GetStakedByBlockHash(
-            byte[] blockHashBytes, byte[] addressBytes)
-        {
-            var blockHash = new BlockHash(blockHashBytes);
-            var address = new Address(addressBytes);
-            var worldState = _worldStateRepository.GetWorldState(blockHash);
-            var result = GetStaked(worldState, address);
-
-            byte[] encoded = _codec.Encode(result);
-            return new UnaryResult<byte[]>(encoded);
-        }
-
         public UnaryResult<byte[]> GetStakedByStateRootHash(
             byte[] stateRootHashBytes, byte[] addressBytes)
         {
@@ -546,16 +498,20 @@ private static IValue GetUnbondClaimableHeight(IWorldState worldState, Address a
             var repository = new GuildRepository(new World(worldState), new HallowActionContext { });
             try
             {
-                var guildAddress = repository.GetGuildParticipant(address).GuildAddress;
-                var validatorAddress = repository.GetGuild(guildAddress).ValidatorAddress;
-                var guildDelegatee = repository.GetDelegatee(validatorAddress);
-                var unbondLockIn = repository.GetUnbondLockIn(guildDelegatee, address);
-                var unbondClaimableHeight = unbondLockIn.LowestExpireHeight;
-                return new Integer(unbondClaimableHeight);
-            }
-            catch (FailedLoadStateException)
-            {
-                return new Integer(-1L);
+                var delegator = repository.GetDelegator(address);
+                var expireHeights = delegator.UnbondingRefs
+                    .Select(r => UnbondingFactory.GetUnbondingFromRef(r, repository))
+                    .Where(u => u is UnbondLockIn)
+                    .Select(u => u.LowestExpireHeight);
+
+                if (expireHeights.Any())
+                {
+                    return new Integer(expireHeights.Min());
+                }
+                else
+                {
+                    return new Integer(-1L);
+                }
             }
             catch (Exception e)
             {