OSDN Git Service

modify config (#302)
authoroysheng <33340252+oysheng@users.noreply.github.com>
Wed, 17 Jul 2019 06:28:16 +0000 (14:28 +0800)
committerPaladz <yzhu101@uottawa.ca>
Wed, 17 Jul 2019 06:28:16 +0000 (14:28 +0800)
config/config.go
config/genesis.go
config/toml.go

index 8a06077..8080371 100644 (file)
@@ -243,7 +243,8 @@ func DefaultWebsocketConfig() *WebsocketConfig {
 func DefaultFederationConfig() *FederationConfig {
        return &FederationConfig{
                Xpubs: []chainkd.XPub{
 func DefaultFederationConfig() *FederationConfig {
        return &FederationConfig{
                Xpubs: []chainkd.XPub{
-                       xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"),
+                       xpub("001784369b39078a898cb596a0f862af8fdfc1b83e1d799b7ced87f63c79186c2b3ca399942dcfbd1f638aa13b994a64bf8886fcbc206e9f90eb4df30c6f4ca5"),
+                       xpub("a8018a1ba4d85fc7118bbd065612da78b2c503e61a1a093d9c659567c5d3a591b3752569fbcafa951b2304b8f576f3f220e03b957ca819840e7c29e4b7fb2c4d"),
                },
                Quorum: 1,
        }
                },
                Quorum: 1,
        }
index 8843d52..a3b2f7e 100644 (file)
@@ -84,7 +84,7 @@ func mainNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1562840600003,
+                       Timestamp: 1563344560002,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
@@ -115,7 +115,7 @@ func testNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1562840600001,
+                       Timestamp: 1563344560001,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
@@ -146,7 +146,7 @@ func soloNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1562840600000,
+                       Timestamp: 1563344560000,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
index 6a1e129..6d09d3e 100644 (file)
@@ -30,13 +30,13 @@ moniker = ""
 var mainNetConfigTmpl = `chain_id = "mainnet"
 [p2p]
 laddr = "tcp://0.0.0.0:56656"
 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"
 `
 
 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"
 `
 
 var soloNetConfigTmpl = `chain_id = "solonet"