diff --git a/consensus/dpos/dpos.go b/consensus/dpos/dpos.go index 3f3525aae..9069cc69f 100644 --- a/consensus/dpos/dpos.go +++ b/consensus/dpos/dpos.go @@ -648,17 +648,6 @@ func (dpos *Dpos) mintBlock(now int64) error { tail := dpos.chain.TailBlock() - if core.DynastyConf != nil { - core.InitDynastyFromConf(dpos.chain, BlockIntervalInMs/SecondInMs, DynastyIntervalInMs/SecondInMs) - if core.GenesisRealTimestamp > 0 && (tail.Timestamp()-core.GenesisRealTimestamp) >= core.InitialDynastyKeepTime { - logging.VLog().WithFields(logrus.Fields{ - "tail": tail, - "miner": dpos.miner, - }).Debug("Stop minting for dynasty switch.") - return nil - } - } - deadlineInMs, err := dpos.checkDeadline(tail, nowInMs) if err != nil { logging.VLog().WithFields(logrus.Fields{ diff --git a/mainnet/conf/dynasty.conf b/mainnet/conf/dynasty.conf index 838202b67..bb401d428 100644 --- a/mainnet/conf/dynasty.conf +++ b/mainnet/conf/dynasty.conf @@ -8,7 +8,7 @@ meta { candidate [ { - serial: 3956 + serial: 3957 dynasty: [ "n1MxH4KTYAVKU9cFR4mEpLCNEqnZrrwkYgD", "n1UoRgbmVtCMqpXjVAwa46z4f38kLWzUxJM",