From e1de43e31318269e6bd36d7773e308e385e93ce4 Mon Sep 17 00:00:00 2001 From: Yumin Xia Date: Mon, 14 Oct 2019 10:57:03 -0700 Subject: [PATCH] Upgrade4: gRevert "update1 (#410)" (#413) * gRevert "update1 (#410)" This reverts commit 91b3006bf493d54edbbda256dd504534192094a8. * fix export typo --- types/const.go | 3 --- x/account/manager/manager.go | 3 --- x/validator/manager/manager.go | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/types/const.go b/types/const.go index d19055ff..fd292909 100644 --- a/types/const.go +++ b/types/const.go @@ -174,9 +174,6 @@ const ( // ValidatorMaxPower - the max power of validator can have ValidatorMaxPower = int64(100000000000) - // Upgrade3Update1 - lower register fee. - Upgrade3Update1 = 27000 - // TxSigLimit - max number of sigs in one transaction // XXX(yumin): This will actually limit the number of msg per tx to at most 2. TxSigLimit = 2 diff --git a/x/account/manager/manager.go b/x/account/manager/manager.go index db8abf62..60fdfba9 100644 --- a/x/account/manager/manager.go +++ b/x/account/manager/manager.go @@ -52,9 +52,6 @@ func (accManager AccountManager) RegisterAccount( return err } minRegFee := accParams.RegisterFee - if ctx.BlockHeight() >= linotypes.Upgrade3Update1 { - minRegFee = linotypes.NewCoinFromInt64(10000) - } if minRegFee.IsGT(registerFee) { return types.ErrRegisterFeeInsufficient() } diff --git a/x/validator/manager/manager.go b/x/validator/manager/manager.go index 10920d29..fdf34b83 100644 --- a/x/validator/manager/manager.go +++ b/x/validator/manager/manager.go @@ -1121,7 +1121,7 @@ func (vm ValidatorManager) ExportToFile(ctx sdk.Context, cdc *codec.Codec, filep }) // export votes - substores[string(model.ValidatorListSubstore)].Iterate(func(key []byte, val interface{}) bool { + substores[string(model.ElectionVoteListSubstore)].Iterate(func(key []byte, val interface{}) bool { user := linotypes.AccountKey(key) votelist := val.(*model.ElectionVoteList) votesIR := make([]model.ElectionVoteIR, 0)