BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,586 Commits 1 Branch 186 Tags 48 MiB
Commit Graph

8586 Commits

Author SHA1 Message Date
Cory Fields a4d9f95653 build: comparison tool swap 
This should be functionally identical to what's in place now. It was built from
be0eef7744

That commit is the same as this pruned commit in TheBlueMatt's repo:
https://github.com/TheBlueMatt/bitcoinj/commit/0f7b5d8

Now we'll be able to trust the line numbers in the stack traces.
 2015-06-19 01:52:26 -04:00
Wladimir J. van der Laan 40400d53d3
Merge pull request #6272 
edbdf88 tests: Extend RPC proxy tests (Wladimir J. van der Laan)
baf0507 Improve proxy initialization (Wladimir J. van der Laan)
 2015-06-18 17:53:36 +02:00
Wladimir J. van der Laan 0abfa8a22f
Merge pull request #6158 
9d79afe add RPC tests for setban & disconnectnode (Jonas Schnelli)
1f02b80 setban: add RPCErrorCode (Jonas Schnelli)
d624167 fix CSubNet comparison operator (Jonas Schnelli)
4e36e9b setban: rewrite to UniValue, allow absolute bantime (Jonas Schnelli)
3de24d7 rename json field "bannedtill" to "banned_until" (Jonas Schnelli)
433fb1a [RPC] extend setban to allow subnets (Jonas Schnelli)
e8b9347 [net] remove unused return type bool from CNode::Ban() (Jonas Schnelli)
1086ffb [QA] add setban/listbanned/clearbanned tests (Jonas Schnelli)
d930b26 [RPC] add setban/listbanned/clearbanned RPC commands (Jonas Schnelli)
2252fb9 [net] extend core functionallity for ban/unban/listban (Jonas Schnelli)
 2015-06-18 16:48:37 +02:00
Wladimir J. van der Laan cbec57fd71
Merge pull request #6282 
0ce30ea fix crash on shutdown when e.g. changing -txindex and abort action (Philip Kaufmann)
 2015-06-18 16:40:37 +02:00
Jonas Schnelli 9d79afe9a9 add RPC tests for setban & disconnectnode 2015-06-17 21:40:56 +02:00
Jonas Schnelli 1f02b80253 setban: add RPCErrorCode 2015-06-17 21:40:56 +02:00
Jonas Schnelli d624167387 fix CSubNet comparison operator 2015-06-17 21:40:55 +02:00
Jonas Schnelli 4e36e9bcc7 setban: rewrite to UniValue, allow absolute bantime 2015-06-17 21:40:55 +02:00
Jonas Schnelli 3de24d7647 rename json field "bannedtill" to "banned_until" 2015-06-17 21:40:55 +02:00
Jonas Schnelli 433fb1a95d [RPC] extend setban to allow subnets 2015-06-17 21:40:55 +02:00
Jonas Schnelli e8b93473f1 [net] remove unused return type bool from CNode::Ban() 2015-06-17 21:40:55 +02:00
Jonas Schnelli 1086ffba26 [QA] add setban/listbanned/clearbanned tests 2015-06-17 21:40:55 +02:00
Jonas Schnelli d930b26a26 [RPC] add setban/listbanned/clearbanned RPC commands 2015-06-17 21:40:55 +02:00
Jonas Schnelli 2252fb91cd [net] extend core functionallity for ban/unban/listban 2015-06-17 21:40:55 +02:00
Wladimir J. van der Laan 9849c663b1
Merge pull request #6280 
b19a88b depends: fix Boost 1.55 build on GCC 5 (Jacob Welsh)
 2015-06-17 09:09:13 +02:00
Wladimir J. van der Laan 324f20036e
Merge pull request #6286 
a3a80c2 remove berkeley-db4 workaround (rion)
 2015-06-17 08:58:04 +02:00
Philip Kaufmann 0ce30eaa36 fix crash on shutdown when e.g. changing -txindex and abort action 
- fixes #3136
- the problem is related to Boost path and a static initialized internal
  pointer
