| 修订版 | f9217417e34d1339099385b68447d851008184f7 (tree) |
|---|---|
| 时间 | 2019-06-20 12:06:14 |
| 作者 | Paladz <yzhu101@uott...> |
| Commiter | GitHub |
config/config.go (diff) config/genesis.go (diff) config/toml.go (diff)| @@ -241,11 +241,9 @@ func DefaultWebsocketConfig() *WebsocketConfig { | ||
| 241 | 241 | func DefaultFederationConfig() *FederationConfig { |
| 242 | 242 | return &FederationConfig{ |
| 243 | 243 | Xpubs: []chainkd.XPub{ |
| 244 | - xpub("7f23aae65ee4307c38d342699e328f21834488e18191ebd66823d220b5a58303496c9d09731784372bade78d5e9a4a6249b2cfe2e3a85464e5a4017aa5611e47"), | |
| 245 | - xpub("585e20143db413e45fbc82f03cb61f177e9916ef1df0012daa8cbf6dbb1025ce8f98e51ae319327b63505b64fdbbf6d36ef916d79e6dd67d51b0bfe76fe544c5"), | |
| 246 | - xpub("b58170b51ca61604028ba1cb412377dfc2bc6567c0afc84c83aae1c0c297d0227ccf568561df70851f4144bbf069b525129f2434133c145e35949375b22a6c9d"), | |
| 244 | + xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"), | |
| 247 | 245 | }, |
| 248 | - Quorum: 2, | |
| 246 | + Quorum: 1, | |
| 249 | 247 | } |
| 250 | 248 | } |
| 251 | 249 |
| @@ -62,7 +62,7 @@ func mainNetGenesisBlock() *types.Block { | ||
| 62 | 62 | BlockHeader: types.BlockHeader{ |
| 63 | 63 | Version: 1, |
| 64 | 64 | Height: 0, |
| 65 | - Timestamp: 1524549600000, | |
| 65 | + Timestamp: 1561000000002, | |
| 66 | 66 | BlockCommitment: types.BlockCommitment{ |
| 67 | 67 | TransactionsMerkleRoot: merkleRoot, |
| 68 | 68 | TransactionStatusHash: txStatusHash, |
| @@ -93,7 +93,7 @@ func testNetGenesisBlock() *types.Block { | ||
| 93 | 93 | BlockHeader: types.BlockHeader{ |
| 94 | 94 | Version: 1, |
| 95 | 95 | Height: 0, |
| 96 | - Timestamp: 1528945000000, | |
| 96 | + Timestamp: 1561000000001, | |
| 97 | 97 | BlockCommitment: types.BlockCommitment{ |
| 98 | 98 | TransactionsMerkleRoot: merkleRoot, |
| 99 | 99 | TransactionStatusHash: txStatusHash, |
| @@ -124,7 +124,7 @@ func soloNetGenesisBlock() *types.Block { | ||
| 124 | 124 | BlockHeader: types.BlockHeader{ |
| 125 | 125 | Version: 1, |
| 126 | 126 | Height: 0, |
| 127 | - Timestamp: 1528945000000, | |
| 127 | + Timestamp: 1561000000000, | |
| 128 | 128 | BlockCommitment: types.BlockCommitment{ |
| 129 | 129 | TransactionsMerkleRoot: merkleRoot, |
| 130 | 130 | TransactionStatusHash: txStatusHash, |
| @@ -35,8 +35,8 @@ seeds = "" | ||
| 35 | 35 | |
| 36 | 36 | var vaporNetConfigTmpl = `chain_id = "vapor" |
| 37 | 37 | [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" | |
| 40 | 40 | ` |
| 41 | 41 | |
| 42 | 42 | // Select network seeds to merge a new string. |
Fork