diff options
| -rw-r--r-- | doc/dnsseed-policy.md | 3 | ||||
| -rw-r--r-- | src/bloom.cpp | 2 | ||||
| -rw-r--r-- | src/chainparams.cpp | 1 | ||||
| -rw-r--r-- | src/core.cpp | 2 | ||||
| -rw-r--r-- | src/core_write.cpp | 2 | ||||
| -rw-r--r-- | src/key.cpp | 2 | ||||
| -rw-r--r-- | src/main.h | 7 | ||||
| -rw-r--r-- | src/qt/recentrequeststablemodel.cpp | 2 | ||||
| -rw-r--r-- | src/script.cpp | 2 | ||||
| -rw-r--r-- | src/script.h | 21 |
10 files changed, 18 insertions, 26 deletions
diff --git a/doc/dnsseed-policy.md b/doc/dnsseed-policy.md index 73e307f7cd..66a1757ac5 100644 --- a/doc/dnsseed-policy.md +++ b/doc/dnsseed-policy.md @@ -3,6 +3,9 @@ Expectations for DNS Seed operators Bitcoin Core attempts to minimize the level of trust in DNS seeds, but DNS seeds still pose a small amount of risk for the network. +As such, DNS seeds must be run by entities which have some minimum +level of trust within the Bitcoin community. + Other implementations of Bitcoin software may also use the same seeds and may be more exposed. In light of this exposure this document establishes some basic expectations for the expectations diff --git a/src/bloom.cpp b/src/bloom.cpp index 85a2ddc189..e34041336f 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -10,6 +10,8 @@ #include <math.h> #include <stdlib.h> +#include <boost/foreach.hpp> + #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455 #define LN2 0.6931471805599453094172321214581765680755001343602552 diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ce99f268f3..bfe50d77d5 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -99,7 +99,6 @@ public: vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); vSeeds.push_back(CDNSSeedData("bitnodes.io", "seed.bitnodes.io")); - vSeeds.push_back(CDNSSeedData("open-nodes.org", "seeds.bitcoin.open-nodes.org")); vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); base58Prefixes[PUBKEY_ADDRESS] = list_of(0); diff --git a/src/core.cpp b/src/core.cpp index e6636ae04f..8dcda0126a 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -7,6 +7,8 @@ #include "tinyformat.h" +#include <boost/foreach.hpp> + std::string COutPoint::ToString() const { return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10), n); diff --git a/src/core_write.cpp b/src/core_write.cpp index e63b64d692..e66e75515c 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -11,6 +11,8 @@ #include "utilmoneystr.h" #include "base58.h" +#include <boost/foreach.hpp> + using namespace std; string EncodeHexTx(const CTransaction& tx) diff --git a/src/key.cpp b/src/key.cpp index a253f8666a..a058ef05e5 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -396,7 +396,7 @@ const unsigned char vchMaxModHalfOrder[32] = { 0xDF,0xE9,0x2F,0x46,0x68,0x1B,0x20,0xA0 }; -const unsigned char vchZero[0] = {}; +const unsigned char vchZero[1] = {0}; } // anon namespace diff --git a/src/main.h b/src/main.h index 6ef16c1ed1..d38d033d2c 100644 --- a/src/main.h +++ b/src/main.h @@ -546,15 +546,16 @@ enum BlockStatus { BLOCK_VALID_TRANSACTIONS = 3, // only first tx is coinbase, 2 <= coinbase input script length <= 100, transactions valid, no duplicate txids, sigops, size, merkle root BLOCK_VALID_CHAIN = 4, // outputs do not overspend inputs, no double spends, coinbase output ok, immature coinbase spends, BIP30 BLOCK_VALID_SCRIPTS = 5, // scripts/signatures ok - BLOCK_VALID_MASK = 7, + BLOCK_VALID_MASK = BLOCK_VALID_HEADER | BLOCK_VALID_TREE | BLOCK_VALID_TRANSACTIONS | + BLOCK_VALID_CHAIN | BLOCK_VALID_SCRIPTS, BLOCK_HAVE_DATA = 8, // full block available in blk*.dat BLOCK_HAVE_UNDO = 16, // undo data available in rev*.dat - BLOCK_HAVE_MASK = 24, + BLOCK_HAVE_MASK = BLOCK_HAVE_DATA | BLOCK_HAVE_UNDO, BLOCK_FAILED_VALID = 32, // stage after last reached validness failed BLOCK_FAILED_CHILD = 64, // descends from failed block - BLOCK_FAILED_MASK = 96 + BLOCK_FAILED_MASK = BLOCK_FAILED_VALID | BLOCK_FAILED_CHILD, }; /** The block chain is a tree shaped structure starting with the diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 9e3976644e..0e5802922c 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -8,6 +8,8 @@ #include "guiutil.h" #include "optionsmodel.h" +#include <boost/foreach.hpp> + RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) : walletModel(parent) { diff --git a/src/script.cpp b/src/script.cpp index 28c50a1358..21883bd41a 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -22,6 +22,8 @@ #include <boost/tuple/tuple_comparison.hpp> #include <boost/tuple/tuple.hpp> +#include <boost/foreach.hpp> + using namespace std; using namespace boost; diff --git a/src/script.h b/src/script.h index 8e6aedcc63..d17cfe3fa4 100644 --- a/src/script.h +++ b/src/script.h @@ -15,10 +15,8 @@ #include <string> #include <vector> -#include <boost/foreach.hpp> #include <boost/variant.hpp> -class CCoins; class CKeyStore; class CTransaction; struct CMutableTransaction; @@ -411,25 +409,6 @@ inline std::string ValueString(const std::vector<unsigned char>& vch) return HexStr(vch); } -inline std::string StackString(const std::vector<std::vector<unsigned char> >& vStack) -{ - std::string str; - BOOST_FOREACH(const std::vector<unsigned char>& vch, vStack) - { - if (!str.empty()) - str += " "; - str += ValueString(vch); - } - return str; -} - - - - - - - - /** Serialized script, used inside transaction inputs and outputs */ class CScript : public std::vector<unsigned char> { |