DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
4,484 Commits 6 Branches 7 Tags
a5e685bcf8eea088ba2eea544dcf2b0ac29ff6cc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Gavin Andresen 2af267c150 Merge pull request #2857 from Diapolo/compat_cleanup 
cleanup compat.h Windows stuff
 2013-08-05 01:48:35 -07:00
Gavin Andresen e622f3f195 Merge pull request #2855 from Diapolo/guard_CreatePidFile 
exclude CreatePidFile() function on WIN32 as it is unused
 2013-08-05 01:05:59 -07:00
Gavin Andresen a4ae02969e Merge pull request #2827 from Diapolo/rpccon_winpos 
Bitcoin-Qt: save and restore position of debug window
 2013-08-05 00:58:05 -07:00
Gavin Andresen d687aaa311 Merge pull request #2865 from Diapolo/fix_intro_translation 
fix string in intro.cpp, which is untranslatable on Transifex
 2013-08-05 00:24:49 -07:00
Gavin Andresen 923602f11d Compile into build_test when creating bitcoin-qt_test 2013-08-05 14:36:58 +10:00
Gavin Andresen 159bc48193 Simplify storage of orphan transactions 
Orphan transactions were stored as a CDataStream pointer;
this changes the mapOrphanTransactions data structures to
store orphans as a CTransaction.

This also fixes CVE-2013-4627 by always re-serializing
transactions before relaying them.
 2013-08-02 16:10:25 +10:00
Gavin Andresen 8f6f92c72b Revert "Truncate oversize 'tx' messages before relaying/storing." 
This reverts commit c40a5aaaf4.
 2013-08-02 15:50:04 +10:00
Gavin Andresen 050d2e953f Remove #define loop from util.h 
Replace the loop macro with while (true). The #define caused
problems for Qt.
 2013-07-31 14:06:44 +10:00
Gavin Andresen 5e67e124cf Merge pull request #1889 from tcatm/multi-wallet 
let user select wallet file with -wallet=foo.dat
 2013-07-24 22:52:21 -07:00
Gavin Andresen e057486cdf Merge pull request #2817 from Michagogo/release-process-followable-verbatim 
Made the build/release process completable verbatim as listed in release-process.md
 2013-07-09 18:49:10 -07:00
Gavin Andresen b9e24d74a4 Merge pull request #2816 from wtogami/gitianwtogami 
Add wtogami to gitian download scripts.
 2013-07-08 14:51:39 -07:00
Gavin Andresen 6e802ac85d Merge pull request #2801 from gavinandresen/urifix 
Fixes for bitcoin: URI handling on Linux
 2013-07-02 06:45:57 -07:00
