maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master-1.5' into optim2-1.5

Browse source
This commit is contained in:
Casey Fleser 2014-02-22 09:06:33 -06:00
parent a4a57df059 797fb9e526
commit ad0384a1c5
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/build-osx.md
View file

@ -112,10 +112,14 @@ Rerunning "openssl version" should now return the correct version.
For boost in dogecoin, there are some ‘fun’ things you have to do:
* download boost from source
* download the latest boost from source
./bootstrap.sh
./b2 --toolset=clang cxxflags="-stdlib=libstdc++" linkflags="-stdlib=libstdc++" variant=release link=static threading=multi runtime-link=static --build-dir=build --build-type=minimal stage --with-program_options --with-system --with-filesystem --with-chrono --with-thread
http://www.boost.org/users/download/
* Build the boost libs with special flags because ... REASONS!
./bootstrap.sh
./b2 --toolset=clang cxxflags="-stdlib=libstdc++" linkflags="-stdlib=libstdc++" variant=release link=static threading=multi runtime-link=static --build-dir=build --build-type=minimal stage --with-program_options --with-system --with-filesystem --with-chrono --with-thread
* link the statics to /usr/local/lib/
* make sure the headers for boost are in /usr/local/include/boost or linked from there.

2
src/main.h
View file

@ -31,7 +31,7 @@ static const unsigned int MAX_BLOCK_SIZE = 1000000; // 1000
/** Obsolete: maximum size for mined blocks */
static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; // 500KB block soft limit
/** Default for -blockmaxsize, maximum size for mined blocks **/
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 250000;
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 500000;
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 17000;
/** The maximum size for transactions we're willing to relay/mine */

2
src/version.h
View file

@ -32,7 +32,7 @@ static const int PROTOCOL_VERSION = 70001;
static const int INIT_PROTO_VERSION = 209;
// disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 60003;
static const int MIN_PEER_PROTO_VERSION = 70001;
// nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this

6
src/wallet.cpp
View file

@ -1248,10 +1248,8 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend,
BOOST_FOREACH(PAIRTYPE(const CWalletTx*, unsigned int) pcoin, setCoins)
{
int64 nCredit = pcoin.first->vout[pcoin.second].nValue;
//The priority after the next block (depth+1) is used instead of the current,
//reflecting an assumption the user would accept a bit more delay for
//a chance at a free transaction.
dPriority += (double)nCredit * (pcoin.first->GetDepthInMainChain()+1);
// Dogecoin: Set priority to current block
dPriority += (double)nCredit * pcoin.first->GetDepthInMainChain();
}
int64 nChange = nValueIn - nValue - nFeeRet;