From b8821203f844607d0ae01e6cff075641daa5f431 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Thu, 25 Apr 2019 11:52:46 +0800 Subject: vendor: sync to latest core (#394) --- .../dexon-consensus/core/configuration-chain.go | 12 ++++++------ .../dexon-consensus/core/dkg-tsig-protocol.go | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'vendor/github.com') diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go index 4e70ff087..3b4cdbbc8 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go @@ -70,6 +70,7 @@ type configurationChain struct { dkgLock sync.RWMutex dkgSigner map[uint64]*dkgShareSecret npks map[uint64]*typesDKG.NodePublicKeys + complaints []*typesDKG.Complaint dkgResult sync.RWMutex tsig map[common.Hash]*tsigProtocol tsigTouched map[common.Hash]struct{} @@ -321,8 +322,8 @@ func (cc *configurationChain) runDKGPhaseFour() { func (cc *configurationChain) runDKGPhaseFiveAndSix(round uint64, reset uint64) { // Phase 5(T = 2λ): Propose Anti nack complaint. cc.logger.Debug("Calling Governance.DKGComplaints", "round", round) - complaints := cc.gov.DKGComplaints(round) - if err := cc.dkg.processNackComplaints(complaints); err != nil { + cc.complaints = cc.gov.DKGComplaints(round) + if err := cc.dkg.processNackComplaints(cc.complaints); err != nil { cc.logger.Error("Failed to process NackComplaint", "round", round, "reset", reset, @@ -333,9 +334,9 @@ func (cc *configurationChain) runDKGPhaseFiveAndSix(round uint64, reset uint64) // Rebroadcast is done in `processPrivateShare`. } -func (cc *configurationChain) runDKGPhaseSeven(complaints []*typesDKG.Complaint) { +func (cc *configurationChain) runDKGPhaseSeven() { // Phase 7(T = 4λ): Enforce complaints and nack complaints. - cc.dkg.enforceNackComplaints(complaints) + cc.dkg.enforceNackComplaints(cc.complaints) // Enforce complaint is done in `processPrivateShare`. } @@ -425,8 +426,7 @@ func (cc *configurationChain) initDKGPhasesFunc() { return nil }, func(round uint64, reset uint64) error { - complaints := cc.gov.DKGComplaints(round) - cc.runDKGPhaseSeven(complaints) + cc.runDKGPhaseSeven() return nil }, func(round uint64, reset uint64) error { diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go index 8383ad118..d4235a496 100644 --- a/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go +++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go @@ -392,6 +392,9 @@ func (d *dkgProtocol) processNackComplaints(complaints []*typesDKG.Complaint) ( func (d *dkgProtocol) enforceNackComplaints(complaints []*typesDKG.Complaint) { for _, complaint := range complaints { + if d.round != complaint.Round || d.reset != complaint.Reset { + continue + } if !complaint.IsNack() { continue } -- cgit v1.2.3