DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
4,584 Commits 6 Branches 7 Tags
cc7562b7d2dc4eae6e3ab930a2a37cd3c00aac5d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Andresen cc7562b7d2 Merge pull request #3104 from Diapolo/rpcssl-defaultciphers 
update default -rpcsslciphers to include TLSv1.2
 2013-10-20 19:50:11 -07:00
Gavin Andresen 496c2a3542 Merge pull request #3074 from laanwj/2013_10_remove_default_key_1 
Remove automatic update of default key
 2013-10-20 19:40:43 -07:00
Gavin Andresen 749230d05c Merge pull request #2840 from sipa/nosendlock 
Allow SendMessages to run partially without cs_main
 2013-10-20 19:06:53 -07:00
Gavin Andresen 34f72ad6ef Merge pull request #3046 from sarchar/lockedpage-change 
Changing LockedPageManager to use a managed instance
 2013-10-20 16:14:26 -07:00
Gavin Andresen dc03c2d584 Merge pull request #3117 from gavinandresen/debuglockprint 
Make -DDEBUGLOCKORDER + -debug less noisy
 2013-10-20 14:26:21 -07:00
Gavin Andresen 896853a011 Merge pull request #3106 from super3/master 
Added better WalletTools description.
 2013-10-19 23:13:42 -07:00
Gavin Andresen bd48a4fe49 Merge pull request #2945 from gmaxwell/fee-logic_encourage_sweeping 
[Fee logic] Don't count txins for priority to encourage sweeping.
 2013-10-19 23:05:04 -07:00
Gavin Andresen f90b690a0d Merge pull request #2884 from gavinandresen/canonicalsizes2 
Reject non-canonically-encoded CompactSize
 2013-10-19 23:03:04 -07:00
Gavin Andresen d3b0fa1d82 Merge pull request #3008 from gavinandresen/CENTrule 
Two small free transaction policy changes
 2013-10-19 23:01:47 -07:00
Gavin Andresen 3b9ecfed82 Make -DDEBUGLOCKORDER + -debug less noisy 
Print out every mutex lock/unlock if compiled -DDEBUGLOCKORDER
only if -debug=lock is set.
 2013-10-20 15:41:15 +10:00
Gavin Andresen e11107f234 Merge pull request #3103 from gavinandresen/appbundle 
make appbundle target for OSX development
 2013-10-18 22:45:47 -07:00
Gavin Andresen a5bba245a3 Merge pull request #2981 from gmaxwell/tor2onion 
Rename -tor to -onion to better reflect what it does.
 2013-10-16 20:14:46 -07:00
Gavin Andresen 796e7b7aec Merge pull request #2950 from pstratem/walletload 
Walletload
 2013-10-16 20:12:38 -07:00
Gavin Andresen 5a8a4be289 Merge pull request #2645 from sipa/inlinesighash 
Inline signature serializer
 2013-10-16 17:53:31 -07:00
Gavin Andresen 03db5c6112 Merge pull request #3094 from Diapolo/btcamountfield 
make BitcoinAmountField::setReadOnly() usable
 2013-10-15 22:12:55 -07:00
Gavin Andresen 26ce1bb20d Merge pull request #3097 from super3/master 
Broken Link in /Doc README
 2013-10-15 19:39:48 -07:00
Gavin Andresen e16c2b4422 Merge pull request #3085 from super3/master 
Documentation Cleanup and Contrib Index
 2013-10-15 18:27:54 -07:00
Gavin Andresen 5d36ff289b Merge pull request #3086 from Michagogo/update-pgp 
Update michagogo's gitian pgp key, adding UIDs
 2013-10-15 16:33:31 -07:00
Gavin Andresen 8d3f0d099b Merge pull request #3092 from laanwj/2013_10_remove_readme_qt 
doc: remove readme-qt.md
 2013-10-15 16:32:50 -07:00
Gavin Andresen 9e70bff67a Merge pull request #3083 from sipa/chainlocator 
CBlockLocator improvements & move to core
 2013-10-15 16:31:46 -07:00
Gavin Andresen b2ba55c42b Avoid core dump if rpc port is in use. 
The cleanup code needs to check for NULL rpcworkers thread group.
 2013-10-15 15:30:20 +10:00
