aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-23Merge pull request #5708Wladimir J. van der Laan
b63ae56 Add list of implemented BIPs (Pieter Wuille)
2015-02-20Revert "Make nicer pull request merge messages"Wladimir J. van der Laan
This reverts commit 1078fb08851442bcd7750c3d5015dc1fe7e4d927 (and thus pull #5623). It has various issues: - Pull request names get cut off at ", see e.g. a026a56 - Merge script no longer copes with pulls that have a milestone attached, due to a duplicate 'title' in JSON that is not handled by the ad-hoc parsing.
2015-02-20Merge #5706: fix crash: RPC \Wladimir J. van der Laan
e5d9d77 fix crash: createmultisig and addmultisigaddress (fsb4000)
2015-02-19Merge #5689: openssl: abstract out OPENSSL_cleanseWladimir J. van der Laan
1630219 openssl: abstract out OPENSSL_cleanse (Cory Fields)
2015-02-19Merge #5803: Update debian changelog and control fileWladimir J. van der Laan
544e64e Update debian changelog and control file (Matt Corallo)
2015-02-18Update debian changelog and control fileMatt Corallo
2015-02-18Merge #5366: No longer check osx compatibility in RenameThreadWladimir J. van der Laan
850c570 No longer check osx compatibility in RenameThread (Michael Ford)
2015-02-18Merge #5799: Rename Interval() to DifficultyAdjustmentInterval()Wladimir J. van der Laan
e5ece05 Rename Interval() to DifficultyAdjustmentInterval() (Shaul Kfir)
2015-02-18Merge #5784: Fix usage of NegateSignatureS in script_testsWladimir J. van der Laan
78c6bed Add test for DER-encoding edge case (Suhas Daftuar) 6f50dbd Fix NegateSignatureS to not duplicate last byte of S (Suhas Daftuar)
2015-02-17Rename Interval() to DifficultyAdjustmentInterval()Shaul Kfir
2015-02-16Add list of implemented BIPsPieter Wuille
2015-02-16Merge #5710: Add more information to errors in ReadBlockFromDiskPieter Wuille
f5791c6 Add more information to errors in ReadBlockFromDisk (Wladimir J. van der Laan)
2015-02-16doc: Add note-to-self about SHA256SUMS to release-process.mdWladimir J. van der Laan
2015-02-15openssl: abstract out OPENSSL_cleanseCory Fields
This makes it easier for us to replace it if desired, since it's now only in one spot. Also, it avoids the openssl include from allocators.h, which essentially forced openssl to be included from every compilation unit.
2015-02-13Merge #5792: Fix filename for testing QT.Pieter Wuille
f9a8fc4 Fix filename for testing QT. (Jonathan Brown)
2015-02-14Fix filename for testing QT.Jonathan Brown
2015-02-13Merge #5790: gitian: don't add . to tar listWladimir J. van der Laan
0c6ab67 gitian: don't add . to tar list (Cory Fields)
2015-02-13gitian: don't add . to tar listCory Fields
Since permissions and timestamps are changed for the sake of determinism, . must not be added to the archive. Otherwise, tar may try to modify pwd when extracting.
2015-02-12Merge #5787: Add fanquake PGP keyWladimir J. van der Laan
99437c5 Add fanquake PGP key (Michael Ford)
2015-02-11Add fanquake PGP keyMichael Ford
2015-02-10Add test for DER-encoding edge caseSuhas Daftuar
The fix to NegateSignatureS caused a test which had been failing in IsValidSignatureEncoding to then fail in IsLowDERSignature. Add new test so the original check remains exercised.
2015-02-10Fix NegateSignatureS to not duplicate last byte of SSuhas Daftuar
NegateSignatureS is called with a signature without a hashtype, so do not save the last byte and append it after S negation. Updates the two tests which were affected by this bug.
2015-02-10Merge #5548: [REST] add /rest/chaininfosWladimir J. van der Laan
2c0f901 [REST] rest/chaininfos add documentation (Jonas Schnelli) 59582c8 [REST] add /rest/chaininfos (Jonas Schnelli)
2015-02-09Merge #5629: [Qt] prevent amount overflow problem with payment requestsWladimir J. van der Laan
a651668 [Qt] prevent amount overflow problem with payment requests (Philip Kaufmann)
2015-02-09Merge #5699: Split logic to undo txin's off DisconnectBlock.Wladimir J. van der Laan
eb1c2cd Split logic to undo txin's off DisconnectBlock. (Daniel Kraft)
2015-02-09Merge #5679: Get rid of DetectShutdownThreadWladimir J. van der Laan
28ee7e8 Get rid of DetectShutdownThread (Wladimir J. van der Laan)
2015-02-09Merge #5623: Make nicer pull request merge messagesWladimir J. van der Laan
1078fb0 Make nicer pull request merge messages (BtcDrak)
2015-02-09Merge pull request #5739Wladimir J. van der Laan
f4b2078 Replace difficulty readjustment blocks with Interval() (Shaul Kfir)
2015-02-09Merge pull request #5764Wladimir J. van der Laan
65f10e0 fix jonasschnelli's gitian key (Jonas Schnelli)
2015-02-09Merge pull request #5753Wladimir J. van der Laan
d67a642 [Qt] add bitcoin logo to about screen (Jonas Schnelli)
2015-02-09Merge pull request #5770Wladimir J. van der Laan
28d4cff Sanitize command strings before logging them. (Gregory Maxwell)
2015-02-08Sanitize command strings before logging them.Gregory Maxwell
Normally bitcoin core does not display any network originated strings without sanitizing or hex encoding. This wasn't done for strcommand in many places. This could be used to play havoc with a terminal displaying the logs, especially with printtoconsole in use. Thanks to Evil-Knievel for reporting this issue.
2015-02-06Merge pull request #5721Wladimir J. van der Laan
cf008ac Acquire CCheckQueue's lock to avoid race condition (Suhas Daftuar)
2015-02-06fix jonasschnelli's gitian keyJonas Schnelli
There where two keys in the keyfile and it also had a missing "-key" in the filename. See: http://bitcoinstats.com/irc/bitcoin-dev/logs/2015/02/05#l1423162105
2015-02-05Merge pull request #5756Wladimir J. van der Laan
1cb2a00 Fix getblocktemplate_proposals test by mining one block (Suhas Daftuar)
2015-02-05Add more information to errors in ReadBlockFromDiskWladimir J. van der Laan
A lot of times, disk corruption problems appear here. To facilitate debugging and troubleshooting, add position information to the error messages.
2015-02-04[Qt] add bitcoin logo to about screenJonas Schnelli
2015-02-04Fix getblocktemplate_proposals test by mining one blockSuhas Daftuar
This triggers the tested node to no longer be in initial download, allowing the call to getblocktemplate() to succeed.
2015-02-04Merge pull request #5754Wladimir J. van der Laan
17115d0 fix getblocktemplate lock issue (Jonas Schnelli)
2015-02-04fix getblocktemplate lock issueJonas Schnelli
getblocktemplate didn't have a wallet lock before #5711 and IMO there is no need for LEAVE/ENTER critical section.
2015-02-04Merge pull request #5319Wladimir J. van der Laan
35f7227 Clean up wallet encryption code. (Daniel Kraft)
2015-02-04[Qt] prevent amount overflow problem with payment requestsPhilip Kaufmann
Bitcoin amounts are stored as uint64 in the protobuf messages (see paymentrequest.proto), but CAmount is defined as int64_t. Because of that we need to verify that single and accumulated amounts are in a valid range and no variable overflow has happened. - fixes #5624 (#5622) Thanks @SergioDemianLerner for reporting that issue and also supplying us with a possible solution. - add static verifyAmount() function to PaymentServer and move the logging on error into the function - also add a unit test to paymentservertests.cpp
2015-02-04Merge pull request #5509Wladimir J. van der Laan
7f991e3 c++11: These look like user-defined literals. (Cory Fields) 5a6155c c++11: don't forward-declare types used in maps (Cory Fields) 3447cf8 c++11: MOVEONLY: break circular dependency in wallet (Cory Fields) bbacd88 c++11: MOVEONLY: move function definitions out of the header (Cory Fields) a2b04dd build: fix newer boost build with c++11 (Cory Fields)
2015-02-04Merge pull request #5711Wladimir J. van der Laan
5ebe095 Trim RPC command table (Wladimir J. van der Laan) 4401b2d Removed main.h dependency from rpcserver.cpp (Eric Lombrozo)
2015-02-03c++11: These look like user-defined literals.Cory Fields
Add a space to keep the compiler happy
2015-02-03c++11: don't forward-declare types used in mapsCory Fields
2015-02-03c++11: MOVEONLY: break circular dependency in walletCory Fields
c++11 (libc++'s stdlib implementation anyway) doesn't allow for map types to be forward-declared. for example: class foo; std::map<int, foo> bar; // error, foo has not been defined. class foo{}; Since CWallet and CWalletTx are inter-dependent, but only std::map<*,CWalletTx> is used, forward-declare CWallet instead and define CWalletTx first. Despite the mangled git diff, this change only amounts to moving ~320 lines in a single chunk.
2015-02-03c++11: MOVEONLY: move function definitions out of the headerCory Fields
These need to be moved out of the header in order to resolve a circular dependency between CWallet and CTxWallet. See next commit.
2015-02-03build: fix newer boost build with c++11Cory Fields
2015-02-03Split logic to undo txin's off DisconnectBlock.Daniel Kraft
Instead, create a separate function that applies the undo operation of a CTxInUndo object onto a CCoinsViewCache. This method is used from DisconnectBlock.