- using a std::string in CDBEnv::EnvShutdown() prevents the problem
- this removes the boost::filesystem::path path field from CDBEnv
 2015-06-16 15:03:50 +02:00
Wladimir J. van der Laan 754aae5148
Merge pull request #6271 
60dbe73 New RPC command disconnectnode (Alex van der Peet)
 2015-06-16 14:27:27 +02:00
Alex van der Peet 60dbe73016 New RPC command disconnectnode 2015-06-16 14:19:41 +02:00
Wladimir J. van der Laan a903ad7e9c
Merge pull request #6283 
26a639e remove using namespace std from addrman.cpp (Philip Kaufmann)
40c592a make CAddrMan::size() return the correct type of size_t (Philip Kaufmann)
 2015-06-16 14:06:59 +02:00
Wladimir J. van der Laan 7fe29d84bd
Merge pull request #6285 
72bf90d Fix scheduler build with some boost versions. (Cory Fields)
 2015-06-16 13:55:47 +02:00
rion a3a80c253c remove berkeley-db4 workaround 
"brew install berkeley-db4" appears to be working again.  simplified instructions by removing the berkeley-db4 workaround.
 2015-06-15 21:02:29 -07:00
Cory Fields 72bf90d770 Fix scheduler build with some boost versions. 
Some boost versions have a conflicting overload of wait_until that returns void.
Explicitly use a template here to avoid hitting that overload.
 2015-06-15 16:29:57 -04:00
Philip Kaufmann 26a639e21f remove using namespace std from addrman.cpp 2015-06-15 14:45:19 +02:00
Philip Kaufmann 40c592aa21 make CAddrMan::size() return the correct type of size_t 2015-06-15 14:43:31 +02:00
Wladimir J. van der Laan edbdf8855d tests: Extend RPC proxy tests 
Also test -noonion
 2015-06-15 12:45:13 +02:00
Wladimir J. van der Laan c1fb0e1075
Merge pull request #6274 
02a6702 Add option `-alerts` to opt out of alert system (Wladimir J. van der Laan)
 2015-06-15 09:57:33 +02:00
Wladimir J. van der Laan 02a6702a82 Add option `-alerts` to opt out of alert system 
Make it possible to opt-out of the centralized alert system by providing
an option `-noalerts` or `-alerts=0`. The default remains unchanged.

This is a gentler form of #6260, in which I went a bit overboard by
removing the alert system completely.

I intend to add this to the GUI options in another pull after this.
 2015-06-15 09:53:33 +02:00
Wladimir J. van der Laan d4565b6080
Merge pull request #6269 
c110575 gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures (Cory Fields)
 2015-06-15 09:53:04 +02:00
Wladimir J. van der Laan 5ebe7db6d0
Merge pull request #6257 
ef2a3de Add paytxfee to getwalletinfo, warnings to getnetworkinfo (Stephen)
 2015-06-15 09:39:30 +02:00
Wladimir J. van der Laan f3d4dbb939
Merge pull request #6276 
7d6a85a Fix getbalance * (Tom Harding)
 2015-06-15 09:02:38 +02:00
Wladimir J. van der Laan 06818f7145
doc: Add section on plurals to strings policy 
Thanks to @pryds for explaining this to me on Transifex.
 2015-06-15 08:43:56 +02:00
Jacob Welsh b19a88b2a0 depends: fix Boost 1.55 build on GCC 5 
Boost assumes variadic templates are always available in GCC 4.4+, but
they aren't since we don't build with -std=c++11.

This applies the patch that fixed the issue in boost 1.57:
eec8085549

See also: https://svn.boost.org/trac/boost/ticket/10500
 2015-06-13 17:02:34 -05:00
Tom Harding 7d6a85ab5b Fix getbalance * 
Chance "getbalance *" not to use IsTrusted.  The method and result
now match the "getbalance <specific-account>" behavior. In
particular, "getbalance * 0" now works.

