aboutsummaryrefslogtreecommitdiff
path: root/src/chainparams.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-01-04 07:31:56 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2017-01-04 13:18:49 -0800
commit3641141c8f9bdc68fcc0792ce8842a8e33ea7320 (patch)
treedefc323ff6b727e8b50bbe944b4671119fea30f2 /src/chainparams.cpp
parenta4bac66cca62a5514579a15d198f3baa80683172 (diff)
downloadbitcoin-3641141c8f9bdc68fcc0792ce8842a8e33ea7320.tar.xz
Move tx estimation data out of CCheckPointData
Diffstat (limited to 'src/chainparams.cpp')
-rw-r--r--src/chainparams.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 1e294da9f4..06196de362 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -151,7 +151,10 @@ public:
(225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
(250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214"))
(279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40"))
- (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")),
+ (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983"))
+ };
+
+ chainTxData = ChainTxData{
1397080064, // * UNIX timestamp of last checkpoint block
36544669, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
@@ -234,6 +237,9 @@ public:
checkpointData = (CCheckpointData) {
boost::assign::map_list_of
( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")),
+ };
+
+ chainTxData = ChainTxData{
1337966069,
1488,
300
@@ -297,11 +303,15 @@ public:
checkpointData = (CCheckpointData){
boost::assign::map_list_of
- ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")),
+ ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"))
+ };
+
+ chainTxData = ChainTxData{
0,
0,
0
};
+
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);