highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 02:11:24 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,950 Commits 7 Branches 328 Tags
544e64e975e93dcf22a682a12acebd26d2306b86
Commit Graph

7950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Corallo
544e64e975 Update debian changelog and control file 2015-02-18 13:34:33 -08:00
Wladimir J. van der Laan
47a79bb880 Merge #5366: No longer check osx compatibility in RenameThread 
850c570 No longer check osx compatibility in RenameThread (Michael Ford)
 2015-02-18 17:36:39 +01:00
Wladimir J. van der Laan
8d0418720c Merge #5799: Rename Interval() to DifficultyAdjustmentInterval() 
e5ece05 Rename Interval() to DifficultyAdjustmentInterval() (Shaul Kfir)
 2015-02-18 17:29:28 +01:00
Wladimir J. van der Laan
e3a3cd7a28 Merge #5784: Fix usage of NegateSignatureS in script_tests 
78c6bed Add test for DER-encoding edge case (Suhas Daftuar)
6f50dbd Fix NegateSignatureS to not duplicate last byte of S (Suhas Daftuar)
 2015-02-18 09:52:59 +01:00
Shaul Kfir
e5ece053da Rename Interval() to DifficultyAdjustmentInterval() 2015-02-17 08:46:51 -05:00
Pieter Wuille
175d86e633 Merge #5710: Add more information to errors in ReadBlockFromDisk 
f5791c6 Add more information to errors in ReadBlockFromDisk (Wladimir J. van der Laan)
 2015-02-16 11:58:35 -08:00
Wladimir J. van der Laan
a77021a763 doc: Add note-to-self about SHA256SUMS to release-process.md 2015-02-16 10:38:00 +01:00
Pieter Wuille
d8ed3bd8ee Merge #5792: Fix filename for testing QT. 
f9a8fc4 Fix filename for testing QT. (Jonathan Brown)
 2015-02-13 22:11:30 -08:00
Jonathan Brown
f9a8fc4b1a Fix filename for testing QT. 2015-02-14 12:07:40 +07:00
Wladimir J. van der Laan
c70cdbc393 Merge #5790: gitian: don't add . to tar list 
0c6ab67 gitian: don't add . to tar list (Cory Fields)
 2015-02-13 09:44:14 +01:00
Cory Fields
0c6ab676ee gitian: don't add . to tar list 
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-13 03:08:08 -05:00
Wladimir J. van der Laan
9bd8c9b131 Merge #5787: Add fanquake PGP key 
99437c5 Add fanquake PGP key (Michael Ford)
 2015-02-12 18:05:04 +01:00
Michael Ford
99437c51ba Add fanquake PGP key 2015-02-11 21:50:24 +08:00
Suhas Daftuar
78c6bedb9c Add test for DER-encoding edge case 
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-10 13:25:41 -05:00
Suhas Daftuar
6f50dbd2fd Fix NegateSignatureS to not duplicate last byte of S 
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-10 13:23:57 -05:00
Wladimir J. van der Laan
d48ce48093 Merge #5548: [REST] add /rest/chaininfos 
2c0f901 [REST] rest/chaininfos add documentation (Jonas Schnelli)
59582c8 [REST] add /rest/chaininfos (Jonas Schnelli)
 2015-02-10 12:08:07 +01:00
Wladimir J. van der Laan
a9565863e0 Merge #5629: [Qt] prevent amount overflow problem with payment requests 
a651668 [Qt] prevent amount overflow problem with payment requests (Philip Kaufmann)
 2015-02-09 13:50:56 +01:00
Wladimir J. van der Laan
183ca292bd Merge #5699: Split logic to undo txin's off DisconnectBlock. 
eb1c2cd Split logic to undo txin's off DisconnectBlock. (Daniel Kraft)
 2015-02-09 13:22:35 +01:00
Wladimir J. van der Laan
beff11a3a1 Merge #5679: Get rid of DetectShutdownThread 
28ee7e8 Get rid of DetectShutdownThread (Wladimir J. van der Laan)
 2015-02-09 12:57:09 +01:00
Wladimir J. van der Laan
f69941620b Merge #5623: Make nicer pull request merge messages 
1078fb0 Make nicer pull request merge messages (BtcDrak)
 2015-02-09 12:53:00 +01:00
Wladimir J. van der Laan
7225577f6b Merge pull request #5739 
f4b2078 Replace difficulty readjustment blocks with Interval() (Shaul Kfir)
 2015-02-09 12:48:38 +01:00
Wladimir J. van der Laan
5cefea9c4b Merge pull request #5764 
65f10e0 fix jonasschnelli's gitian key (Jonas Schnelli)
 2015-02-09 11:34:26 +01:00
Wladimir J. van der Laan
0f44672437 Merge pull request #5753 
d67a642 [Qt] add bitcoin logo to about screen (Jonas Schnelli)
 2015-02-09 11:34:01 +01:00
Wladimir J. van der Laan
32a8b6a9d7 Merge pull request #5770 
28d4cff Sanitize command strings before logging them. (Gregory Maxwell)
 2015-02-09 10:43:53 +01:00
Gregory Maxwell
28d4cff0ed Sanitize command strings before logging them. 
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-08 19:58:59 +00:00
Wladimir J. van der Laan
fb6140b54b Merge pull request #5721 
cf008ac Acquire CCheckQueue's lock to avoid race condition (Suhas Daftuar)
 2015-02-06 16:51:39 +01:00