Gavin Andresen b9beea6e9d Merge pull request #3077 from sipa/chain 
Refactor/encapsulate chain globals into a CChain class
 2013-10-14 20:39:00 -07:00
Gavin Andresen ae6601872b Merge pull request #2933 from sipa/leveldb113 
Merge upstream LevelDB 1.13
 2013-10-14 19:54:27 -07:00
Gavin Andresen 928ce69884 Merge pull request #3089 from gmaxwell/hsport 
[doc] Add testnet hidden service port to the example tor config.
 2013-10-14 19:07:24 -07:00
Gavin Andresen 742fa32b87 Merge pull request #3078 from gavinandresen/pulltester 
Rework pull-tester scripts, disable blockchain tester
 2013-10-10 21:50:23 -07:00
Gavin Andresen 38a94488ce Disable code-coverage builds for now 
Not working on the pull-tester machine, 'make cov' hangs there.
 2013-10-11 14:50:02 +10:00
Gavin Andresen 0dd127a791 Rework pull-tester scripts, disable blockchain tester 
Re-organize the pull-tester scripts a bit.

And disables running the blockchain tester, it is not working properly
on the pull-tester machine for reasons I cannot explain (fails to start).
 2013-10-11 14:50:02 +10:00
Gavin Andresen d8315d1650 Remove include of windows.h from allocators.h 
Create an allocators.cpp, and move all of the #ifdef WIN32
code and the #include of windows.h into it.

Two motives for this cleanup:
1. I'm getting a weird error in windows.h in my smartfee branch.
2. allocators.h is included (indirectly) just about everywhere, so
this should speed up Windows compiles quite a lot.
 2013-10-09 16:48:53 +10:00
Gavin Andresen 31127f3161 make appbundle target for OSX development 
Adds an 'appbundle' target that creates a top-level Bitcoin-Qt.app/
Modifies the 'deploy' target so that it leaves behind Bitcoin-Qt.app;
make clean will remove it.
 2013-10-08 13:50:57 +10:00
Gavin Andresen adae2f1819 Merge branch 'pulltestwin32' 2013-10-08 10:50:27 +10:00
Gavin Andresen 583484a656 Re-enable win32 pull-testing 2013-10-08 10:49:50 +10:00
Gavin Andresen aa56d317a5 Merge pull request #3059 from Diapolo/Shutdown 
add missing Boost Thread join_all() call during shutdown
 2013-10-07 15:42:07 -07:00
Gavin Andresen 1c4994253c Merge pull request #3053 from dajohi/master 
Hurricane Electric uses block 2001:470::, not 2011:470::
 2013-10-05 21:37:13 -07:00
Gavin Andresen 16b3ff66e0 Lower maximum size for free transaction creation 
Changes the maximum size of a free transaction that will be created
from 10,000 bytes to 1,000 bytes.

The idea behind this change is to make the free transaction area
available to a greater number of people; with the default 27K-per-block,
just three very-large very-high-priority transactions could fill the space.
 2013-10-04 22:05:06 +10:00
Gavin Andresen ea1cd5b47f Remove CENT-output free transaction rule when relaying 
Remove the (relay/mempool) rule that all outputs of free transactions
must be greater than 0.01 XBT. Dust spam is now taken care of by making
dusty outputs non-standard.
 2013-10-04 22:05:06 +10:00
Gavin Andresen 15b48ab036 Merge pull request #3047 from Diapolo/misbehave 
special case DoS value == 0
 2013-10-04 04:08:43 -07:00
Gavin Andresen acb3ebc455 Merge pull request #2947 from gmaxwell/theyre_maturing_faster_these_days 
[wallet] Consider generated coins mature at COINBASE_MATURITY+1
 2013-10-03 22:52:38 -07:00
Gavin Andresen d922c85716 Merge pull request #2999 from TheBlueMatt/master 
Update contrib/debian: proper desktop category and update changelog
 2013-10-03 21:52:27 -07:00
Gavin Andresen a68fd1ca14 Merge pull request #3040 from Diapolo/Qt_misc2 
Bitcoin-Qt: add missing change from branch Qt_misc
 2013-10-03 21:42:27 -07:00
