From 77882898913a3e2ed0a0ce59090a4e62da39c58f Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@dexon.org>
Date: Mon, 22 Oct 2018 19:53:24 +0800
Subject: dex: fix round switching and initialize dMoment correctly

---
 core/vm/governance.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/vm/governance.go b/core/vm/governance.go
index 5e6cc0b4d..d30987b11 100644
--- a/core/vm/governance.go
+++ b/core/vm/governance.go
@@ -1413,7 +1413,8 @@ func (g *GovernanceContract) addDKGComplaint(round *big.Int, comp []byte) ([]byt
 }
 
 func (g *GovernanceContract) addDKGMasterPublicKey(round *big.Int, mpk []byte) ([]byte, error) {
-	if round.Cmp(g.state.Round()) != 0 {
+	// Can only add DKG master public key of current and next round.
+	if round.Cmp(new(big.Int).Add(g.state.Round(), big.NewInt(1))) > 0 {
 		g.penalize()
 		return nil, errExecutionReverted
 	}
-- 
cgit v1.2.3