Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.2.0.0 #1

Merged
merged 4 commits into from
Mar 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
cash
====

Removingx86 references so it can compile on a Raspberry PI
-Checkpoint update

-Copyright update

-Faster Start up

-Version bump

-Removingx86 references so it can compile on a Raspberry PI
5 changes: 3 additions & 2 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2009-2012 The Bitcoin developers
// Copyright (c) 2016 CASH developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -26,7 +27,7 @@ namespace Checkpoints
boost::assign::map_list_of
( 0, hashGenesisBlockOfficial )
( 19494, uint256("0x00000000169f68123cfafca03be2f319c59dd20cb8caae58a3e9652fb0ff2dcb"))

( 1070001, uint256("0x0000002b97449970fabf35533b69c37ae1869575dd7b66d3f91fefc2980929dc"))

;

Expand Down Expand Up @@ -367,7 +368,7 @@ namespace Checkpoints

// ppcoin: sync-checkpoint master key

const std::string CSyncCheckpoint::strMasterPubKey = "040cc88c5a29ba77ac760df671efe18f6837d6561896100e0ccde490c1971860b2fe41312a3d966a72ab6936dc8e737cb855263b1aaf92e5c3e7146d4550c588c6";
const std::string CSyncCheckpoint::strMasterPubKey = "0490aaa63e59889bdb51111503b1cbcfd521b148a5f614125b5c2fd190c3ed05efb5cbea4ff8b276ed65a6808fba2bb53f439db1ca79c935edd1df0981ba4b2553";

std::string CSyncCheckpoint::strMasterPrivKey = "";

Expand Down
6 changes: 3 additions & 3 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//

// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 7
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

// Converts the parameter X to a string after macro replacement on X has been performed.
Expand Down
4 changes: 2 additions & 2 deletions src/db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -664,8 +664,8 @@ bool CTxDB::LoadBlockIndex()
ReadBestInvalidTrust(bnBestInvalidTrust);

// Verify blocks in the best chain
int nCheckLevel = GetArg("-checklevel", 1);
int nCheckDepth = GetArg( "-checkblocks", 2500);
int nCheckLevel = GetArg("-checklevel", 3);
int nCheckDepth = GetArg( "-checkblocks", 288);
if (nCheckDepth == 0)
nCheckDepth = 1000000000; // suffices until the year 19000
if (nCheckDepth > nBestHeight)
Expand Down
4 changes: 2 additions & 2 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ std::string HelpMessage()
" -keypool=<n> " + _("Set key pool size to <n> (default: 100)") + "\n" +
" -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n" +
" -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" +
" -checkblocks=<n> " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
" -checklevel=<n> " + _("How thorough the block verification is (0-6, default: 1)") + "\n" +
" -checkblocks=<n> " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n" +
" -checklevel=<n> " + _("How thorough the block verification is (0-6, default: 3)") + "\n" +
" -loadblock=<file> " + _("Imports blocks from external blk000?.dat file") + "\n" +

"\n" + _("Block creation options:") + "\n" +
Expand Down
2 changes: 2 additions & 0 deletions src/kernel.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2012-2013 The PPCoin developers
// Copyright (c) 2016 CASH developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -21,6 +22,7 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
boost::assign::map_list_of
( 0, 0x0e00670bu )
( 19494, 0x72f48962 )
( 1070001, 0x6e3477eb )
;

// Get the last stake modifier and its generation time from a given block
Expand Down
7 changes: 4 additions & 3 deletions src/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2012 The Bitcoin developers
// Copyright (c) 2016 CASH developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <string>
Expand All @@ -8,10 +9,10 @@
// Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to
// target servers or GUI users specifically.
const std::string CLIENT_NAME("Satoshi");
const std::string CLIENT_NAME("Cash");

// Client version number
#define CLIENT_VERSION_SUFFIX "-CASH"
#define CLIENT_VERSION_SUFFIX ""


// The following part of the code determines the CLIENT_BUILD variable.
Expand All @@ -36,7 +37,7 @@ const std::string CLIENT_NAME("Satoshi");
// git will put "#define GIT_ARCHIVE 1" on the next line inside archives.
#define GIT_ARCHIVE 1
#ifdef GIT_ARCHIVE
# define GIT_COMMIT_ID "32a928e"
# define GIT_COMMIT_ID "787a971"
# define GIT_COMMIT_DATE "$Format:%cD"
#endif

Expand Down
5 changes: 3 additions & 2 deletions src/version.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2012 The Bitcoin developers
// Copyright (c) 2016 CASH developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_VERSION_H
Expand Down Expand Up @@ -45,8 +46,8 @@ static const int BIP0031_VERSION = 60000;
static const int MEMPOOL_GD_VERSION = 60002;

#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 1
#define DISPLAY_VERSION_MINOR 2
#define DISPLAY_VERSION_REVISION 0
#define DISPLAY_VERSION_BUILD 2
#define DISPLAY_VERSION_BUILD 0

#endif