• R/O
  • HTTP
  • SSH
  • HTTPS

vapor: Commit

Golang implemented sidechain for Bytom


Commit MetaInfo

Revisionf9217417e34d1339099385b68447d851008184f7 (tree)
Time2019-06-20 12:06:14
AuthorPaladz <yzhu101@uott...>
CommiterGitHub

Log Message

edit config (#200)

* edit config

* edit the config

* edit the ts

* edit the config

Change Summary

Incremental Difference

--- a/config/config.go
+++ b/config/config.go
@@ -241,11 +241,9 @@ func DefaultWebsocketConfig() *WebsocketConfig {
241241 func DefaultFederationConfig() *FederationConfig {
242242 return &FederationConfig{
243243 Xpubs: []chainkd.XPub{
244- xpub("7f23aae65ee4307c38d342699e328f21834488e18191ebd66823d220b5a58303496c9d09731784372bade78d5e9a4a6249b2cfe2e3a85464e5a4017aa5611e47"),
245- xpub("585e20143db413e45fbc82f03cb61f177e9916ef1df0012daa8cbf6dbb1025ce8f98e51ae319327b63505b64fdbbf6d36ef916d79e6dd67d51b0bfe76fe544c5"),
246- xpub("b58170b51ca61604028ba1cb412377dfc2bc6567c0afc84c83aae1c0c297d0227ccf568561df70851f4144bbf069b525129f2434133c145e35949375b22a6c9d"),
244+ xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"),
247245 },
248- Quorum: 2,
246+ Quorum: 1,
249247 }
250248 }
251249
--- a/config/genesis.go
+++ b/config/genesis.go
@@ -62,7 +62,7 @@ func mainNetGenesisBlock() *types.Block {
6262 BlockHeader: types.BlockHeader{
6363 Version: 1,
6464 Height: 0,
65- Timestamp: 1524549600000,
65+ Timestamp: 1561000000002,
6666 BlockCommitment: types.BlockCommitment{
6767 TransactionsMerkleRoot: merkleRoot,
6868 TransactionStatusHash: txStatusHash,
@@ -93,7 +93,7 @@ func testNetGenesisBlock() *types.Block {
9393 BlockHeader: types.BlockHeader{
9494 Version: 1,
9595 Height: 0,
96- Timestamp: 1528945000000,
96+ Timestamp: 1561000000001,
9797 BlockCommitment: types.BlockCommitment{
9898 TransactionsMerkleRoot: merkleRoot,
9999 TransactionStatusHash: txStatusHash,
@@ -124,7 +124,7 @@ func soloNetGenesisBlock() *types.Block {
124124 BlockHeader: types.BlockHeader{
125125 Version: 1,
126126 Height: 0,
127- Timestamp: 1528945000000,
127+ Timestamp: 1561000000000,
128128 BlockCommitment: types.BlockCommitment{
129129 TransactionsMerkleRoot: merkleRoot,
130130 TransactionStatusHash: txStatusHash,
--- a/config/toml.go
+++ b/config/toml.go
@@ -35,8 +35,8 @@ seeds = ""
3535
3636 var vaporNetConfigTmpl = `chain_id = "vapor"
3737 [p2p]
38-laddr = "tcp://0.0.0.0:56659"
39-seeds = ""
38+laddr = "tcp://0.0.0.0:56656"
39+seeds = "52.82.77.112:56656"
4040 `
4141
4242 // Select network seeds to merge a new string.
Show on old repository browser