diff options
| author | Wei-Ning Huang <aitjcize@gmail.com> | 2018-11-14 10:57:53 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 58490067c97e072678540ba5a5fcb7c34b09e04a (patch) | |
| tree | c820cd9b900f2b3533571f656b35d8fdd8e60a6b /dex | |
| parent | 95e89d44a3d9ffd300aa2cb7519b45cea155c89b (diff) | |
| download | dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar.gz dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar.bz2 dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar.lz dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar.xz dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.tar.zst dexon-58490067c97e072678540ba5a5fcb7c34b09e04a.zip | |
core: validate DKG set with correct nodeset in round-2 (#19)
* vendor: sync consensus core
* core: validate DKG set with correct nodeset in round-2
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/governance.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dex/governance.go b/dex/governance.go index 92a8789b3..0251d2afd 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -24,8 +24,6 @@ import ( "github.com/dexon-foundation/dexon/rpc" ) -const configActivationOffset = 2 - type DexconGovernance struct { b *DexAPIBackend chainConfig *params.ChainConfig @@ -68,10 +66,10 @@ func (d *DexconGovernance) getGovState() *vm.GovernanceStateHelper { } func (d *DexconGovernance) getGovStateAtRound(round uint64) *vm.GovernanceStateHelper { - if round < configActivationOffset { + if round < dexCore.ConfigRoundShift { round = 0 } else { - round -= configActivationOffset + round -= dexCore.ConfigRoundShift } ctx := context.Background() blockHeight, err := d.getRoundHeight(ctx, round) |