Gavin Andresen 89781d00dd README for contrib/debian 2013-06-27 11:11:02 -04:00
Gavin Andresen bf81a3ef78 Fix Gnome bitcoin: URI handler 2013-06-26 20:31:34 -04:00
Gavin Andresen 2e01ec3207 Merge pull request #2679 from vhf/patch-1 
Too many bitcoins allowed as amount. (Issue #2401)
 2013-06-25 06:47:53 -07:00
Gavin Andresen ef9acc5124 Bump build number to 0.8.2.2 for v0.8.2rc3 2013-05-24 16:11:44 -04:00
Gavin Andresen 378c526ee1 Merge pull request #2683 from Diapolo/translations 
translations update 2013-05-23
 2013-05-24 13:07:36 -07:00
Gavin Andresen dbc6dea1b2 Fix crash-at-shutdown if exiting before initializing wallet 2013-05-24 15:52:52 -04:00
Gavin Andresen 8ab6d0a568 All-resolution pixmap, to make win32 builds determisitic again 2013-05-24 15:46:00 -04:00
Gavin Andresen 1472a2991b Merge pull request #2688 from gavinandresen/issue2687 
Clean up mining CReserveKey to prevent crash at shutdown
 2013-05-24 12:41:04 -07:00
Gavin Andresen 36e826cea1 Clean up mining CReserveKey to prevent crash at shutdown 
Fixes issue#2687
 2013-05-23 14:17:15 -04:00
Gavin Andresen 36dc41f427 doc/README was replaced by README.md 2013-05-22 17:21:12 -04:00
Gavin Andresen 0c4434cf77 Merge pull request #2652 from gavinandresen/version_0.8.2_final 
Set CLIENT_VERSION_IS_RELEASE, bump build to 0.8.2.1
 2013-05-22 13:23:38 -07:00
Gavin Andresen f1e76e8121 Merge pull request #2649 from Diapolo/translations 
translations update 2013-05-19 (for 0.8.2 release)
 2013-05-22 12:22:45 -07:00
Gavin Andresen 6b99cfae3c Merge pull request #2677 from sipa/fastcreate 
CreateNewBlock performance improvements
 2013-05-22 10:24:17 -07:00
Gavin Andresen 53704da897 Merge pull request #2680 from fanquake/patch-1 
Update links in build-osx.md
 2013-05-22 09:38:49 -07:00
Gavin Andresen b1f8068ab2 Merge pull request #2681 from wtogami/gitianfix 
gitian deps-win32.yml needs psmisc package for killall to end the build
 2013-05-22 07:51:43 -07:00
Gavin Andresen 8ae290d266 Set CLIENT_VERSION_IS_RELEASE, bump build to 0.8.2.1 2013-05-13 10:53:53 -04:00
Gavin Andresen 5b5d399593 Update version numbers for 0.8.2rc1 release 2013-05-10 09:50:33 -04:00
Gavin Andresen 8f6709076e Release notes for 0.8.2rc1 2013-05-10 09:37:56 -04:00
Gavin Andresen 056ab5b43f Merge pull request #2630 from Diapolo/translations 
translations update 2013-05-08 (for 0.8.2 release)
 2013-05-10 06:35:27 -07:00
Gavin Andresen dc4cf7c183 Merge pull request #2635 from gavinandresen/boost_chrono_osx 
Link with boost_chrono library on OSX
 2013-05-09 18:19:29 -07:00
Gavin Andresen 4332be71a2 Link with boost_chrono library on OSX 
Compiling on my OSX 10.6 build machine, I get:

Undefined symbols:
  "boost::chrono::steady_clock::now()", referenced from:
      boost::cv_status boost::condition_variable::wait_for<long long, boost::ratio<1ll, 1000000000ll> >(boost::unique_lock<boost::mutex>&, boost::chrono::duration<long long, boost::ratio<1ll, 1000000000ll> > const&)in bitcoinrpc.o

Linking against the boost_chrono fixes the issue.

Windows builds already link against boost_chrono; Linux doesn't, but compiles (on pull-tester / gitian, at least).
 2013-05-09 17:08:38 -04:00
Gavin Andresen e5ddaf5ec8 Merge pull request #2410 from gmaxwell/salvageharder 
Make explicitly requested salvage operations keep going when there is an error.
 2013-05-07 08:58:35 -07:00
Gavin Andresen 92f2c1fe0f Use boost::asio::deadline_timer for walletpassphrase timeout 
New method in bitcoinrpc:  RunLater, that uses a map of deadline
timers to run a function later.

Behavior of walletpassphrase is changed; before, calling
walletpassphrase again before the lock timeout passed
would result in: Error: Wallet is already unlocked.

You would have to call lockwallet before walletpassphrase.

Now: the last walletpassphrase with correct password
wins, and overrides any previous timeout.

Fixes issue# 1961 which was caused by spawning too many threads.

Test plan:

Start with encrypted wallet, password 'foo'
NOTE:
 python -c 'import time; print("%d"%time.time())'
... will tell you current unix timestamp.

Try:

walletpassphrase foo 600
getinfo
EXPECT: unlocked_until is about 10 minutes in the future

walletpassphrase foo 1
sleep 2
sendtoaddress mun74Bvba3B1PF2YkrF4NsgcJwHXXh12LF 11
EXPECT: Error: Please enter the wallet passphrase with walletpassphrase first.

walletpassphrase foo 600
walletpassphrase foo 0
getinfo
EXPECT: wallet is locked (unlocked_until is 0)

walletpassphrase foo 10
walletpassphrase foo 600
getinfo
EXPECT: wallet is unlocked until 10 minutes in future

walletpassphrase foo 60
walletpassphrase bar 600
EXPECT: Error, incorrect passphrase
getinfo
EXPECT: wallet still scheduled to lock 60 seconds from first (successful) walletpassphrase
 2013-05-07 11:47:33 -04:00
Gavin Andresen 7aaaff37ff Merge pull request #2532 from jonasschnelli/mac_plist_fix 
fixes #2506: mac binary with proper version and copyright meta-informati...
 2013-05-07 08:37:21 -07:00