From ae0502e03f7c4e1a95d589c7b8a34295071ab243 Mon Sep 17 00:00:00 2001 From: oysheng <33340252+oysheng@users.noreply.github.com> Date: Wed, 17 Jul 2019 14:28:16 +0800 Subject: [PATCH] modify config (#302) --- config/config.go | 3 ++- config/genesis.go | 6 +++--- config/toml.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/config.go b/config/config.go index 8a060771..8080371d 100644 --- a/config/config.go +++ b/config/config.go @@ -243,7 +243,8 @@ func DefaultWebsocketConfig() *WebsocketConfig { func DefaultFederationConfig() *FederationConfig { return &FederationConfig{ Xpubs: []chainkd.XPub{ - xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"), + xpub("001784369b39078a898cb596a0f862af8fdfc1b83e1d799b7ced87f63c79186c2b3ca399942dcfbd1f638aa13b994a64bf8886fcbc206e9f90eb4df30c6f4ca5"), + xpub("a8018a1ba4d85fc7118bbd065612da78b2c503e61a1a093d9c659567c5d3a591b3752569fbcafa951b2304b8f576f3f220e03b957ca819840e7c29e4b7fb2c4d"), }, Quorum: 1, } diff --git a/config/genesis.go b/config/genesis.go index 8843d522..a3b2f7e2 100644 --- a/config/genesis.go +++ b/config/genesis.go @@ -84,7 +84,7 @@ func mainNetGenesisBlock() *types.Block { BlockHeader: types.BlockHeader{ Version: 1, Height: 0, - Timestamp: 1562840600003, + Timestamp: 1563344560002, BlockCommitment: types.BlockCommitment{ TransactionsMerkleRoot: merkleRoot, TransactionStatusHash: txStatusHash, @@ -115,7 +115,7 @@ func testNetGenesisBlock() *types.Block { BlockHeader: types.BlockHeader{ Version: 1, Height: 0, - Timestamp: 1562840600001, + Timestamp: 1563344560001, BlockCommitment: types.BlockCommitment{ TransactionsMerkleRoot: merkleRoot, TransactionStatusHash: txStatusHash, @@ -146,7 +146,7 @@ func soloNetGenesisBlock() *types.Block { BlockHeader: types.BlockHeader{ Version: 1, Height: 0, - Timestamp: 1562840600000, + Timestamp: 1563344560000, BlockCommitment: types.BlockCommitment{ TransactionsMerkleRoot: merkleRoot, TransactionStatusHash: txStatusHash, diff --git a/config/toml.go b/config/toml.go index 6a1e1295..6d09d3e4 100644 --- a/config/toml.go +++ b/config/toml.go @@ -30,13 +30,13 @@ moniker = "" var mainNetConfigTmpl = `chain_id = "mainnet" [p2p] laddr = "tcp://0.0.0.0:56656" -seeds = "52.82.28.25:56656,52.82.31.195:56656,52.82.31.247:56656" +seeds = "" ` var testNetConfigTmpl = `chain_id = "testnet" [p2p] laddr = "tcp://0.0.0.0:56657" -seeds = "" +seeds = "52.82.28.25:56657,52.82.31.195:56657,52.82.31.247:56657" ` var soloNetConfigTmpl = `chain_id = "solonet" -- 2.11.0