Jonas Schnelli
65f10e0ffc fix jonasschnelli's gitian key 
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-06 11:13:38 +01:00
Wladimir J. van der Laan
5d901d8ece Merge pull request #5756 
1cb2a00 Fix getblocktemplate_proposals test by mining one block (Suhas Daftuar)
 2015-02-05 16:02:01 +01:00
Wladimir J. van der Laan
f5791c6ae3 Add more information to errors in ReadBlockFromDisk 
A lot of times, disk corruption problems appear here.
To facilitate debugging and troubleshooting, add position information
to the error messages.
 2015-02-05 14:21:25 +01:00
Jonas Schnelli
d67a642392 [Qt] add bitcoin logo to about screen 2015-02-04 20:52:18 +01:00
Suhas Daftuar
1cb2a00cb8 Fix getblocktemplate_proposals test by mining one block 
This triggers the tested node to no longer be in initial
download, allowing the call to getblocktemplate() to succeed.
 2015-02-04 12:04:49 -05:00
Wladimir J. van der Laan
1c4e3f99f0 Merge pull request #5754 
17115d0 fix getblocktemplate lock issue (Jonas Schnelli)
 2015-02-04 17:16:56 +01:00
Jonas Schnelli
17115d0a34 fix getblocktemplate lock issue 
getblocktemplate didn't have a wallet lock before #5711 and IMO there is no need for LEAVE/ENTER critical section.
 2015-02-04 16:34:34 +01:00
Wladimir J. van der Laan
93b7544501 Merge pull request #5319 
35f7227 Clean up wallet encryption code. (Daniel Kraft)
 2015-02-04 13:56:57 +01:00
Philip Kaufmann
a6516686dc [Qt] prevent amount overflow problem with payment requests 
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-04 13:47:32 +01:00
Wladimir J. van der Laan
31dedb463b Merge pull request #5509 
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-04 13:06:16 +01:00
Wladimir J. van der Laan
87ecfb0f96 Merge pull request #5711 
5ebe095 Trim RPC command table (Wladimir J. van der Laan)
4401b2d Removed main.h dependency from rpcserver.cpp (Eric Lombrozo)
 2015-02-04 10:23:09 +01:00
Cory Fields
7f991e364e c++11: These look like user-defined literals. 
Add a space to keep the compiler happy
 2015-02-03 23:31:00 -05:00
Cory Fields
5a6155ccfa c++11: don't forward-declare types used in maps 2015-02-03 23:30:59 -05:00
Cory Fields
3447cf87e2 c++11: MOVEONLY: break circular dependency in wallet 
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-03 23:30:59 -05:00
Cory Fields
bbacd88204 c++11: MOVEONLY: move function definitions out of the header 
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-03 22:41:33 -05:00
Cory Fields
a2b04ddfe6 build: fix newer boost build with c++11 2015-02-03 22:41:01 -05:00
Daniel Kraft
eb1c2cd37f Split logic to undo txin's off DisconnectBlock. 
Instead, create a separate function that applies the undo operation of a
CTxInUndo object onto a CCoinsViewCache.  This method is used from
DisconnectBlock.
 2015-02-03 15:44:39 +01:00
Suhas Daftuar
cf008ac8c3 Acquire CCheckQueue's lock to avoid race condition 
This fixes a potential race condition in the CCheckQueueControl constructor,
which was looking directly at data in CCheckQueue without acquiring its lock.

Remove the now-unnecessary friendship for CCheckQueueControl
 2015-02-03 08:53:08 -05:00
Wladimir J. van der Laan
fcf646c9b0 Merge pull request #5286 
44e9a6b Update the 'test_IsStandard' unit test (Flavien Charlon)
a930658 Change the default maximum OP_RETURN size to 80 bytes (Flavien Charlon)
 2015-02-03 13:12:44 +01:00
Wladimir J. van der Laan
e5f1f5a263 Merge pull request #5732 
1371e6f Change "insane" to "absurd" (referring to high fees) in text strings and identifiers. (Daira Hopwood)
 2015-02-03 13:12:12 +01:00
Wladimir J. van der Laan
6ee87f9bc5 Merge pull request #5647 
3ff735c Increase block download timeout base from 10 to 20 minutes. (Gregory Maxwell)
 2015-02-03 10:36:44 +01:00
Wladimir J. van der Laan
4e2b1fff98 Merge pull request #5675 
2d9b0b7 Fix priority calculation in CreateTransaction (Alex Morcos)
 2015-02-03 10:36:01 +01:00
Wladimir J. van der Laan
41e6e4caba Merge pull request #5713 
bf6cdeb Increase coverage of DERSIG edge cases (Pieter Wuille)
819bcf9 Add RPC test for DERSIG BIP switchover logic (Pieter Wuille)
5a47811 BIP66 changeover logic (Pieter Wuille)
092e9fe Example unit tests from BIP66 (Pieter Wuille)
80ad135 Change IsDERSignature to BIP66 implementation (Pieter Wuille)
 2015-02-03 10:34:53 +01:00
Wladimir J. van der Laan
9c4a5a5067 Merge pull request #5729 
fdf80ea [Qt] allow unit changes for read-only BitcoinAmountField (Philip Kaufmann)
 2015-02-03 09:49:26 +01:00