conf: update mainnet conf

nebulasio · Aug 21, 2018 · 325381d · 325381d
1 parent a999128
commit 325381d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -8,7 +8,7 @@ meta {
 
 candidate [
     {
-        serial: 3956
+        serial: 3957
         dynasty: [
             "n1MxH4KTYAVKU9cFR4mEpLCNEqnZrrwkYgD",
             "n1UoRgbmVtCMqpXjVAwa46z4f38kLWzUxJM",