check is ok

KuChainNetwork · Oct 20, 2020 · baf60a5 · baf60a5
1 parent 7617d68
commit baf60a5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/utils/version/checkok.go b/utils/version/checkok.go
@@ -4,6 +4,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+const (
+	DiffBlockBy051 = 657925
+)
+
 func MakeOk(ctx sdk.Context) {
 	switch ctx.BlockHeight() {
 	case 567025:

diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/KuChainNetwork/kuchain/chain/constants"
+	"github.com/KuChainNetwork/kuchain/utils/version"
 	stakingexport "github.com/KuChainNetwork/kuchain/x/staking/exported"
 	"github.com/KuChainNetwork/kuchain/x/staking/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -171,9 +172,11 @@ func (k Keeper) IterateUnbondingDelegations(ctx sdk.Context, fn func(index int64
 func (k Keeper) HasMaxUnbondingDelegationEntries(ctx sdk.Context,
 	delegatorAddr AccountID, validatorAddr AccountID) bool {
 
-	name, ok := delegatorAddr.ToName()
-	if ok && constants.IsSystemAccount(name) {
-		return false
+	if ctx.BlockHeight() >= (version.DiffBlockBy051 - 5) {
+		name, ok := delegatorAddr.ToName()
+		if ok && constants.IsSystemAccount(name) {
+			return false
+		}
 	}
 
 	ubd, found := k.GetUnbondingDelegation(ctx, delegatorAddr, validatorAddr)
@@ -334,10 +337,13 @@ func (k Keeper) GetRedelegationsFromSrcValidator(ctx sdk.Context, valAddr Accoun
 func (k Keeper) HasReceivingRedelegation(ctx sdk.Context,
 	delAddr AccountID, valDstAddr AccountID) bool {
 
-	name, ok := delAddr.ToName()
-	if ok && constants.IsSystemAccount(name) {
-		return false
+	if ctx.BlockHeight() >= (version.DiffBlockBy051 - 5) {
+		name, ok := delAddr.ToName()
+		if ok && constants.IsSystemAccount(name) {
+			return false
+		}
 	}
+
 	store := ctx.KVStore(k.storeKey)
 	prefix := types.GetREDsByDelToValDstIndexKey(delAddr, valDstAddr)
 	iterator := sdk.KVStorePrefixIterator(store, prefix)
@@ -351,9 +357,11 @@ func (k Keeper) HasMaxRedelegationEntries(ctx sdk.Context,
 	delegatorAddr AccountID, validatorSrcAddr,
 	validatorDstAddr AccountID) bool {
 
-	name, ok := delegatorAddr.ToName()
-	if ok && constants.IsSystemAccount(name) {
-		return false
+	if ctx.BlockHeight() >= (version.DiffBlockBy051 - 5) {
+		name, ok := delegatorAddr.ToName()
+		if ok && constants.IsSystemAccount(name) {
+			return false
+		}
 	}
 
 	red, found := k.GetRedelegation(ctx, delegatorAddr, validatorSrcAddr, validatorDstAddr)