edit config (#200)

* edit config

* edit the config

* edit the ts

* edit the config

diff --git a/config/config.go b/config/config.go
index 5991e91..5c70bf8 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -241,11 +241,9 @@ func DefaultWebsocketConfig() *WebsocketConfig {
 func DefaultFederationConfig() *FederationConfig {
        return &FederationConfig{
                Xpubs: []chainkd.XPub{
-                       xpub("7f23aae65ee4307c38d342699e328f21834488e18191ebd66823d220b5a58303496c9d09731784372bade78d5e9a4a6249b2cfe2e3a85464e5a4017aa5611e47"),
-                       xpub("585e20143db413e45fbc82f03cb61f177e9916ef1df0012daa8cbf6dbb1025ce8f98e51ae319327b63505b64fdbbf6d36ef916d79e6dd67d51b0bfe76fe544c5"),
-                       xpub("b58170b51ca61604028ba1cb412377dfc2bc6567c0afc84c83aae1c0c297d0227ccf568561df70851f4144bbf069b525129f2434133c145e35949375b22a6c9d"),
+                       xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"),
                },
-               Quorum: 2,
+               Quorum: 1,
        }
 }
 

diff --git a/config/genesis.go b/config/genesis.go
index f714e7b..cbf98db 100644 (file)
--- a/config/genesis.go
+++ b/config/genesis.go
@@ -62,7 +62,7 @@ func mainNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1524549600000,
+                       Timestamp: 1561000000002,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
@@ -93,7 +93,7 @@ func testNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1528945000000,
+                       Timestamp: 1561000000001,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,
@@ -124,7 +124,7 @@ func soloNetGenesisBlock() *types.Block {
                BlockHeader: types.BlockHeader{
                        Version:   1,
                        Height:    0,
-                       Timestamp: 1528945000000,
+                       Timestamp: 1561000000000,
                        BlockCommitment: types.BlockCommitment{
                                TransactionsMerkleRoot: merkleRoot,
                                TransactionStatusHash:  txStatusHash,

diff --git a/config/toml.go b/config/toml.go
index 8102708..6185fce 100644 (file)
--- a/config/toml.go
+++ b/config/toml.go
@@ -35,8 +35,8 @@ seeds = ""
 
 var vaporNetConfigTmpl = `chain_id = "vapor"
 [p2p]
-laddr = "tcp://0.0.0.0:56659"
-seeds = ""
+laddr = "tcp://0.0.0.0:56656"
+seeds = "52.82.77.112:56656"
 `
 
 // Select network seeds to merge a new string.