zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,579 Commits 9 Branches 176 Tags 87 MiB
Commit Graph

6579 Commits

Author SHA1 Message Date
Wladimir J. van der Laan 8f3f94a470 Revert "CBloomFilter::clear() method" 
This reverts commit 8fbf03995d.
 2014-07-21 07:46:34 +02:00
Wladimir J. van der Laan 98e84aae7a Revert "Relay double-spends, subject to anti-DOS" 
This reverts commit d640a3ceab.
 2014-07-21 07:46:34 +02:00
Wladimir J. van der Laan 3015e0bca6 Revert "UI to alert of respend attempt affecting wallet." 
This reverts commit ada5a067c7.

Conflicts:
	src/qt/guiconstants.h
	src/wallet.h
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan 39d3f2cb40 Revert "Add -respendnotify option and new RPC data" 
This reverts commit 9004798e62.
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan 680f7252f0 Revert "Add release notes entry" 
This reverts commit 9fa53dd3bd.
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan ad26dc9c31 Revert "Formatting, spelling, comment fixes." 
This reverts commit 7a19efe040.
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan cd057bfd41 Revert "Check signatures before respend relay" 
This reverts commit 88dd3598d2.
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan 67cc8f25c2 Revert "Remove signal DoubleSpendDetected, use function" 
This reverts commit 0da6b3fd18.
 2014-07-21 07:46:33 +02:00
Wladimir J. van der Laan 0de61e7585
qt: Move SplashFinished to after ClientModel/WalletModel creation 
With a large wallet there was a noticable gap between hiding of the
splash and showing the main window.
 2014-07-20 13:50:42 +02:00
Wladimir J. van der Laan fb21bf6951
Merge pull request #4563 
027dcdc [Qt] Fix thin space in URI (Cozz Lovan)
 2014-07-20 08:35:03 +02:00
Cozz Lovan 027dcdc792 [Qt] Fix thin space in URI 2014-07-20 04:17:02 +02:00
Wladimir J. van der Laan ff1fe669d4
Merge pull request #3939 
3da434a Introduce option to disable relay/mining of bare multisig scripts in TX outputs (Jeff Garzik)
 2014-07-18 23:29:50 +02:00
Whit J b9345f7d1c
qt: Make error message for failed export a little friendlier 
Closes #4528.
 2014-07-18 23:21:50 +02:00
elkingtowa 92b8587e12 Update README.md 
Added two modifications to make the descriptions more clear.
 2014-07-18 15:04:54 -04:00
Otto Allmendinger d2d9dc063f script tests: add tests for CHECKMULTISIG limits 2014-07-18 17:55:06 +02:00
Jeff Garzik 3da434a2ef Introduce option to disable relay/mining of bare multisig scripts in TX outputs 
First and foremost, this defaults to OFF.

This option lets a node consider such transactions non-standard,
meaning they will not be relayed or mined by default, but other miners
are free to mine these as usual.
 2014-07-18 10:16:47 -04:00
Otto Allmendinger 89101c6e78 script test: test case for 5-byte bools 2014-07-18 15:41:45 +02:00
Wladimir J. van der Laan 40d2d69223
Merge pull request #4167 
7149499 Add comments re BitcoinUnits::formatWithUnit/formatHtmlWithUnit (Roy Badami)
f7d70c6 Remove unused fAlign argument from BitcoinUnits::format and friends (Roy Badami)
2e4fee2 Show bitcoin quantities with full precision, even in the presence of trailing zeros (Roy Badami)
7007402 Implement SI-style (thin space) thoudands separator (Roy Badami)
 2014-07-18 13:59:26 +02:00
Wladimir J. van der Laan 5bb765507b
Fix a signed/unsigned warning introduced in 1b4568c 
vout counter must be unsigned.
 2014-07-18 13:24:38 +02:00
Wladimir J. van der Laan eaa9400781
Merge pull request #4255 
1b4568c Add vout to ListTransactions output (Cozz Lovan)
 2014-07-18 12:57:06 +02:00
Otto Allmendinger 4cac5dbf83 script tests: value with trailing 0x00 is true 2014-07-18 12:55:46 +02:00
Wladimir J. van der Laan 773c1f297b
Merge pull request #4554 
2d89ea9 build: fix whitespace in pkg-config variable (Cory Fields)
ab123ad build: allow linux and osx to build against static qt5 (Cory Fields)
 2014-07-18 11:39:18 +02:00
Otto Allmendinger 833ff161bc script tests: values that overflow to 0 are true 2014-07-18 11:02:28 +02:00
Otto Allmendinger 0072d98849 script tests: BOOLAND, BOOLOR decode to integer 
unlike other boolean checks, arguments >5 bytes invalidate the script
 2014-07-18 10:53:09 +02:00
Wladimir J. van der Laan d3cb2b8acf
Merge pull request #4551 
c994d2e prevent SOCKET leak in BindListenPort() (Philip Kaufmann)
 2014-07-18 10:45:48 +02:00
Otto Allmendinger ed02282bba additional test for OP_SIZE in script_valid.json 2014-07-18 10:29:49 +02:00
Wladimir J. van der Laan a2404cec27
Merge pull request #4553 
1e72d5c build: silence false errors during make clean (Cory Fields)
 2014-07-18 09:28:42 +02:00
