From 894080a08e9f52fb3e1b035f67dc2e4676525e7e Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Sat, 13 Apr 2019 23:11:31 +0800
Subject: vendor: sync to latest core
---
.../dexon-consensus/core/consensus.go | 10 ++++++
vendor/vendor.json | 42 +++++++++++-----------
2 files changed, 31 insertions(+), 21 deletions(-)
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 ec15bf32d..968b90e99 100644
--- a/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
+++ b/vendor/github.com/dexon-foundation/dexon-consensus/core/consensus.go
@@ -93,13 +93,23 @@ func (recv *consensusBAReceiver) VerifyPartialSignature(vote *types.Vote) bool {
if vote.Position.Round >= DKGDelayRound && vote.BlockHash != types.SkipBlockHash {
if vote.Type == types.VoteCom || vote.Type == types.VoteFastCom {
if recv.npks == nil {
+ recv.consensus.logger.Debug(
+ "Unable to verify psig, npks is nil",
+ "vote", vote)
return false
}
if vote.Position.Round != recv.npks.Round {
+ recv.consensus.logger.Debug(
+ "Unable to verify psig, round of npks mismatch",
+ "vote", vote,
+ "npksRound", recv.npks.Round)
return false
}
pubKey, exist := recv.npks.PublicKeys[vote.ProposerID]
if !exist {
+ recv.consensus.logger.Debug(
+ "Unable to verify psig, proposer is not qualified",
+ "vote", vote)
return false
}
blockHash := vote.BlockHash
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 4c14dfdb2..eac81e0b8 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
{
"checksumSHA1": "In6vBHYUsX7DUIGiFN2hQggBgvI=",
"path": "github.com/dexon-foundation/dexon-consensus/common",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
- "checksumSHA1": "GhwP6CLvYoMcnzMTQjSDhT9qjnk=",
+ "checksumSHA1": "6anh4sqNQZY5ZD+cZoTIB+N4PRc=",
"path": "github.com/dexon-foundation/dexon-consensus/core",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
@@ -165,64 +165,64 @@
{
"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "4besQaa0rm8jRUAJjpEaLZ/ZOYs=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "3Ludp/1V4dMBZH/c1oIVjHj0CqY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/db",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "sO5twEFTdLvkMuQo+I3vyzm9T3o=",
"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "0BY+E0E2cM7IHIMqunXwoolDS5Y=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "lbG7yqVgzo2CV/CQPYjG78xp5jg=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "C2r/uE8K53WIIA0FYYHIfR2xhng=",
"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
- "revision": "24c0cecbbf7ba84754ccc02d37c9540ce317976c",
- "revisionTime": "2019-04-12T03:35:37Z",
+ "revision": "2d26246247e2f7e616cc3d13b9d61308580e7d67",
+ "revisionTime": "2019-04-13T15:07:46Z",
"version": "master",
"versionExact": "master"
},
--
cgit v1.2.3