aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2019-03-29 15:20:03 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:59 +0800
commit081a9da393a17562c29f44c65062ece7f75a79ee (patch)
treee4d86eda216d0ec111cbadb7790db9ebb1a63bbe
parent6786ac62add22e773b5e192e13adfd5ef720869b (diff)
downloaddexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar.gz
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar.bz2
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar.lz
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar.xz
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.tar.zst
dexon-081a9da393a17562c29f44c65062ece7f75a79ee.zip
vendor: sync to latest core
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/configuration-chain.go115
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go24
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go12
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go5
-rw-r--r--vendor/vendor.json46
5 files changed, 121 insertions, 81 deletions
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 92b283098..c8aac38bc 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
@@ -406,17 +406,6 @@ func (cc *configurationChain) runDKGPhaseNine(round uint64, reset uint64) error
return nil
}
-func (cc *configurationChain) runTick(ticker Ticker) (aborted bool) {
- cc.dkgLock.Unlock()
- defer cc.dkgLock.Lock()
- select {
- case <-cc.dkgCtx.Done():
- aborted = true
- case <-ticker.Tick():
- }
- return
-}
-
func (cc *configurationChain) initDKGPhasesFunc() {
cc.dkgRunPhases = []dkgStepFn{
func(round uint64, reset uint64) error {
@@ -448,7 +437,18 @@ func (cc *configurationChain) initDKGPhasesFunc() {
}
}
-func (cc *configurationChain) runDKG(round uint64, reset uint64) (err error) {
+func (cc *configurationChain) runDKG(
+ round uint64, reset uint64, event *common.Event,
+ dkgBeginHeight, dkgHeight uint64) (err error) {
+ // Check if corresponding DKG signer is ready.
+ if _, _, err = cc.getDKGInfo(round, false); err == nil {
+ return ErrSkipButNoError
+ }
+ cfg := utils.GetConfigWithPanic(cc.gov, round, cc.logger)
+ phaseHeight := uint64(
+ cfg.LambdaDKG.Nanoseconds() / cfg.MinBlockInterval.Nanoseconds())
+ skipPhase := int(dkgHeight / phaseHeight)
+ cc.logger.Info("Skipping DKG phase", "phase", skipPhase)
cc.dkgLock.Lock()
defer cc.dkgLock.Unlock()
if cc.dkg == nil {
@@ -467,51 +467,70 @@ func (cc *configurationChain) runDKG(round uint64, reset uint64) (err error) {
panic(fmt.Errorf("duplicated call to runDKG: %d %d", round, reset))
}
cc.dkgRunning = true
- var ticker Ticker
defer func() {
- if ticker != nil {
- ticker.Stop()
- }
// Here we should hold the cc.dkgLock, reset cc.dkg to nil when done.
if cc.dkg != nil {
cc.dkg = nil
}
cc.dkgRunning = false
}()
- // Check if corresponding DKG signer is ready.
- if _, _, err = cc.getDKGInfo(round, true); err == nil {
- return ErrSkipButNoError
+ wg := sync.WaitGroup{}
+ var dkgError error
+ // Make a copy of cc.dkgCtx so each phase function can refer to the correct
+ // context.
+ ctx := cc.dkgCtx
+ cc.dkg.step = skipPhase
+ for i := skipPhase; i < len(cc.dkgRunPhases); i++ {
+ wg.Add(1)
+ event.RegisterHeight(dkgBeginHeight+phaseHeight*uint64(i), func(uint64) {
+ go func() {
+ defer wg.Done()
+ cc.dkgLock.Lock()
+ defer cc.dkgLock.Unlock()
+ if dkgError != nil {
+ return
+ }
+ select {
+ case <-ctx.Done():
+ dkgError = ErrDKGAborted
+ return
+ default:
+ }
+
+ err := cc.dkgRunPhases[cc.dkg.step](round, reset)
+ if err == nil || err == ErrSkipButNoError {
+ err = nil
+ cc.dkg.step++
+ err = cc.db.PutOrUpdateDKGProtocol(cc.dkg.toDKGProtocolInfo())
+ if err != nil {
+ cc.logger.Error("Failed to save DKG Protocol",
+ "step", cc.dkg.step,
+ "error", err)
+ }
+ }
+ if err != nil && dkgError == nil {
+ dkgError = err
+ }
+ }()
+ })
}
- tickStartAt := 1
-
- for i := cc.dkg.step; i < len(cc.dkgRunPhases); i++ {
- if i >= tickStartAt && ticker == nil {
- ticker = newTicker(cc.gov, round, TickerDKG)
- }
-
- if ticker != nil && cc.runTick(ticker) {
- return
- }
-
- switch err = cc.dkgRunPhases[i](round, reset); err {
- case ErrSkipButNoError, nil:
- cc.dkg.step = i + 1
- err = cc.db.PutOrUpdateDKGProtocol(cc.dkg.toDKGProtocolInfo())
- if err != nil {
- return fmt.Errorf("put or update DKG protocol error: %v", err)
- }
-
- if err == nil {
- continue
- } else {
- return
- }
- default:
- return
- }
+ cc.dkgLock.Unlock()
+ wgChan := make(chan struct{}, 1)
+ go func() {
+ wg.Wait()
+ wgChan <- struct{}{}
+ }()
+ select {
+ case <-cc.dkgCtx.Done():
+ case <-wgChan:
}
-
- return nil
+ cc.dkgLock.Lock()
+ select {
+ case <-cc.dkgCtx.Done():
+ return ErrDKGAborted
+ default:
+ }
+ return dkgError
}
func (cc *configurationChain) isDKGFinal(round uint64) bool {
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
index 6d0f68377..6e3072371 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
@@ -849,17 +849,21 @@ func (con *Consensus) prepare(initBlock *types.Block) (err error) {
"reset", e.Reset)
return false
}
- if _, err := typesDKG.NewGroupPublicKey(
+ gpk, err := typesDKG.NewGroupPublicKey(
nextRound,
con.gov.DKGMasterPublicKeys(nextRound),
con.gov.DKGComplaints(nextRound),
- utils.GetDKGThreshold(nextConfig)); err != nil {
+ utils.GetDKGThreshold(nextConfig))
+ if err != nil {
con.logger.Error("Next DKG failed to prepare, reset it",
"round", e.Round,
"reset", e.Reset,
"error", err)
return false
}
+ if len(gpk.QualifyNodeIDs) < utils.GetDKGValidThreshold(nextConfig) {
+ return false
+ }
return true
}
con.event.RegisterHeight(e.NextDKGResetHeight(), func(uint64) {
@@ -976,13 +980,17 @@ func (con *Consensus) prepare(initBlock *types.Block) (err error) {
con.cfgModule.registerDKG(con.ctx, nextRound, e.Reset,
utils.GetDKGThreshold(nextConfig))
con.event.RegisterHeight(e.NextDKGPreparationHeight(),
- func(uint64) {
+ func(h uint64) {
func() {
con.dkgReady.L.Lock()
defer con.dkgReady.L.Unlock()
con.dkgRunning = 0
}()
- con.runDKG(nextRound, e.Reset, nextConfig)
+ // We want to skip some of the DKG phases when started.
+ dkgCurrentHeight := h - e.NextDKGPreparationHeight()
+ con.runDKG(
+ nextRound, e.Reset,
+ e.NextDKGPreparationHeight(), dkgCurrentHeight)
})
}()
})
@@ -1114,7 +1122,8 @@ func (con *Consensus) generateBlockRandomness(blocks []*types.Block) {
}
// runDKG starts running DKG protocol.
-func (con *Consensus) runDKG(round, reset uint64, config *types.Config) {
+func (con *Consensus) runDKG(
+ round, reset, dkgBeginHeight, dkgHeight uint64) {
con.dkgReady.L.Lock()
defer con.dkgReady.L.Unlock()
if con.dkgRunning != 0 {
@@ -1128,7 +1137,10 @@ func (con *Consensus) runDKG(round, reset uint64, config *types.Config) {
con.dkgReady.Broadcast()
con.dkgRunning = 2
}()
- if err := con.cfgModule.runDKG(round, reset); err != nil {
+ if err :=
+ con.cfgModule.runDKG(
+ round, reset,
+ con.event, dkgBeginHeight, dkgHeight); err != nil {
con.logger.Error("Failed to runDKG", "error", err)
}
}()
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go
index a4a0f2023..13da027bd 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/syncer/agreement.go
@@ -39,7 +39,7 @@ type agreement struct {
outputChan chan<- *types.Block
pullChan chan<- common.Hash
blocks map[types.Position]map[common.Hash]*types.Block
- agreementResults map[common.Hash]struct{}
+ agreementResults map[common.Hash][]byte
latestCRSRound uint64
pendingAgrs map[uint64]map[common.Hash]*types.AgreementResult
pendingBlocks map[uint64]map[common.Hash]*types.Block
@@ -62,7 +62,7 @@ func newAgreement(chainTip uint64,
outputChan: ch,
pullChan: pullChan,
blocks: make(map[types.Position]map[common.Hash]*types.Block),
- agreementResults: make(map[common.Hash]struct{}),
+ agreementResults: make(map[common.Hash][]byte),
logger: logger,
pendingAgrs: make(
map[uint64]map[common.Hash]*types.AgreementResult),
@@ -105,7 +105,11 @@ func (a *agreement) processBlock(b *types.Block) {
if _, exist := a.confirmedBlocks[b.Hash]; exist {
return
}
- if _, exist := a.agreementResults[b.Hash]; exist {
+ if rand, exist := a.agreementResults[b.Hash]; exist {
+ if b.Position.Round >= core.DKGDelayRound &&
+ len(b.Finalization.Randomness) == 0 {
+ b.Finalization.Randomness = rand
+ }
a.confirm(b)
} else {
if _, exist := a.blocks[b.Position]; !exist {
@@ -219,7 +223,7 @@ func (a *agreement) processAgreementResult(r *types.AgreementResult) {
return
}
}
- a.agreementResults[r.BlockHash] = struct{}{}
+ a.agreementResults[r.BlockHash] = r.Randomness
loop:
for {
select {
diff --git a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go b/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go
index fcdf4224e..9a4ae923b 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/utils/utils.go
@@ -139,6 +139,11 @@ func GetDKGThreshold(config *types.Config) int {
return int(config.NotarySetSize*2/3) + 1
}
+// GetDKGValidThreshold return threshold for DKG set to considered valid.
+func GetDKGValidThreshold(config *types.Config) int {
+ return int(config.NotarySetSize * 5 / 6)
+}
+
// GetNextRoundValidationHeight returns the block height to check if the next
// round is ready.
func GetNextRoundValidationHeight(begin, length uint64) uint64 {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index e662a5591..659de1a33 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
{
"checksumSHA1": "8EuKVkP1v/w5fRuuvUaXX5k/F+I=",
"path": "github.com/dexon-foundation/dexon-consensus/common",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
- "checksumSHA1": "rjRAq7PMnUJK1vwh9MZrlHpq5Bc=",
+ "checksumSHA1": "sz6Y25/7bPgDZLBywY4wgqYuczs=",
"path": "github.com/dexon-foundation/dexon-consensus/core",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
@@ -165,64 +165,64 @@
{
"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
"checksumSHA1": "mMdctxTa/jNwAwZjjYoyEZdLoF8=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
"checksumSHA1": "b99zZvbWvBimv1NiPGGF1yQ4dKY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/db",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
- "checksumSHA1": "+k6JeUI7CGgSK6aQBV5l3d9/YaE=",
+ "checksumSHA1": "HfacdQdRnsj9vtx2xwJqQ07tEzs=",
"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
"checksumSHA1": "YhUsUJjNHitRb/ZdxEaXCClMyxc=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
"checksumSHA1": "yoVRmvJDCp/1jSfY7wMt2LBQ9e8=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},
{
- "checksumSHA1": "Dp0qf81zYP7qV81x3wYh+5oSzgI=",
+ "checksumSHA1": "M18S9KequUVKsfslTD6JC0MlZCY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
- "revision": "e3e7f4fbd840819b1ef44ae2c345f64e0bb2c161",
- "revisionTime": "2019-03-28T06:03:12Z",
+ "revision": "a69376bd9d144c462ae2b577c8147e96e4a60553",
+ "revisionTime": "2019-03-29T07:18:33Z",
"version": "single-chain",
"versionExact": "single-chain"
},