• R/O
  • HTTP
  • SSH
  • HTTPS

vapor: Commit

Golang implemented sidechain for Bytom


Commit MetaInfo

Revisionff6132477fc47294619ef5a2add79610afd4c4c5 (tree)
Time2019-07-19 18:06:43
AuthorChengcheng Zhang <943420582@qq.c...>
CommiterChengcheng Zhang

Log Message

Merge branch 'master' into wallet-store-test

Change Summary

Incremental Difference

--- a/config/config.go
+++ b/config/config.go
@@ -243,10 +243,12 @@ func DefaultWebsocketConfig() *WebsocketConfig {
243243 func DefaultFederationConfig() *FederationConfig {
244244 return &FederationConfig{
245245 Xpubs: []chainkd.XPub{
246- xpub("001784369b39078a898cb596a0f862af8fdfc1b83e1d799b7ced87f63c79186c2b3ca399942dcfbd1f638aa13b994a64bf8886fcbc206e9f90eb4df30c6f4ca5"),
247- xpub("a8018a1ba4d85fc7118bbd065612da78b2c503e61a1a093d9c659567c5d3a591b3752569fbcafa951b2304b8f576f3f220e03b957ca819840e7c29e4b7fb2c4d"),
246+ xpub("580daf48fa8962100047cb1391da890bb7f2c849fdbc9b368cb4394a4c7cbb0977e2e7ebbf055dc0ef90af6a0d2af01ce7ec56b735d016aab597815ec48552e5"),
247+ xpub("f3f6bcf61b65fa9d1566455a5688ca8b395efdc22e654963134b5e5cb0a45d8be522d21abc384a73177a7b9d64eba915fcfe2862d86a508a3c46dc410bdd72ad"),
248+ xpub("53559612f2b7bcada18948b7de39d63947a0e2bd7336d07db1350c54ba5743996b84bf9d18ff7a2457e1a5c70ce5013e4a3b62666ddb03294c53051d5f5c70c0"),
249+ xpub("7c88cc58adfc71818b08308d43c29de22460b0ea6895449cbec6e458d7dc09e0aea243fa5075ee6621da0d805bd047f6bb207329c5bd2ca3253b172fb323b512"),
248250 },
249- Quorum: 1,
251+ Quorum: 2,
250252 }
251253 }
252254
--- a/config/toml.go
+++ b/config/toml.go
@@ -30,7 +30,7 @@ moniker = ""
3030 var mainNetConfigTmpl = `chain_id = "mainnet"
3131 [p2p]
3232 laddr = "tcp://0.0.0.0:56656"
33-seeds = ""
33+seeds = "47.103.79.68:56656,47.103.13.86:56656,47.102.193.119:56656,47.103.17.22:56656"
3434 `
3535
3636 var testNetConfigTmpl = `chain_id = "testnet"
Show on old repository browser