Merge branch 'master' into master

This commit is contained in:
Steven Saxton 2017-05-10 03:03:56 -04:00 committed by GitHub
commit a1a0af0c34
2 changed files with 12 additions and 10 deletions

View File

@ -1,5 +1,4 @@
#Curecoin Client ## CureCoin Wallet
###Client for the CureCoin cryptocurrency
### Overview ### Overview
@ -15,11 +14,13 @@ Joining the Curecoin network is easy:
### Standard Installation ### Standard Installation
1. Windows, Mac, Linux operating system - for client downloads visit [curecoin releases](https://github.com/cygnusxi/CurecoinSource/releases) 1. To see all version for Windows, Mac, Linux wallet downloads visit [curecoin releases](https://github.com/cygnusxi/CurecoinSource/releases)
2. [Windows Download](https://github.com/cygnusxi/CurecoinSource/releases/download/v1.3.4/CurecoinWindowsClientv1-3-4.zip)
3. [Mac Download](https://github.com/cygnusxi/CurecoinSource/releases/download/1.3.0/curecoin-0.1.3.0-mac.dmg)
### Installation for Linux from source ### Installation for Linux from source
There are two CureCoin clients that you can choose: one with a nice graphical interface, and one that operates entirely in the command-line. The first is highly recommended and is a good choice for most users, but expert users may prefer the command-line (headless) client instead. The GUI client is known as "curecoin-qt" and the headless client is called "curecoind". Installing either one or both is extremely simple. Just follow these directions: If you do not use Linux see previous section for a prebuilt wallet. There are two CureCoin Linux based clients that you can compile for yourself: one with a nice graphical interface, and one that operates entirely in the command-line. The first is highly recommended and is a good choice for most users, but expert users may prefer the command-line (headless) client instead. The GUI client is known as "curecoin-qt" and the headless client is called "curecoind". Installing either one or both is extremely simple. Just follow these directions:
* **Install from source** * **Install from source**
@ -32,19 +33,19 @@ There are two CureCoin clients that you can choose: one with a nice graphical in
> 1. **sudo apt-get install qt4-qmake libqt4-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev libssl-dev libminiupnpc-dev libdb5.3++-dev dh-make build-essential** > 1. **sudo apt-get install qt4-qmake libqt4-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev libssl-dev libminiupnpc-dev libdb5.3++-dev dh-make build-essential**
> 2. From the main directory, run the following: > 2. From the main directory, run the following:
> 3. **qmake && make** > 3. **qmake && make**
> 4. **sudo make install** Alternatively, don't run that command and just place the binary wherever you want.
FOR THE HEADLESS CURECOIND: FOR THE HEADLESS CURECOIND:
> 1. **sudo apt-get install libboost-all-dev libqrencode-dev libssl-dev libdb5.3-dev libdb5.3++-dev libminiupnpc-dev dh-make build-essential** > 1. **sudo apt-get install libboost-all-dev libqrencode-dev libssl-dev libdb5.3-dev libdb5.3++-dev libminiupnpc-dev dh-make build-essential**
> 2. **cd src/ && mkdir obj/ && make -f makefile.unix** > 2. **cd src**
> 3. **make -f makefile.unix**
> 4. **sudo make install** Alternatively, don't run that command and just place the binary wherever you want. > 4. **sudo make install** Alternatively, don't run that command and just place the binary wherever you want.
libdb4.8 should also work if libdb5.1 is too high a version for you. Newer versions of Linux will need libdb5.3++-dev libdb4.8 should also work if libdb5.1 is too high a version for you. Newer versions of Linux will need libdb5.3++-dev
### Reporting bugs or getting assistance ### Reporting bugs or getting assistance
General help for CureCoin can be found on the forums at https://www.curecoin.net/forum or on #curecoin in irc.freenode. The forum is recommended for non frequent users of irc. General help for CureCoin can be found on the forums at https://www.curecoin.net/forum or on Slack http://slack.curecoin.net:30000/ . The forum is recommended for non frequent users of irc.
### Donations ### Donations

View File

@ -26,6 +26,7 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
( 148000, 0x111af91cu ) ( 148000, 0x111af91cu )
; ;
// Get the last stake modifier and its generation time from a given block // Get the last stake modifier and its generation time from a given block
static bool GetLastStakeModifier(const CBlockIndex* pindex, uint64& nStakeModifier, int64& nModifierTime) static bool GetLastStakeModifier(const CBlockIndex* pindex, uint64& nStakeModifier, int64& nModifierTime)
{ {