Gavin Andresen af880e8d3a Merge pull request #3050 from Diapolo/fix_IsRFC4193_comment 
fix #3049 by changing comment for CNetAddr::IsRFC4193()
 2013-10-03 21:12:48 -07:00
Gavin Andresen fea7236ca3 Merge pull request #3051 from Diapolo/bitcoind-rc 
rename bitcoin-res.rc to bitcoind-res.rc
 2013-10-03 21:11:57 -07:00
Gavin Andresen 32b668655e Merge pull request #3028 from Michagogo/fix-dep-links 
Fix and improve release-process.md
 2013-10-03 18:05:34 -07:00
Gavin Andresen b2180d82a4 Merge pull request #3029 from wtogami/gitianwin32 
Upgrade gitian win32 to Precise 12.04.
 2013-09-29 01:44:07 -07:00
Gavin Andresen fb8724ee6c Merge pull request #2791 from sipa/proveprune 
Prune provably-unspendable outputs
 2013-09-23 14:23:14 -07:00
Gavin Andresen 8e782e924e Merge pull request #3023 from Michagogo/pgp 
Add michagogo to gitian download scripts
 2013-09-23 00:33:32 -07:00
Gavin Andresen ff4e3e63e7 Merge pull request #2949 from gmaxwell/fewer_fee_footguns 
[raw] reject insanely high fees by default in sendrawtransaction
 2013-09-22 16:44:35 -07:00
Gavin Andresen 9196f38c8f Tweaks to the top-level pull-tester script 2013-09-20 15:55:05 +10:00
Gavin Andresen 3ee673a2c9 Rename BitcoinjBitcoindComparisonTool just BitcoindComparisonTool 2013-09-20 13:33:07 +10:00
Gavin Andresen 5d56b4574f Master pull-tester-driver python script 2013-09-20 08:49:36 +10:00
Gavin Andresen d969c2c073 Fix gitian: bitcoin-deps is at version 0.0.7 2013-09-19 12:40:02 +10:00
Gavin Andresen 69b16a11a2 Merge pull request #3014 from theuni/gitian-fixups 
Gitian fixups
 2013-09-18 16:05:05 -07:00
Gavin Andresen 623518e115 Merge pull request #3017 from sipa/unitleaks 
Fix minor unit test memory leaks
 2013-09-18 16:01:16 -07:00
Gavin Andresen 881a85a22d Replace printf with LogPrintf / LogPrint 2013-09-18 20:39:25 +10:00
Gavin Andresen e51321fb75 Refactor: OutputDebugStringF -> LogPrint(category, ...) 2013-09-18 20:39:24 +10:00
Gavin Andresen b16e9f02c8 Merge pull request #2985 from theuni/included-tests 
Embedded test data in bitcoin_test
 2013-09-16 18:11:51 -07:00
Gavin Andresen 17e0f67505 Merge pull request #3001 from theuni/fix-make-race 
autotools: fix a parallel build race condition spotted by the pull-tester
 2013-09-15 23:54:09 -07:00
Gavin Andresen 2975db76b3 Merge pull request #2996 from theuni/qt-translation 
Update translation process for autotools
 2013-09-14 16:17:27 -07:00
Gavin Andresen 4c723841e2 Merge pull request #2968 from TheBlueMatt/master 
Don't warn about forks while fIsInitialDownload
 2013-09-08 17:48:42 -07:00
Gavin Andresen 8394f4a2dc Merge pull request #2977 from laanwj/2013_09_release_process_protobuf 
Add protobuf 2.5.0 download to gitian release process
 2013-09-08 17:31:04 -07:00
Gavin Andresen d22d9753cc Merge pull request #2978 from gmaxwell/rpc_settxfee_doc 
Make settxfee clear that units are btc/kb.
 2013-09-05 21:57:52 -07:00
Gavin Andresen 2fee100f03 Merge pull request #2944 from gavinandresen/acceptheader 
Set Accept: application/bitcoin-paymentrequest header
 2013-09-03 19:52:38 -07:00
Gavin Andresen b773da064d Set Accept: application/bitcoin-paymentrequest header 
Suggestion from BitPay: set an Accept: HTTP header when
fetching payment requests / payment ACKs.
 2013-08-28 11:48:39 +10:00