Also fixed a comment -- GetGalance has required 1 confirmation
for many years, and the default "getbalance *" behavior matches
that.
 2015-06-12 15:31:01 -07:00
Wladimir J. van der Laan ab0ec67903
Merge pull request #6209 
e059726 [Qt] deselect peer when switching away from peers tab in RPC console (Philip Kaufmann)
7211ada [Qt] replace Boost foreach with Qt version peertablemodel.cpp (Philip Kaufmann)
1b0db7b [Qt] extend rpc console peers tab (Philip Kaufmann)
 2015-06-12 16:49:53 +02:00
Wladimir J. van der Laan 8ccc07c077
Merge pull request #6256 
65b9454 Use best header chain timestamps to detect partitioning (Gavin Andresen)
 2015-06-12 16:44:36 +02:00
Wladimir J. van der Laan baf05075fa Improve proxy initialization 
Simplify and make the code in AppInit2 more clear.

This provides a straightforward flow, gets rid of .count() (which makes
it possible to override an earlier provided proxy option to nothing), as
well as comments the different cases.
 2015-06-12 12:41:44 +02:00
Wladimir J. van der Laan ebab5d3c59
Merge pull request #6266 
0cc7b23 Fix univalue handling of \u0000 characters. (Daniel Kraft)
 2015-06-12 09:15:26 +02:00
Stephen ef2a3de25c Add paytxfee to getwalletinfo, warnings to getnetworkinfo 2015-06-11 16:12:34 -04:00
Wladimir J. van der Laan dd8fe8215a
Merge pull request #6221 
c257a8c Prune: Support noncontiguous block files (Adam Weiss)
 2015-06-11 18:24:35 +02:00
Daniel Kraft 0cc7b2352e Fix univalue handling of \u0000 characters. 
Univalue's parsing of \u escape sequences did not handle NUL characters
correctly.  They were, effectively, dropped.  The extended test-case
fails with the old code, and is fixed with this patch.
 2015-06-11 12:09:05 +02:00
Wladimir J. van der Laan 51870fc151
Merge pull request #6264 
9b5659d Remove translation for -help-debug options (Wladimir J. van der Laan)
 2015-06-11 10:50:01 +02:00
Philip Kaufmann e059726811 [Qt] deselect peer when switching away from peers tab in RPC console 2015-06-11 08:39:08 +02:00
Philip Kaufmann 7211adad85 [Qt] replace Boost foreach with Qt version peertablemodel.cpp 2015-06-11 08:38:02 +02:00
Philip Kaufmann 1b0db7b984 [Qt] extend rpc console peers tab 
- add node id, ping wait, whitelisted and common height
- rephrase some labels to make them easier to understand for users
 2015-06-11 08:38:01 +02:00
Cory Fields c110575a92 gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures 
Rather than fetching a signature.tar.gz from somewhere on the net, instruct
Gitian to use a signature from a tag in the bitcoin-detached-sigs repository
which corresponds to the tag of the release being built.

This changes detached-sig-apply.sh to take a dirname rather than a tarball as
an argument, though detached-sig-create.sh still outputs a tarball for
convenience.
 2015-06-10 17:54:46 -04:00
Wladimir J. van der Laan eba2f061a0
Merge pull request #6061 
eb83719 Consensus: Refactor: Separate Consensus::CheckTxInputs and GetSpendHeight in CheckInputs (Jorge Timón)
 2015-06-10 18:04:38 +02:00
Wladimir J. van der Laan 1fea667216
Merge pull request #5975 
425c3a8 Consensus: Separate CheckIndexAgainstCheckpoint() from ContextualCheckBlockHeader (Jorge Timón)
 2015-06-10 14:42:31 +02:00
Jorge Timón eb837199a0 Consensus: Refactor: Separate Consensus::CheckTxInputs and GetSpendHeight in CheckInputs 2015-06-10 14:07:30 +02:00
Jorge Timón 425c3a87ff Consensus: Separate CheckIndexAgainstCheckpoint() from ContextualCheckBlockHeader 2015-06-10 13:04:50 +02:00