aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2019-01-28 09:26:57 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:56 +0800
commit33fb6d8d6694daeb298c3fa9762b94a7ed665812 (patch)
tree121bb3f688efa6485119fd46f7b0f409ac6b386e
parent19f1d808afe4a5e6ce8bab4dbff2002385bf926a (diff)
downloaddexon-33fb6d8d6694daeb298c3fa9762b94a7ed665812.tar.gz
dexon-33fb6d8d6694daeb298c3fa9762b94a7ed665812.tar.zst
dexon-33fb6d8d6694daeb298c3fa9762b94a7ed665812.zip
vendor, param: sync to latest core and update testnet config (#178)
* param: update testnet config * vendor: sync to latest core
-rw-r--r--params/config.go6
-rw-r--r--vendor/github.com/dexon-foundation/dexon-consensus/core/dkg-tsig-protocol.go1
-rw-r--r--vendor/vendor.json42
3 files changed, 25 insertions, 24 deletions
diff --git a/params/config.go b/params/config.go
index b3d5ff1c7..139a87840 100644
--- a/params/config.go
+++ b/params/config.go
@@ -27,7 +27,7 @@ import (
// Genesis hashes to enforce below configs on.
var (
MainnetGenesisHash = common.HexToHash("0xe972af2797b02f4dab95ffa229714c35d5c55685f20261b9498c8b8a3fe33856")
- TestnetGenesisHash = common.HexToHash("0xaf79c06141610103c4728d4e7da2effcc7ee568af46a8cb5c13082315d597d73")
+ TestnetGenesisHash = common.HexToHash("0x9fab095bee4b3dc7dcde324beb6c791bc21025a33d50793ed995d8ef1739f35b")
)
var (
@@ -83,7 +83,7 @@ var (
// TestnetChainConfig contains the chain parameters to run a node on the Taiwan test network.
TestnetChainConfig = &ChainConfig{
ChainID: big.NewInt(238),
- DMoment: 1548504300,
+ DMoment: 1548570900,
HomesteadBlock: big.NewInt(0),
DAOForkBlock: nil,
DAOForkSupport: true,
@@ -104,7 +104,7 @@ var (
BlockGasLimit: 40000000,
NumChains: 4,
LambdaBA: 250,
- LambdaDKG: 4000,
+ LambdaDKG: 10000,
K: 0,
PhiRatio: 0.667,
NotarySetSize: 4,
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 02e3ae070..73b8abfd9 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
@@ -234,6 +234,7 @@ func (d *dkgProtocol) processNackComplaints(complaints []*typesDKG.Complaint) (
continue
}
d.recv.ProposeDKGAntiNackComplaint(&typesDKG.PrivateShare{
+ ProposerID: d.ID,
ReceiverID: complaint.ProposerID,
Round: d.round,
PrivateShare: *share,
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 74b0eb0ba..07b7b3966 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -141,16 +141,16 @@
{
"checksumSHA1": "MA1hygDGoOGggSd39fadmgoK0u0=",
"path": "github.com/dexon-foundation/dexon-consensus/common",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
- "checksumSHA1": "KPajxfz3zYL+BqTkiPI+4qShEP4=",
+ "checksumSHA1": "bg2pqKv1bqixgkB22xnY5BpTO6U=",
"path": "github.com/dexon-foundation/dexon-consensus/core",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
@@ -165,64 +165,64 @@
{
"checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "Nlv7pi1DIBftY+r6CFP8LBIQA3U=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=",
"path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "zpuCdMT8MGsy4pLgHKpg/Wd4izU=",
"path": "github.com/dexon-foundation/dexon-consensus/core/db",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "eq19vhMpc90UUJ7I91ti5P2CkQ0=",
"path": "github.com/dexon-foundation/dexon-consensus/core/syncer",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "OOyjMSUDuT8n/IJLFpDxENpgf/A=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "rmv8uxwrqMhJAeA3RPvwYP8mFro=",
"path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},
{
"checksumSHA1": "ZRpjtBZT6CEIqysdaONmteBCy4A=",
"path": "github.com/dexon-foundation/dexon-consensus/core/utils",
- "revision": "049c9820e803f0453442d858d2ef36219981bf4c",
- "revisionTime": "2019-01-26T07:33:24Z",
+ "revision": "29eeeb08cac1b203dca2075d2901779d12be85b7",
+ "revisionTime": "2019-01-27T06:25:42Z",
"version": "master",
"versionExact": "master"
},