Gavin Andresen b62dc051aa Merge pull request #2938 from petertodd/op-reserved-weirdness 
Document and test OP_RESERVED weirdness
 2013-08-25 18:17:59 -07:00
Gavin Andresen e62f8d72f3 Merge pull request #2539 from gavinandresen/paymentrequest 
Payment Protocol Work
 2013-08-22 01:54:28 -07:00
Gavin Andresen a41d5fe019 Payment Protocol: X509-validated payment requests 
Add support for a Payment Protocol to Bitcoin-Qt.

Payment messages are protocol-buffer encoded and communicated over
http(s), so this adds a dependency on the Google protocol buffer
library, and requires Qt with OpenSSL support.
 2013-08-22 16:18:25 +10:00
Gavin Andresen 47d0534368 Route qDebug() messages to debug.log 2013-08-22 11:05:45 +10:00
Gavin Andresen a73aa68b84 Rework when payment server is started 2013-08-22 11:05:45 +10:00
Gavin Andresen 3624356e82 Refactor: Move GetAccountAddresses to CWallet 2013-08-22 11:05:45 +10:00
Gavin Andresen 618855133d Refactor: CAddressBookData for mapAddressBook 
Straight refactor, so mapAddressBook stores a CAddressBookData
(which just contains a std::string) instead of a std::string.

Preparation for payment protocol work, which will add the notion
of refund addresses to the address book.
 2013-08-22 11:05:45 +10:00
Gavin Andresen b94595bb7f GetDataDir(): cache paths for each network separately 2013-08-22 11:05:44 +10:00
Gavin Andresen 57d80467f1 Reject dust amounts during validation 
Replaces the validation check for "amount == 0" with an isDust check,
so very small output amounts are caught before the wallet
is unlocked, a transaction is created, etc.
 2013-08-22 11:05:44 +10:00
Gavin Andresen b986663ccd Merge pull request #2919 from gmaxwell/bloom_faster 
Update the bloom state on the real object, not the temporary one.
 2013-08-20 20:12:51 -07:00
Gavin Andresen 449fb40aa9 Merge pull request #2915 from petertodd/murmurhash-tests 
Add MurmurHash3() unit test
 2013-08-20 17:19:28 -07:00
Gavin Andresen 5250fdcc6c Merge pull request #2914 from gmaxwell/bloom_faster 
Performance optimization for bloom filters.
 2013-08-20 15:52:49 -07:00
Gavin Andresen 3337481a4b Merge pull request #2916 from sipa/leveldb-osxfsync 
Import OSX fsync change from LevelDB subtree
 2013-08-20 15:35:05 -07:00
Gavin Andresen bb237705d0 Checkpoint at block 250,000 2013-08-20 17:30:33 +10:00
Gavin Andresen ffa5683da3 Merge pull request #2911 from phelixbtc/patch-4 
makefile.mingw: Fix Win32 RPC Crashes.
 2013-08-19 17:54:31 -07:00
Gavin Andresen 317f57ec87 Merge pull request #2903 from Michagogo/listsinceblock-help 
Clarified the listsinceblock help test
 2013-08-15 20:34:00 -07:00
Gavin Andresen 31b28082fe Merge pull request #2891 from gavinandresen/leveldb_printerror 
Use HandleError() consistently to handle leveldb errors
 2013-08-15 19:02:32 -07:00
Gavin Andresen 3f20f82209 Merge pull request #2880 from gavinandresen/test_numequal 
More unit tests for OP_NUMEQUAL
 2013-08-15 18:53:49 -07:00
Gavin Andresen a0bb001431 Merge pull request #2886 from gavinandresen/rpctiming 
Make RPC password resistant to timing attacks
 2013-08-15 18:53:26 -07:00
Gavin Andresen 9be4cff5f6 Merge pull request #2876 from sipa/fixreorgcrash 
Fix reorganization crash
 2013-08-15 18:51:06 -07:00
Gavin Andresen 13d3b1c144 Merge pull request #2829 from sipa/bip32 
BIP 32 derivation + test vectors
 2013-08-15 16:40:03 -07:00
Gavin Andresen 4323bfeafd Merge pull request #2776 from jgarzik/keypoolsize 
RPC: keypoolrefill now permits optional size parameter, to bump keypool
 2013-08-14 22:01:22 -07:00
