diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-18 11:55:52 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-18 11:55:59 +0100 |
| commit | 47c5ed19f3ba2a5f91f773ce7ff485f8574b570b (patch) | |
| tree | 412c19c917adee9d43d91e03eb9e2b86eeb228b6 /src/chainparams.cpp | |
| parent | c851d8d71b2ee2a942a6b9041b9c0e4f5b836ec5 (diff) | |
| parent | 64360f13044125fbb3cdcbe2e5e8f2bfb82a8b27 (diff) | |
| download | bitcoin-47c5ed19f3ba2a5f91f773ce7ff485f8574b570b.tar.xz | |
Merge pull request #7208
64360f1 Make max tip age an option instead of chainparam (Wladimir J. van der Laan)
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 9cf99492c9..b962f6ac0a 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -92,7 +92,6 @@ public: pchMessageStart[3] = 0xd9; vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"); nDefaultPort = 8333; - nMaxTipAge = 24 * 60 * 60; nPruneAfterHeight = 100000; genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN); @@ -169,7 +168,6 @@ public: pchMessageStart[3] = 0x07; vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a"); nDefaultPort = 18333; - nMaxTipAge = 0x7fffffff; nPruneAfterHeight = 1000; genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN); @@ -232,7 +230,6 @@ public: pchMessageStart[1] = 0xbf; pchMessageStart[2] = 0xb5; pchMessageStart[3] = 0xda; - nMaxTipAge = 24 * 60 * 60; nDefaultPort = 18444; nPruneAfterHeight = 1000; |