DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
8,462 Commits 6 Branches 7 Tags
2edec4fe68c5fe0fefb4c0561e8353462bb439bc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 666e973b2f Merge pull request #6219 
7d4b5cb gitian: Bump cache dir for 0.11 (Cory Fields)
 2015-06-03 15:25:44 +02:00
Wladimir J. van der Laan 5901596548 json: fail read_string if string contains trailing garbage 
Change `read_string` to fail when not the entire input has been
consumed. This avoids unexpected, even dangerous behavior (fixes #6223).

The new JSON parser adapted in #6121 also solves this problem so in
master this is a temporary fix, but should be backported to older releases.

Also adds tests for the new behavior.

Github-Pull: #6226
Rebased-From: 4e157fc60dae5ca69933ea4c1585a2a078b4d957
 2015-06-03 15:16:37 +02:00
Wladimir J. van der Laan dfdb6dd052 build: disable optional use of gmp in internal secp256k1 build 
Until secp256k1 is used for verification there is no reason for Bitcoin
Core's secp256k1 to link against gmp, even if available. Pass a flag to
configure to override the bignum implementation.

This fixes a crash at runtime on ppc64 reported by @gmaxwell.

Github-Pull: #6210
Rebased-From: 7fd5b801ff16d748b5ca13ded09ed5da8eacf7e7
 2015-06-02 08:41:25 +02:00
Wladimir J. van der Laan 2be094eeba qt: Periodic translation update 2015-06-01 12:35:05 +02:00
Wladimir J. van der Laan 8e15efa76c Bump version to 0.11 2015-06-01 10:25:26 +02:00
Wladimir J. van der Laan e9d0d252fc Merge pull request #6208 
d6922aa [net, trivial] remove using namespace std pollution in netbase.cpp (Philip Kaufmann)
49b2292 [net, trivial] explicitly use std::string for FindNode (Philip Kaufmann)
 2015-06-01 09:53:45 +02:00
Wladimir J. van der Laan 42746b0476 Merge pull request #6193 
6e71efa [REST] remove json input for getutxos, limit to query max. 15 outpoints (Jonas Schnelli)
64b8027 rest.cpp: strip whitespace (Jonas Schnelli)
 2015-06-01 09:48:17 +02:00
Wladimir J. van der Laan 921ea89bc3 Merge pull request #6195 
8273793 Eliminate compiler warning due to unused variable (Suhas Daftuar)
 2015-06-01 08:49:47 +02:00
Wladimir J. van der Laan b679a6b403 doc: Add to 0.11 release notes 
Add information about further notable changes:

- Big endian support
- Memory usage optimization
- Disable wallet transaction broadcast
- Stream isolation for Tor
 2015-05-29 17:32:31 +02:00
Wladimir J. van der Laan fb061c3391 Merge pull request #6194 
ee9a2e4 Fix walletbackup.py after directory restructuring (Suhas Daftuar)
 2015-05-29 08:22:34 +02:00
Wladimir J. van der Laan ce56f5621a Merge pull request #6173 
e697343 Chainparams: Explicit CMessageHeader::MessageStartChars to functions in main: (Jorge Timón)
 2015-05-27 16:20:55 +02:00
Wladimir J. van der Laan c7c9af381c Merge pull request #5669 
da29ecb Consensus: MOVEONLY: Move CValidationState from main consensus/validation (jtimon)
27afcd8 Consensus: Refactor: Decouple CValidationState from main::AbortNode() (Cory Fields)
 2015-05-27 15:00:02 +02:00
Wladimir J. van der Laan 2b2d5b92b9 Merge pull request #6189 
44e1aad Autoprune release notes included (mrbandrews)
 2015-05-27 13:26:39 +02:00
Wladimir J. van der Laan c608b6daf9 Merge pull request #6097 
7b7f258 rpc-tests: remove python-bitcoinrpc directory (Jonas Schnelli)
a85b2e2 pull-tester/rpc-tests.sh: disable script_test.py test (Jonas Schnelli)
3e875b1 pull-tester/rpc-tests.sh: allow passing throug of arguments (Jonas Schnelli)
00706a5 update rpc-tests readme.md (Jonas Schnelli)
344e08e extend rpc-tests.sh control script with non-travis tests (Jonas Schnelli)
64937fe [QA] restructure rpc tests directory (Jonas Schnelli)
 2015-05-27 13:20:53 +02:00
Wladimir J. van der Laan 68aff60e4a Merge pull request #6190 
1fe4c4f gitian-downloader: Update luke-jr's key (Luke Dashjr)
 2015-05-27 11:51:00 +02:00
Wladimir J. van der Laan 0bcf04f046 Merge pull request #6153 
8c35b6f Parameter interaction: disable upnp if -proxy set (Wladimir J. van der Laan)
 2015-05-27 09:33:01 +02:00
Wladimir J. van der Laan df992b9c18 Merge pull request #6174 
213f257 doc: add translation strings policy (Wladimir J. van der Laan)
 2015-05-27 09:31:26 +02:00
Wladimir J. van der Laan 182686cdbd Merge pull request #6186 
b45c50c Fix two problems in CSubNet parsing (Wladimir J. van der Laan)
19e8d7b Simplify code for CSubnet (Wladimir J. van der Laan)
 2015-05-27 09:08:39 +02:00
Wladimir J. van der Laan 165e323d85 qt: Periodic translation update 2015-05-26 14:36:47 +02:00
Wladimir J. van der Laan e3ed6a9785 doc: Add preliminary changelog for 0.11 to release notes 2015-05-26 14:35:48 +02:00
Wladimir J. van der Laan 9f7809f6c3 Merge pull request #5976 
8ba7f84 Reduce download timeouts as blocks arrive (Suhas Daftuar)
 2015-05-26 13:02:40 +02:00
Wladimir J. van der Laan 847be04449 Merge pull request #6187 
8697ff3 Remove duplicate chainparams.h include from alert_tests (Michael Ford)
 2015-05-26 12:02:36 +02:00
Wladimir J. van der Laan e9af4e65b5 Merge pull request #5947 
36cba8f Alert if it is very likely we are getting a bad chain (Gavin Andresen)
 2015-05-26 10:41:17 +02:00
Wladimir J. van der Laan b45c50ce51 Fix two problems in CSubNet parsing 
Fix two CSubNet constructor problems:

- The use of `/x` where 8 does not divide x was broken, due to a
  bit-order issue

- The use of e.g. `1.2.3.4/24` where the netmasked bits in the network
  are not 0 was broken. Fix this by explicitly normalizing the netwok
  according to the bitmask.

Also add tests for these cases.

Fixes #6179. Thanks to @jonasschnelli for reporting and initial fix.
 2015-05-26 08:59:59 +02:00
Wladimir J. van der Laan 19e8d7be42 Simplify code for CSubnet 
Simplify the code by using CAddress.ip directly, instead of the reversed
GetByte() semantics.
 2015-05-26 08:59:13 +02:00
Wladimir J. van der Laan e1412d3e96 Merge pull request #6159 
ffdda4e Catch errors on datadir lock and pidfile delete (Adam Weiss)
 2015-05-24 10:57:22 +02:00
Wladimir J. van der Laan 2d84241d26 doc: Add historical release notes 0.9.5 2015-05-24 09:49:18 +02:00
Wladimir J. van der Laan 213f257a03 doc: add translation strings policy 2015-05-23 11:30:27 +02:00
Wladimir J. van der Laan 7708fcde36 Merge pull request #6098 
cc24610 Update Windows resource files (and add one for bitcoin-tx) (Luke Dashjr)
 2015-05-22 08:35:38 +02:00
Wladimir J. van der Laan b3024f077b Merge pull request #6168 
7f68c7d contrib/linearize: Support linearization of testnet blocks (Jeff Garzik)
 2015-05-22 08:17:08 +02:00
Wladimir J. van der Laan 4bf83b27b2 Merge pull request #6171 
bdcf5de Fix intermittent hang issue in scheduler_tests (Wladimir J. van der Laan)
 2015-05-21 22:00:07 +02:00
Wladimir J. van der Laan bdcf5dea7c Fix intermittent hang issue in scheduler_tests 
Don't clear `stopRequested` and `stopWhenEmpty` at the top of
`serviceQueue`, as this results in a race condition: on systems under
heavy load, some of the threads only get scheduled on the CPU when the
other threads have already finished their work. This causes the flags to
be cleared post-hoc and thus those threads to wait forever.

The potential drawback of this change is that the scheduler cannot be
restarted after being stopped (an explicit reset would be needed), but
we don't use this functionality anyway.
 2015-05-21 19:07:10 +02:00
Wladimir J. van der Laan 0d862c2739 Merge pull request #6160 
16d9cb7 [QT] overviewpage: make sure warning icons gets colored (Jonas Schnelli)
 2015-05-20 13:21:01 +02:00
Wladimir J. van der Laan 180c164e4f Merge pull request #6161 
fb21862 [QT] mainwindow toolbar must not be movable (Jonas Schnelli)
 2015-05-20 13:19:42 +02:00
Wladimir J. van der Laan 30dc3c1b38 Merge pull request #6116 
d1a3866 build: Cope with spaces in filenames when creating/applying OSX sigs (Cory Fields)
7cef321 [Mac only] rename Bitcoin-Qt.app to "Bitcoin Core.app" (Jonas Schnelli)
 2015-05-20 13:08:51 +02:00
Wladimir J. van der Laan 377711ff3f Merge pull request #5996 
935bd0a Chainparams: Refactor: Decouple main::GetBlockValue() from Params() [renamed GetBlockSubsidy] (Jorge Timón)
 2015-05-19 11:42:47 +02:00
Wladimir J. van der Laan e2e7f9513f qt: fix unused function warning in scicon.cpp 
Enclose MakeSingleColorImage in an anonymous namespace to avoid a
unused function warning on Windows and MacOSX.

Github-Pull: #6143
 2015-05-19 11:27:54 +02:00
Wladimir J. van der Laan be31ff7d8d doc: Add historical release notes for 0.10.1 0.10.2 0.9.4 2015-05-18 20:48:09 +02:00
Wladimir J. van der Laan a5a521e842 Merge pull request #6154 
b448002 [Docs] fix and improve REST documentation (Jonas Schnelli)
 2015-05-18 20:18:52 +02:00
Wladimir J. van der Laan 8c35b6f3be Parameter interaction: disable upnp if -proxy set 
To protect privacy, do not use UPNP when a proxy is set. The user may
still specify -listen=1 to listen locally (for a hidden service), so
don't rely on this happening through -listen.

Fixes #2927.
 2015-05-18 11:22:39 +02:00
Wladimir J. van der Laan 26e08a16a6 Merge pull request #6126 
2457dc4 Change default nTxConfirmTarget to 2 (Alex Morcos)
77ed59d wallet: Introduce constant for `-txconfirmtarget` default (Wladimir J. van der Laan)
 2015-05-18 09:07:02 +02:00
Wladimir J. van der Laan 77ed59df4d wallet: Introduce constant for -txconfirmtarget default 2015-05-18 09:00:24 +02:00
Wladimir J. van der Laan a6d2e31e8b Merge pull request #6144 
881027a Remove assertion from ~LockedPageManager (Wladimir J. van der Laan)
 2015-05-18 07:53:09 +02:00
Wladimir J. van der Laan ec81395a4c Merge pull request #6150 
3a6cc3c Missing from Documentation Index (Shawn Wilkinson)
 2015-05-18 07:52:19 +02:00
Wladimir J. van der Laan ec82d8c99c Merge pull request #6062 
ff7fe8b Fix for correctly including climits on certain platforms {DragonFlyBSD}. (sinetek)
 2015-05-16 10:48:49 +02:00
Wladimir J. van der Laan 97ccfdca8a Merge pull request #6137 
a5baba5 minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
 2015-05-16 09:37:01 +02:00
Wladimir J. van der Laan 2a822987dd Merge pull request #6129 
c208040 Fix for clearing fCheckForPruning (Alex Morcos)
 2015-05-15 17:32:54 +02:00
Wladimir J. van der Laan ac75bafafd qt: translations update 2015-05-15 14:00:56 +02:00
Wladimir J. van der Laan e47c94e64c Merge pull request #6135 
f13dac9 Comment edits and cleanup (BitcoinPRReadingGroup)
ff734e9 Alphabetic order in makefile (Jorge Timón)
5207f33 fix header include groups (Philip Kaufmann)
59b149f remove unneeded incude of wallet/db.h from rpcmining.cpp (Philip Kaufmann)
3703385 remove unused classes from db.h (Philip Kaufmann)
0a7bcb7 fix IDE/compiler warning "extra ';'" in validationinterface.h (Philip Kaufmann)
3b00e7c [Trivial] Update COPYING (sandakersmann)
dd9e688 Trivial: Corrected owner of DNS seeder (ayeowch)
a60bfd8 [init] better message when no wallet support is compiled in (Philip Kaufmann)
78f44b6 Capitalized P2P (sandakersmann)
8e9248d [Trivial] Cryptocurrency is one word (sandakersmann)
803f51e Typo in GetRawMemPool RPC method help: "]" --> "}" (Chris Arnesen)
605a735 addrman: update comments (Pavel Vasin)
 2015-05-15 13:59:07 +02:00
Wladimir J. van der Laan f0043c2d6d Merge pull request #5968 
51aa249 Chainparams: Refactor: Decouple IsSuperMajority from Params() (Jorge Timón)
 2015-05-15 13:52:54 +02:00
Wladimir J. van der Laan 6fb90d8983 Merge pull request #6102 
86a5f4b Relocate calls to CheckDiskSpace (Alex Morcos)
67708ac Write block index more frequently than cache flushes (Pieter Wuille)
b3ed423 Cache tweak and logging improvements (Pieter Wuille)
fc684ad Use accurate memory for flushing decisions (Pieter Wuille)
046392d Keep track of memory usage in CCoinsViewCache (Pieter Wuille)
540629c Add memusage.h (Pieter Wuille)
 2015-05-15 13:43:02 +02:00
Wladimir J. van der Laan 63e7016566 Merge pull request #6140 
8f0947b Increase timeouts in pruning.py and modify warning language. (Alex Morcos)
b89f307 Fix incorrect variable name in FindFilesToPrune (Suhas Daftuar)
 2015-05-15 13:37:31 +02:00
Wladimir J. van der Laan 16e8ea3dde Merge pull request #6045 
cc3db87 doc: Documentation in Markdown for Depends Dir (Shawn Wilkinson)
 2015-05-15 12:35:58 +02:00
Wladimir J. van der Laan 881027a79d Remove assertion from ~LockedPageManager 
This assertion will occur any time that the client quits without
shutting down properly due to an error condition. As the user will
report this error instead of the error that was the root cause, it is
better to remove it.
 2015-05-15 11:44:58 +02:00
Wladimir J. van der Laan 339321522c Merge pull request #6136 
235b3a7 depends: sanity-check sources and cached builds (Cory Fields)
 2015-05-14 17:51:00 +02:00
Wladimir J. van der Laan a538126a8c Merge pull request #6110 
ca5f688 [QT] don't colorize icons on win and mac (Jonas Schnelli)
7247d10 [QT] use alert icon with tooltip insted of "(out of sync)" text (Jonas Schnelli)
51c7c70 [QT] remove frame to avoid double-frame situation in sendcoinsentry.ui (Jonas Schnelli)
2a6b844 [QT] change transaction amount and height in overview page (Jonas Schnelli)
 2015-05-14 13:50:46 +02:00
Wladimir J. van der Laan 2cc1372190 Merge pull request #5159 
b649e03 Create new BlockPolicyEstimator for fee estimates (Alex Morcos)
 2015-05-13 17:10:02 +02:00
Wladimir J. van der Laan 484821870b Merge pull request #6123 
bba7c24 Avoid crash on start in TestBlockValidity with gen=1. (Gregory Maxwell)
 2015-05-12 16:37:19 +02:00
Wladimir J. van der Laan 40de49c358 Merge pull request #5932 
107d35b [Qt] add defaultConfirmTarget constant to sendcoinsdialog (Philip Kaufmann)
 2015-05-12 14:38:00 +02:00
Wladimir J. van der Laan 7e0e7f823f Merge pull request #6058 
03c5687 appropriate response when trying to get a block in pruned mode (Jonas Schnelli)
1b2e555 add autoprune information to RPC "getblockchaininfo" (Jonas Schnelli)
 2015-05-11 16:40:58 +02:00
Wladimir J. van der Laan c1409d11ad Merge pull request #6073 
a681663 clarify that there are only two nodes (Jameson Lopp)
 2015-05-11 13:41:03 +02:00
Wladimir J. van der Laan 23254131a3 Merge pull request #6093 
3da7849 [squashme] simplify SetupEnvironment() (by dexX7) (Jonas Schnelli)
b3ffcdf don't imbue boost::filesystem::path with locale "C" on windows (Jonas Schnelli)
 2015-05-10 14:22:53 +02:00
Wladimir J. van der Laan 7eb66182f3 Merge pull request #6117 
a1d0ec4 re-add -reindex help message (Jonas Schnelli)
 2015-05-09 09:31:33 +02:00
Wladimir J. van der Laan fec5c0ea05 Merge pull request #6112 
1c54757 Add more script edge condition tests. (Dave Collins)
 2015-05-07 18:07:50 +02:00
Wladimir J. van der Laan 9ef00c363d Merge pull request #5958 
231072f [QA] add multisig rpc tests (Jonas Schnelli)
 2015-05-07 13:18:43 +02:00
Wladimir J. van der Laan 6a877e870e Merge pull request #6034 
a574899 chaincodes: abstract away more chaincode behavior [squashme] replace struct CCainCode with a typedef uint256 ChainCode (Cory Fields)
8cf1485 Abstract chaincodes into CChainCode (Pieter Wuille)
 2015-05-06 18:37:49 +02:00
Wladimir J. van der Laan 1fd2d39529 Merge pull request #5420 
6b4feb8 [QA] rest.py RPC test: change setgenerate() to generate() (Jonas Schnelli)
97ee866 [REST] getutxos REST command (based on Bip64) (Jonas Schnelli)
 2015-05-06 16:50:05 +02:00
Wladimir J. van der Laan 12f3488253 Merge pull request #6047 
a56054b Update key.cpp to use new libsecp256k1 (Pieter Wuille)
a591d98 Squashed 'src/secp256k1/' changes from 1897b8e..22f60a6 (Pieter Wuille)
 2015-05-06 12:29:07 +02:00
Wladimir J. van der Laan 00820f921d Merge pull request #6055 
a8cdaf5 checkpoints: move the checkpoints enable boolean into main (Cory Fields)
11982d3 checkpoints: Decouple checkpoints from Params (Cory Fields)
6996823 checkpoints: make checkpoints a member of CChainParams (Cory Fields)
9f13a10 checkpoints: store mapCheckpoints in CCheckpointData rather than a pointer (Cory Fields)
 2015-05-06 11:38:39 +02:00
Wladimir J. van der Laan 40f5e8dc2a Merge pull request #5937 
a71ab10 QA: add RPC tests for error reporting of "signrawtransaction" (dexX7)
8ac2a4e RPC: show script verification errors in "signrawtransaction" result (dexX7)
 2015-05-05 19:04:53 +02:00
Wladimir J. van der Laan 31c0bf1c46 Merge pull request #6080 
1a0259f add jonasschnellis dns seeder (Jonas Schnelli)
 2015-05-05 18:56:48 +02:00
Wladimir J. van der Laan f0c4281f84 Merge pull request #6105 
00ea546 build: quiet the exe-installer output (Cory Fields)
cc602d0 travis: don't spew fixme messages when running wine tests (Cory Fields)
c1149f7 build: if there's no recent git tag, don't spew error messages (Cory Fields)
 2015-05-05 08:50:08 +02:00
Wladimir J. van der Laan 12f78ed4f9 qt: update translations from Transifex - first run for 0.11 2015-05-05 08:48:54 +02:00
Wladimir J. van der Laan fc44231cb7 trivial: Merge pruning help message after Transifex comment 
The prune help message was broken in nonsensical parts. Merge it into
one, this is easier for translators.

Reported by yahoe.001 on transifex.
 2015-05-04 18:48:38 +02:00
Wladimir J. van der Laan 3e2559c7c7 Merge pull request #6104 
0414045 Show an init message while activating best chain (Wladimir J. van der Laan)
 2015-05-04 18:42:47 +02:00
Wladimir J. van der Laan 04140457f4 Show an init message while activating best chain 
Connecting the chain can take quite a while.
All the while it is still showing `Loading wallet...`.
Add an init message to inform the user what is happening.
 2015-05-04 17:39:19 +02:00
Wladimir J. van der Laan 16341cc15c Merge pull request #5418 
bba2216 RPC test for "#5418 Report missing inputs in sendrawtransaction" (Jonas Schnelli)
de8e801 Report missing inputs in sendrawtransaction (Pieter Wuille)
 2015-05-04 12:42:26 +02:00
Wladimir J. van der Laan 59305cebee qt: fix numerusform in English translation 
Ref: transifex issue https://www.transifex.com/projects/p/bitcoin/translate/#da/qt-translation-011x/c/47723791
 2015-05-04 12:25:22 +02:00
Wladimir J. van der Laan 7f5d7e9d6d Merge pull request #6086 
d3c09ba Trivial: useless cast (ptime)(I'm ptime) (svost)
 2015-05-04 09:30:04 +02:00
Wladimir J. van der Laan 20b3dc85ed qt: English translation update before enabling translation for 0.11 2015-05-04 08:09:37 +02:00
Wladimir J. van der Laan 00e76db8c2 Merge pull request #6085 
b05a89b Non-grammatical language improvements (Luke Dashjr)
7e6d23b Bugfix: Grammar fixes (Corinne Dashjr)
 2015-05-04 08:01:58 +02:00
Wladimir J. van der Laan aa9fa938d9 Merge pull request #6096 
3727cbb change AC_PACKAGE_BUGREPORT from info@bitcoin.org to github issue tracker URL (Jonas Schnelli)
 2015-05-04 07:55:07 +02:00
Wladimir J. van der Laan 82d06e2338 Merge pull request #6094 
2a22d4b Fix comptool send_message call when MAX_INV_SZ reached (Suhas Daftuar)
574db48 Fix potential race conditions in p2p testing framework (Suhas Daftuar)
5487975 Don't run invalidblockrequest.py in travis until race condition is fixed (Suhas Daftuar)
ef32817 Fix mininode disconnections to work with select (Suhas Daftuar)
 2015-05-04 07:53:05 +02:00
Wladimir J. van der Laan 90c37bc16c Change transifex slug to translation-011x 
Ensure that translations are updated from the right place.
 2015-05-01 14:25:02 +02:00
Wladimir J. van der Laan b46e7c24e5 Merge pull request #6064 
f46a680 Better mruset unit test (Pieter Wuille)
d4d5022 Use ring buffer of set iterators instead of deque of copies in mruset (Pieter Wuille)
d81cff3 Replace mruset setAddrKnown with CRollingBloomFilter addrKnown (Gavin Andresen)
69a5f8b Rolling bloom filter class (Gavin Andresen)
 2015-05-01 12:52:18 +02:00
Wladimir J. van der Laan 8a10000222 Merge pull request #6022 
b74dcb3 Separate CTranslationInterface from CClientUIInterface (Jorge Timón)
 2015-04-30 16:37:18 +02:00
Wladimir J. van der Laan f026ab606d Merge pull request #6059 
739d615 chainparams: use SeedSpec6's rather than CAddress's for fixed seeds (Cory Fields)
 2015-04-30 14:57:04 +02:00
Wladimir J. van der Laan da38dc696c Merge pull request #5981 
2703412 Fix default binary in p2p tests to use environment variable (Suhas Daftuar)
29bff0e Add some travis debugging for python scripts (Suhas Daftuar)
d76412b Add script manipulation tools for use in mininode testing framework (Suhas Daftuar)
b93974c Add comparison tool test runner, built on mininode (Suhas Daftuar)
6c1d1ba Python p2p testing framework (Suhas Daftuar)
 2015-04-30 14:49:24 +02:00
Wladimir J. van der Laan 9c25397619 Merge pull request #6081 
7f386d2 DragonFlyBSD thread renaming. (sinetek)
 2015-04-29 19:08:33 +02:00
Wladimir J. van der Laan 7abbb7ec7a Merge pull request #6082 
55f55ec qt: disable qt tests when one of the checks for the gui fails (Wladimir J. van der Laan)
 2015-04-29 19:03:19 +02:00
Wladimir J. van der Laan 55f55ec5db qt: disable qt tests when one of the checks for the gui fails 2015-04-29 16:09:56 +02:00
Wladimir J. van der Laan 5a91043a8c Merge pull request #6041 
2ccfc63 [REST] update documentation (Jonas Schnelli)
 2015-04-29 15:59:13 +02:00
Wladimir J. van der Laan df1609f314 Merge pull request #6075 
9fadf1c Add additional script edge condition tests. (Dave Collins)
 2015-04-29 15:56:30 +02:00
Wladimir J. van der Laan e08886d8a3 Merge pull request #6032 
688da79 QA: add --noshutdown option to prevent stopping nodes (dexX7)
2eadeb2 QA: stop nodes after RPC tests, even with --nocleanup (dexX7)
 2015-04-29 10:04:33 +02:00
Wladimir J. van der Laan 23c998d811 Merge pull request #5511 
e9c3215 [Wallet] sort pending wallet transactions before reaccepting (dexX7)
 2015-04-29 09:52:39 +02:00
Wladimir J. van der Laan 948beaf190 Merge pull request #6074 
d8f4cc3 Correct the PUSHDATA4 minimal encoding test. (Dave Collins)
 2015-04-29 09:04:29 +02:00
Wladimir J. van der Laan 6c97fd1054 Merge pull request #6076 
8b08d95 wallet: fix boost::get usage with boost 1.58 (Cory Fields)
 2015-04-29 09:03:58 +02:00
Wladimir J. van der Laan 18d2832678 Merge pull request #5971 
351593b replace absolute sleep with conditional wait (pstratem)
 2015-04-28 10:41:46 +02:00
Wladimir J. van der Laan 5048465fc5 Merge pull request #5662 
00dcaf4 Change download logic to allow calling getheaders/getdata on inbound peers (Suhas Daftuar)
 2015-04-28 10:17:04 +02:00
Wladimir J. van der Laan 6364408122 Merge pull request #5199 
1ec900a Remove broken+useless lock/unlock log prints (Matt Corallo)
352ed22 Add merkle blocks test (Matt Corallo)
59ed61b Add RPC call to generate and verify merkle blocks (Matt Corallo)
30da90d Add CMerkleBlock constructor for tx set + block and an empty one (Matt Corallo)
 2015-04-28 10:07:25 +02:00