Gavin Andresen 5c28d820b6 Merge pull request #2877 from gavinandresen/qt_unittest_makefile 
Compile into build_test when creating bitcoin-qt_test
 2013-08-14 21:55:11 -07:00
Gavin Andresen 5738877bed Merge pull request #2899 from super3/master 
Removed duplicate /doc files.
 2013-08-14 21:53:31 -07:00
Gavin Andresen 8fa9b5cc45 Merge pull request #2658 from TheBlueMatt/forkalert 
Detect any sufficiently long fork and alert the user just like any other alert
 2013-08-12 23:33:40 -07:00
Gavin Andresen 6fc537f490 Merge pull request #2892 from r000n/master 
Add missing 0x prefix in chainparams.cpp
 2013-08-12 16:37:14 -07:00
Gavin Andresen ac1bd701ba Merge pull request #2890 from cozz/cozz1 
do not call BuildMerkleTree() unnecessarily twice
 2013-08-12 04:11:00 -07:00
Gavin Andresen b35e993200 Use HandleError() consistently to handle leveldb errors 2013-08-12 18:06:17 +10:00
Gavin Andresen 8dc206a1e2 Reject non-canonically-encoded sizes 
The length of vectors, maps, sets, etc are serialized using
Write/ReadCompactSize -- which, unfortunately, do not use a
unique encoding.

So deserializing and then re-serializing a transaction (for example)
can give you different bits than you started with. That doesn't
cause any problems that we are aware of, but it is exactly the type
of subtle mismatch that can lead to exploits.

With this pull, reading a non-canonical CompactSize throws an
exception, which means nodes will ignore 'tx' or 'block' or
other messages that are not properly encoded.

Please check my logic... but this change is safe with respect to
causing a network split. Old clients that receive
non-canonically-encoded transactions or blocks deserialize
them into CTransaction/CBlock structures in memory, and then
re-serialize them before relaying them to peers.

And please check my logic with respect to causing a blockchain
split: there are no CompactSize fields in the block header, so
the block hash is always canonical. The merkle root in the block
header is computed on a vector<CTransaction>, so
any non-canonical encoding of the transactions in 'tx' or 'block'
messages is erased as they are read into memory by old clients,
and does not affect the block hash. And, as noted above, old
clients re-serialize (with canonical encoding) 'tx' and 'block'
messages before relaying to peers.
 2013-08-09 10:01:35 +10:00
Gavin Andresen 42656ea2e5 Make RPC password resistant to timing attacks 
Fixes issue#2838; this is a tweaked version of pull#2845 that
should not leak the length of the password and is more generic,
in case we run into other situations where we need
timing-attack-resistant comparisons.
 2013-08-08 19:58:57 +10:00
Gavin Andresen 6cc766fa55 Merge pull request #2856 from Diapolo/crypter_headers 
remove windows.h from crypter.cpp includes
 2013-08-08 02:16:56 -07:00
Gavin Andresen 9d23db58c1 Merge pull request #2883 from codler/patch-5 
Replace with existing constants
 2013-08-07 04:44:57 -07:00
Gavin Andresen ddd0e2f616 Merge pull request #2871 from gavinandresen/simplify_maporphan 
Simplify storage of orphan transactions, fix CVE-2013-4627
 2013-08-06 17:11:48 -07:00
Gavin Andresen 1188a33d18 Merge pull request #2882 from codler/patch-4 
Fix typo
 2013-08-06 16:53:23 -07:00
Gavin Andresen 7b22c8e8ca Merge pull request #2881 from Diapolo/translations_rem_newline 
remove a newline from a string in init.cpp
 2013-08-06 04:46:02 -07:00
Gavin Andresen bdd34642dc More unit tests for NUMEQUAL 2013-08-06 16:06:07 +10:00
Gavin Andresen ae759b3788 Merge pull request #2849 from petertodd/if-else-else 
Add unittests for multiple ELSEs in a row
 2013-08-05 01:53:57 -07:00
Gavin Andresen 15047f5af0 Merge pull request #2851 from TheBlueMatt/master 
Prepare for mempool testing in pull-tester and fix multi-block transaction resurrection
 2013-08-05 01:53:17 -07:00