From 605a73542531ba798ade5583c4a95d20eb75ceae Mon Sep 17 00:00:00 2001 From: Pavel Vasin Date: Thu, 2 Apr 2015 18:59:07 +0300 Subject: [PATCH 01/13] addrman: update comments nUnkBias was removed in https://github.com/bitcoin/bitcoin/pull/5941 --- src/addrman.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/addrman.h b/src/addrman.h index b72dda49d1..e0494cab39 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -231,7 +231,6 @@ protected: void Attempt_(const CService &addr, int64_t nTime); //! Select an address to connect to. - //! nUnkBias determines how much to favor new addresses over tried ones (min=0, max=100) CAddrInfo Select_(); #ifdef DEBUG_ADDRMAN @@ -532,7 +531,6 @@ public: /** * Choose an address to connect to. - * nUnkBias determines how much "new" entries are favored over "tried" ones (0-100). */ CAddrInfo Select() { From 803f51efe426f2e68c7aea7749c2cdc58a4af1fe Mon Sep 17 00:00:00 2001 From: Chris Arnesen Date: Fri, 10 Apr 2015 14:12:46 -0700 Subject: [PATCH 02/13] Typo in GetRawMemPool RPC method help: "]" --> "}" --- src/rpcblockchain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index ecf8e8bcc6..4315c5ec18 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -170,7 +170,7 @@ Value getrawmempool(const Array& params, bool fHelp) " \"transactionid\", (string) parent transaction id\n" " ... ]\n" " }, ...\n" - "]\n" + "}\n" "\nExamples\n" + HelpExampleCli("getrawmempool", "true") + HelpExampleRpc("getrawmempool", "true") From 8e9248d96b99c89999fe2c4901dff008d081940e Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Sat, 11 Apr 2015 17:19:46 +0200 Subject: [PATCH 03/13] [Trivial] Cryptocurrency is one word Cryptocurrency was added to Oxford Dictionaries Online in May 2014. --- contrib/init/bitcoind.openrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc index b0ac5e31e1..f0ba6832c1 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/bitcoind.openrc @@ -19,7 +19,7 @@ BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="Bitcoin Core Daemon" -description="Bitcoin crypto-currency p2p network daemon" +description="Bitcoin cryptocurrency p2p network daemon" command="/usr/bin/bitcoind" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ From 78f44b60d59ac43f1f0fff5a2f7fef01f9d0cadc Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Mon, 13 Apr 2015 12:34:52 +0200 Subject: [PATCH 04/13] Capitalized P2P Capitalized P2P --- contrib/init/bitcoind.openrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc index f0ba6832c1..a94f03680d 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/bitcoind.openrc @@ -19,7 +19,7 @@ BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="Bitcoin Core Daemon" -description="Bitcoin cryptocurrency p2p network daemon" +description="Bitcoin cryptocurrency P2P network daemon" command="/usr/bin/bitcoind" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ From a60bfd810f5961cb71cdba5a1e4c538ac9cc4953 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 15 Apr 2015 14:35:35 +0200 Subject: [PATCH 05/13] [init] better message when no wallet support is compiled in --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 6ef0ce4268..e2bc36a8e4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1328,7 +1328,7 @@ bool AppInit2(boost::thread_group& threadGroup) pwalletMain->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", true)); } // (!fDisableWallet) #else // ENABLE_WALLET - LogPrintf("No wallet compiled in!\n"); + LogPrintf("No wallet support compiled in!\n"); #endif // !ENABLE_WALLET // ********************************************************* Step 9: import blocks From dd9e688b3b81e8fa34020233834d2d23dc2e518d Mon Sep 17 00:00:00 2001 From: ayeowch Date: Tue, 21 Apr 2015 08:07:37 +1000 Subject: [PATCH 06/13] Trivial: Corrected owner of DNS seeder --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 556d0aed4d..5f400b265c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -86,7 +86,7 @@ public: vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Pieter Wuille vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr - vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Addy Yeow + vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Christian Decker vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch")); // Jonas Schnelli From 3b00e7c231648cfe0c36c5f9f0c44953146c1a5b Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Thu, 23 Apr 2015 00:24:45 +0200 Subject: [PATCH 07/13] [Trivial] Update COPYING Corrected header --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 9fd3266622..cae0f5b6f4 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2009-2015 Bitcoin Developers +Copyright (c) 2009-2015 The Bitcoin Core developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 0a7bcb7e5577998e92cfe15604b5f7c0abd97e06 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 23 Apr 2015 14:50:22 +0200 Subject: [PATCH 08/13] fix IDE/compiler warning "extra ';'" in validationinterface.h --- src/validationinterface.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/validationinterface.h b/src/validationinterface.h index b4c93d72ca..2a4c7ecceb 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -28,13 +28,13 @@ void SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL); class CValidationInterface { protected: - virtual void SyncTransaction(const CTransaction &tx, const CBlock *pblock) {}; - virtual void EraseFromWallet(const uint256 &hash) {}; - virtual void SetBestChain(const CBlockLocator &locator) {}; - virtual void UpdatedTransaction(const uint256 &hash) {}; - virtual void Inventory(const uint256 &hash) {}; - virtual void ResendWalletTransactions(int64_t nBestBlockTime) {}; - virtual void BlockChecked(const CBlock&, const CValidationState&) {}; + virtual void SyncTransaction(const CTransaction &tx, const CBlock *pblock) {} + virtual void EraseFromWallet(const uint256 &hash) {} + virtual void SetBestChain(const CBlockLocator &locator) {} + virtual void UpdatedTransaction(const uint256 &hash) {} + virtual void Inventory(const uint256 &hash) {} + virtual void ResendWalletTransactions(int64_t nBestBlockTime) {} + virtual void BlockChecked(const CBlock&, const CValidationState&) {} friend void ::RegisterValidationInterface(CValidationInterface*); friend void ::UnregisterValidationInterface(CValidationInterface*); friend void ::UnregisterAllValidationInterfaces(); From 370338554745d8a515f00172838c06132ceb333b Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 23 Apr 2015 14:55:02 +0200 Subject: [PATCH 09/13] remove unused classes from db.h --- src/wallet/db.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/wallet/db.h b/src/wallet/db.h index 9596723b21..2df6f6e5a9 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -20,9 +20,6 @@ #include -class CDiskBlockIndex; -class COutPoint; - extern unsigned int nWalletDBUpdated; class CDBEnv From 59b149ff829a0c7e5f18e908a3734a5a447e7007 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 23 Apr 2015 14:56:05 +0200 Subject: [PATCH 10/13] remove unneeded incude of wallet/db.h from rpcmining.cpp --- src/rpcmining.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 24b865150a..a6a8b9422f 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -16,7 +16,6 @@ #include "util.h" #include "validationinterface.h" #ifdef ENABLE_WALLET -#include "wallet/db.h" #include "wallet/wallet.h" #endif From 5207f33f45ec477a46e742434579805b0b7391b8 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 27 Mar 2015 13:19:49 +0100 Subject: [PATCH 11/13] fix header include groups --- src/script/script.h | 3 ++- src/serialize.h | 4 ++-- src/util.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/script/script.h b/src/script/script.h index ed456f5c5a..d5045005be 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -6,6 +6,8 @@ #ifndef BITCOIN_SCRIPT_SCRIPT_H #define BITCOIN_SCRIPT_SCRIPT_H +#include "crypto/common.h" + #include #include #include @@ -14,7 +16,6 @@ #include #include #include -#include "crypto/common.h" static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes diff --git a/src/serialize.h b/src/serialize.h index 741f78f8b4..53d8af142f 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -6,6 +6,8 @@ #ifndef BITCOIN_SERIALIZE_H #define BITCOIN_SERIALIZE_H +#include "compat/endian.h" + #include #include #include @@ -18,8 +20,6 @@ #include #include -#include "compat/endian.h" - class CScript; static const unsigned int MAX_SIZE = 0x02000000; diff --git a/src/util.cpp b/src/util.cpp index da5b259aee..bfb95c9044 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -7,11 +7,6 @@ #include "config/bitcoin-config.h" #endif -#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) -#include -#include -#endif - #include "util.h" #include "chainparamsbase.h" @@ -23,6 +18,11 @@ #include +#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) +#include +#include +#endif + #ifndef WIN32 // for posix_fallocate #ifdef __linux__ From ff734e905f643e996d784e7b3f850ce4f798bee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Wed, 13 May 2015 18:59:50 +0200 Subject: [PATCH 12/13] Alphabetic order in makefile --- src/Makefile.am | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fc8050a4a2..24fd76e477 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,8 +77,8 @@ BITCOIN_CORE_H = \ base58.h \ bloom.h \ chain.h \ - chainparamsbase.h \ chainparams.h \ + chainparamsbase.h \ chainparamsseeds.h \ checkpoints.h \ checkqueue.h \ @@ -86,11 +86,13 @@ BITCOIN_CORE_H = \ coincontrol.h \ coins.h \ compat.h \ + compat/byteswap.h \ + compat/endian.h \ + compat/sanity.h \ compressor.h \ consensus/consensus.h \ consensus/params.h \ core_io.h \ - wallet/db.h \ eccryptoverify.h \ ecwrapper.h \ hash.h \ @@ -103,8 +105,8 @@ BITCOIN_CORE_H = \ merkleblock.h \ miner.h \ mruset.h \ - netbase.h \ net.h \ + netbase.h \ noui.h \ policy/fees.h \ pow.h \ @@ -117,8 +119,8 @@ BITCOIN_CORE_H = \ rpcprotocol.h \ rpcserver.h \ script/interpreter.h \ - script/script_error.h \ script/script.h \ + script/script_error.h \ script/sigcache.h \ script/sign.h \ script/standard.h \ @@ -144,12 +146,10 @@ BITCOIN_CORE_H = \ validationinterface.h \ version.h \ wallet/crypter.h \ - wallet/walletdb.h \ + wallet/db.h \ wallet/wallet.h \ wallet/wallet_ismine.h \ - compat/byteswap.h \ - compat/endian.h \ - compat/sanity.h + wallet/walletdb.h JSON_H = \ json/json_spirit.h \ @@ -216,39 +216,37 @@ libbitcoin_wallet_a_SOURCES = \ # crypto primitives library crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES) crypto_libbitcoin_crypto_a_SOURCES = \ - crypto/sha1.cpp \ - crypto/sha256.cpp \ - crypto/sha512.cpp \ - crypto/hmac_sha256.cpp \ - crypto/hmac_sha512.cpp \ - crypto/ripemd160.cpp \ crypto/common.h \ - crypto/sha256.h \ - crypto/sha512.h \ + crypto/hmac_sha256.cpp \ crypto/hmac_sha256.h \ + crypto/hmac_sha512.cpp \ crypto/hmac_sha512.h \ + crypto/ripemd160.cpp \ + crypto/ripemd160.h \ + crypto/sha1.cpp \ crypto/sha1.h \ - crypto/ripemd160.h + crypto/sha256.cpp \ + crypto/sha256.h \ + crypto/sha512.cpp \ + crypto/sha512.h # univalue JSON library univalue_libbitcoin_univalue_a_SOURCES = \ univalue/univalue.cpp \ - univalue/univalue_read.cpp \ - univalue/univalue_write.cpp \ + univalue/univalue.h \ univalue/univalue_escapes.h \ - univalue/univalue.h + univalue/univalue_read.cpp \ + univalue/univalue_write.cpp # common: shared between bitcoind, and bitcoin-qt and non-server tools libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_common_a_SOURCES = \ - arith_uint256.cpp \ amount.cpp \ + arith_uint256.cpp \ base58.cpp \ chainparams.cpp \ coins.cpp \ compressor.cpp \ - primitives/block.cpp \ - primitives/transaction.cpp \ core_read.cpp \ core_write.cpp \ eccryptoverify.cpp \ @@ -257,13 +255,15 @@ libbitcoin_common_a_SOURCES = \ key.cpp \ keystore.cpp \ netbase.cpp \ + primitives/block.cpp \ + primitives/transaction.cpp \ protocol.cpp \ pubkey.cpp \ script/interpreter.cpp \ script/script.cpp \ + script/script_error.cpp \ script/sign.cpp \ script/standard.cpp \ - script/script_error.cpp \ $(BITCOIN_CORE_H) # util: shared between all executables. From f13dac972c9cf308abf72a1d1a54135b1392eaea Mon Sep 17 00:00:00 2001 From: BitcoinPRReadingGroup Date: Wed, 22 Apr 2015 09:02:01 -0400 Subject: [PATCH 13/13] Comment edits and cleanup Original PR here: https://github.com/bitcoin/bitcoin/pull/6044 --- src/addrman.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/addrman.h b/src/addrman.h index e0494cab39..373b0f39f3 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -110,10 +110,10 @@ public: * * To that end: * * Addresses are organized into buckets. - * * Address that have not yet been tried go into 1024 "new" buckets. - * * Based on the address range (/16 for IPv4) of source of the information, 64 buckets are selected at random + * * Addresses that have not yet been tried go into 1024 "new" buckets. + * * Based on the address range (/16 for IPv4) of the source of information, 64 buckets are selected at random. * * The actual bucket is chosen from one of these, based on the range in which the address itself is located. - * * One single address can occur in up to 8 different buckets, to increase selection chances for addresses that + * * One single address can occur in up to 8 different buckets to increase selection chances for addresses that * are seen frequently. The chance for increasing this multiplicity decreases exponentially. * * When adding a new address to a full bucket, a randomly chosen entry (with a bias favoring less recently seen * ones) is removed from it first.