Wladimir J. van der Laan ba738634ae
Merge pull request #4530 
acd432b [Qt] Prevent balloon-spam after rescan (Cozz Lovan)
 2014-07-18 09:13:27 +02:00
Cory Fields 2d89ea9781 build: fix whitespace in pkg-config variable 
Useful for PKG_CONFIG="pkg-config --static"
 2014-07-17 22:15:21 -04:00
Cory Fields ab123ad4d6 build: allow linux and osx to build against static qt5 
This is the first part of a huge effort to rework the handling of dependencies.
To start, this change allows all supported platforms to build against a static
Qt. 5.2.1 and 5.3 have been successfully tested against osx64, win32, win64,
linux32, and linux64.

It also makes a small change to the windows config, to allow linking against
qt builds with or without built-in libjpeg/libpng/libpcre/libz.

The actual build processes to take advantage of these changes (for gitian and
pull-tester) are coming soon. Until then, this should be a no-op.
 2014-07-17 22:13:40 -04:00
Cory Fields 1e72d5c033 build: silence false errors during make clean 2014-07-17 22:03:27 -04:00
Cozz Lovan acd432b5b3 [Qt] Prevent balloon-spam after rescan 2014-07-18 03:39:00 +02:00
Philip Kaufmann c994d2e769 prevent SOCKET leak in BindListenPort() 
- the call to CloseSocket() is placed after the WSAGetLastError(), because
  a CloseSocket() can trigger an error also, which we don't want for the
  logging in this two cases
 2014-07-17 22:49:23 +02:00
Philip Kaufmann eaedb59e05 net: add SetSocketNonBlocking() as OS independent wrapper 2014-07-17 22:12:44 +02:00
Wladimir J. van der Laan e8d4cb8071
Merge pull request #4504 
43f510d Convert closesocket 'compat wrapper' to function in netbase (Wladimir J. van der Laan)
 2014-07-17 16:33:58 +02:00
Pieter Wuille fb203cab40
Merge pull request #4508 
b069750 Break up CAddrMan's IMPLEMENT_SERIALIZE (Pieter Wuille)
 2014-07-17 16:17:36 +02:00
Wladimir J. van der Laan 43f510d37d Convert closesocket 'compat wrapper' to function in netbase 
Simpler alternative to #4348.

The current setup with closesocket() is strange. It poses
as a compatibility wrapper but adds functionality.

Rename it and make it a documented utility function in netbase.

Code movement only, zero effect on the functionality.
 2014-07-17 15:46:25 +02:00
Wladimir J. van der Laan c4f11ca9c3
Merge pull request #4549 
7de3f1c fix help message for RPC getpeerinfo (Philip Kaufmann)
 2014-07-17 15:38:25 +02:00
Philip Kaufmann 7de3f1cfd6 fix help message for RPC getpeerinfo 2014-07-17 15:10:29 +02:00
Wladimir J. van der Laan ea8c288a35
Merge pull request #4533 
43005cf Fix semantic typo in state.CorruptionPossible check (kazcw)
 2014-07-17 13:57:51 +02:00
Wladimir J. van der Laan 66f3d0679f
Merge pull request #4534 
33357b2 qt: Start core thread only when needed (Wladimir J. van der Laan)
c715ff5 ui: Replace some LogPrintfs with qDebug() (Wladimir J. van der Laan)
96ff9d6 Can't log to debug log before chain params initialized (Wladimir J. van der Laan)
 2014-07-17 13:51:55 +02:00
Wladimir J. van der Laan 00b16bc942
Merge pull request #4546 
09c744c Make sure CAutoFile for fees estimate goes out of scope (Pieter Wuille)
 2014-07-17 13:41:21 +02:00
Pieter Wuille 09c744c2a8 Make sure CAutoFile for fees estimate goes out of scope 2014-07-16 21:46:01 +02:00
Pieter Wuille b069750d3f Break up CAddrMan's IMPLEMENT_SERIALIZE 2014-07-16 21:14:26 +02:00
Trevin Hofmann 125fba1b48 Add a new checkpoint at block 295,000 
Block 295,000 seems to meet the criteria of a reasonable timestamp and
no strange transactions. 295,000 is the current block height in the
bootstrap.dat torrent provided by jgarzik.
 2014-07-15 19:13:24 -05:00
Wladimir J. van der Laan 87e40799fd
Merge pull request #4535 
c4a321f Add peerid to getpeerinfo to allow correlation with the logs. (Gregory Maxwell)
 2014-07-15 16:46:29 +02:00
Gavin Andresen 4a56345a74 Merge pull request #4522 from dgenr8/set_discover_0 
Set -discover=0 in regtest framework
 2014-07-15 10:29:18 -04:00
Wladimir J. van der Laan 33357b27a0
qt: Start core thread only when needed 
Start the core thread only when needed for initialization
or shutdown.

Avoids a bit of overhead, and also avoids spamming two
log messages before logging is properly initialized.
 2014-07-15 16:27:47 +02:00
Gregory Maxwell c4a321f5c6 Add peerid to getpeerinfo to allow correlation with the logs. 
This seems to have been missed in 3764.
 2014-07-15 07:13:10 -07:00
Cozz Lovan 1b4568cb0f Add vout to ListTransactions output 2014-07-15 15:50:33 +02:00