DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
5,315 Commits 6 Branches 7 Tags
7f080fbef7b4cd76a3eb547e9bde5db4e56625da
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Andresen b25d1c0509 Merge pull request #3679 from laanwj/2014_02_walletpassphrase_behavior 
Document new `walletpassphrase` behavior in 0.9
 2014-02-17 12:11:13 -05:00
Gavin Andresen e7d854c8ba Merge pull request #3690 from laanwj/2014_02_gettransaction_serialize_only_tx 
Serialize only CTransaction data in gettransaction RPC hex
 2014-02-17 10:18:34 -05:00
Gavin Andresen 085c62149a Merge pull request #3671 from gavinandresen/txn_conflicts 
Report transaction conflicts, and tentative account balance fix
 2014-02-15 08:56:55 -05:00
Gavin Andresen 731b89b8b5 Track and report wallet transaction clones 
Adds a "walletconflicts" array to transaction info; if
a wallet transaction is mutated, the alternate transaction id
or ids are reported there (usually the array will be empty).

Metadata from the original transaction is copied to the mutant,
so the transaction time and "from" account of the mutant are
reported correctly.
 2014-02-14 18:13:42 -05:00
Gavin Andresen 05d3ded072 Merge pull request #3669 from gavinandresen/dead_txns 
Handle "conflicted" transactions properly
 2014-02-14 14:40:32 -05:00
Gavin Andresen 2b72d46f42 Handle "conflicted" transactions properly 
Extend CMerkleTx::GetDepthInMainChain with the concept of
a "conflicted" transaction-- a transaction generated by the wallet
that is not in the main chain or in the mempool, and, therefore,
will likely never be confirmed.

GetDepthInMainChain() now returns -1 for conflicted transactions
(0 for unconfirmed-but-in-the-mempool, and >1 for confirmed).

This makes getbalance, getbalance '*', and listunspent all agree when there are
mutated transactions in the wallet.

Before:
 listunspent: one 49BTC output
 getbalance: 96 BTC (change counted twice)
 getbalance '*': 46 BTC (spends counted twice)

After: all agree, 49 BTC available to spend.
 2014-02-14 11:08:40 -05:00
Gavin Andresen 8e842cd81d Merge pull request #3667 from gavinandresen/rpctest_osxcompat 
Make qa/rpc-tests/ compatible with OSX
 2014-02-14 11:03:34 -05:00
Gavin Andresen f582eda4ed Make qa/rpc-tests/ compatible with OSX 
Reworked send.sh, so it works properly on my Mac (killall send.sh
doesn't work, because the process name is 'bash' not 'send.sh').
So now send.sh writes a .send.pid file, and invoking it as
send.sh -STOP (as the bitcoind -walletnotify) signals that PID.
 2014-02-13 14:25:38 -05:00
Gavin Andresen 867dfb4a08 Make qa/rpc-tests/ compatible with OSX 
Reworked send.sh, so it works properly on my Mac (killall send.sh
doesn't work, because the process name is 'bash' not 'send.sh').
So now send.sh writes a .send.pid file, and invoking it as
send.sh -STOP (as the bitcoind -walletnotify) signals that PID.
 2014-02-13 10:25:42 -05:00
Gavin Andresen 95e66247eb Merge pull request #3609 from sipa/limitorphanblocks 
Limit the number of orphan blocks in memory
 2014-02-08 10:49:49 -05:00
Gavin Andresen 0ff620e04e Merge pull request #3627 from calvintam/fix_typos 
Typo fix: `anonimized => anonymized` + `infromation => information`
 2014-02-05 07:29:06 -05:00
Gavin Andresen 985a94101c Merge pull request #3621 from gubatron/build-osx-qt-dependency-missing 
added missing homebrew qt dependency on mac osx build documentation.
 2014-02-03 12:07:15 -08:00
Gavin Andresen 3581abdd46 Merge pull request #3370 from sipa/headersfirst3 
Prepare block connection logic for headers-first
 2014-01-29 13:49:15 -08:00
Gavin Andresen e5aadb25c5 Updated fallback seed nodes from sipa's DNS seeds 2014-01-24 17:09:20 -05:00
Gavin Andresen d3d753578c Merge pull request #3578 from gavinandresen/unittest_debuglockorder 
Unit test fixes for AssertLockHeld / -DDEBUG_LOCKORDER
 2014-01-24 11:46:00 -08:00
Gavin Andresen fd67424c82 Unit test fixes for AssertLockHeld / -DDEBUG_LOCKORDER 
Unit tests would fail if compiled with -DDEBUG_LOCKORDER (AssertLockHeld()
would fail; AssertLockHeld() relies on the DEBUG_LOCKORDER code to keep
track of locks held).

Fixed by LOCK'ing the wallet mutex in the unit tests that manipulate the
wallet.
 2014-01-24 10:47:29 -05:00
Gavin Andresen 8c31f037b1 Merge pull request #3527 from laanwj/2014_01_gitian_win32_qt5 
build: update win32 deps
 2014-01-15 04:20:58 -08:00
Gavin Andresen 266921e70f Merge pull request #3516 from sipa/serorphans-head 
Store orphan blocks in serialized form
 2014-01-13 08:54:33 -08:00
Gavin Andresen fb34be6d59 Merge pull request #3393 from theuni/build-10.6 
build: fix syntax error on older m4/autoconf.
 2013-12-11 16:01:54 -08:00
Gavin Andresen c4880e0172 Merge pull request #3395 from ldenman/patch-2 
Use 'make check' instead of 'make test'
 2013-12-11 15:33:03 -08:00
Gavin Andresen ef20293c51 Merge pull request #3389 from regergregregerrge/patch-1 
Update build-osx.md
 2013-12-11 00:13:28 -08:00
Gavin Andresen d47bbbd261 Merge pull request #3368 from laanwj/2013_11_disable_wallet_mining 
Allow mining RPCs with --disable-wallet
 2013-12-09 19:36:39 -08:00
Gavin Andresen 0b238b2786 Use thread-local storage for LogPrint(category...) 
This prevents crashes at shutdown where a global destructor
calls LogPrint(category...) after mapMultiArgs has been
deleted.
 2013-12-10 13:19:18 +10:00
Gavin Andresen 962b1cf441 Fix infinite loop with LogPrint on Windows 
Running -printtodebugger -debug (or -debug=lock),
compiled with -DDEBUG_LOCKORDER would infinite loop
on Windows because every critical section lock/unlock
triggers a LogPrint.

Solution is to use the raw boost mutex instead of a CCriticalSection.
 2013-12-10 11:34:28 +10:00
Gavin Andresen 7202d9d9bf Merge pull request #3276 from sipa/nodestate 
Add main-specific node state & move ban score
 2013-12-08 23:33:24 -08:00
Gavin Andresen 80ecf6702a Add ThreadGetMyExternalIP to net thread group 
Fixes #3372 -- crash at shutdown.
 2013-12-09 14:10:10 +10:00
Gavin Andresen fbbed19b78 Merge pull request #3365 from gmaxwell/hexify 
Restore hex to getrawtransaction vout scriptPubkey.
 2013-12-06 16:58:15 -08:00
Gavin Andresen d6d12f932d Merge pull request #3362 from Michagogo/signed-tags 
Change release-process.md to sign release tags
 2013-12-05 17:25:12 -08:00
Gavin Andresen 1e01f7c506 Payment request URI syntax changed, from request=... to r=... 
BIP 72 was changed to save six bytes in bitcoin: URIs.
 2013-12-04 13:18:09 +10:00
Gavin Andresen cf74e8cb5e Merge pull request #3320 from laanwj/2013_11_cli_split 
bitcoin-cli: remove unneeded dependencies (only minor code movement)
 2013-12-03 03:47:44 -08:00
Gavin Andresen 0563ee952c Merge pull request #3345 from Michagogo/gitian-descriptor-deps-input-typo 
Fix file hash verification error in deps-win32.yml
 2013-12-02 22:54:46 -08:00
Gavin Andresen 2aed2b30b1 Merge pull request #3344 from gmaxwell/assert_hazards 
Sanitize assert usage and refuse to compile with NDEBUG.
 2013-12-02 16:56:46 -08:00
Gavin Andresen 49dc3a0f1a Make unit tests succeed with -DDEBUG_LOCKORDER 2013-12-02 13:11:21 +10:00
Gavin Andresen a65edb104d Merge pull request #3329 from gavinandresen/syncdebug 
mutex debugging routines: LocksHeld() and AssertLockHeld()
 2013-12-01 17:43:37 -08:00
Gavin Andresen b78d1cdf82 Merge pull request #3239 from gavinandresen/mempool_verbose 
Add verbose flag to getrawmempool
 2013-11-29 22:04:18 -08:00
Gavin Andresen 4d707d5120 Add verbose boolean to getrawmempool 
Also changes mempool to store CTxMemPoolEntries
to keep track of when they enter/exit the pool.
 2013-11-30 15:42:10 +10:00
Gavin Andresen 0733c1bde6 Refactor: move GetValueIn(tx) to tx.GetValueIn() 
GetValueIn makes more sense as a CTransaction member.
 2013-11-30 15:42:10 +10:00
Gavin Andresen 98c7c8fd1d Remove dead transaction replacement code 
This dead code can be resurrected from git history if
transaction replacement is ever implemented. Keeping
dead code in the source is a bad idea, because it implies
it was tested and worked at some point, which is not true.
 2013-11-30 15:42:10 +10:00
Gavin Andresen ad898b40aa Increase default -blockmaxsize/prioritysize to 750K/50K 2013-11-30 14:38:15 +10:00
Gavin Andresen c649637b6c mutex debugging routines: LocksHeld() and AssertLockHeld() 2013-11-29 17:46:19 +10:00
Gavin Andresen 9e7776bf1f Integration tests via RPC calls 
qa/rpc-tests/wallet.sh runs a three-node -regtest network,
generates a fresh blockchain, and then exercises basic wallet
sending/receiving functionality using command-line RPC.
 2013-11-27 14:21:05 +10:00
Gavin Andresen c8b74258ba setgenerate creates multiple blocks in -regtest mode 
I'm writing some wallet regression tests using -regtest mode, and
need to generate an initial multi-hundred-block chain. Repeatedly
calling setgenerate to generate one block is slow and doesn't
work properly, because block creation happens asynchronously.

This adds two features to setgenerate in -regtest mode:

1) Instead of being interpreted as number of threads to start, the
third argument is the number of blocks to generate.

2) setgenerate will not return until the block creation threads
have created the requested number of blocks.
 2013-11-22 09:51:13 +10:00
Gavin Andresen 34f5b0ab93 Merge pull request #3283 from gavinandresen/rpcwait 
RPC client option: -rpcwait, to wait for server start
 2013-11-20 17:57:43 -08:00
Gavin Andresen 480e75ceab RPC client option: -rpcwait, to wait for server start 2013-11-20 16:00:51 +10:00
Gavin Andresen 07866e3cd6 Merge pull request #2980 from wtogami/silenceunusedwarning 
Silence useless warning in src/json/json_spirit_writer_template.h to mak...
 2013-11-11 17:44:56 -08:00
Gavin Andresen 7d7df381f8 Merge pull request #3199 from sipa/mempoolmove 
Cleanup refactoring of coins/mempool
 2013-11-10 18:09:58 -08:00
Gavin Andresen 16d5f2c5e0 Merge pull request #3185 from gavinandresen/reject 
Reject p2p message
 2013-11-10 17:11:39 -08:00
Gavin Andresen 69aada346f Bump protocol version to 70002 2013-11-11 10:31:09 +10:00
Gavin Andresen feaec80cb0 Test alerts high at high PROTOCOL_VERSIONs 
I regenerated the alert test data; now alerts are tested
against a protocol version way above the current protocol
version.

So we won't have to regenerate them every time we bump
PROTOCOL_VERSION in the future.
 2013-11-11 10:31:08 +10:00
Gavin Andresen 358ce2664d New reject p2p message 2013-11-11 10:31:08 +10:00
Gavin Andresen 17faf56262 Refactor: pull alert string sanitization into util 2013-11-11 10:22:45 +10:00
Gavin Andresen 0f90613cbe Improve logging of failed connections 2013-11-11 10:17:06 +10:00
Gavin Andresen 3a6faabecf Fix struct/class declaration mismatches 2013-11-11 10:15:43 +10:00
Gavin Andresen 63bea1d2e6 Merge pull request #3198 from nvmd/compile_on_mavericks 
Make time facet non-constant
 2013-11-04 16:50:55 -08:00
Gavin Andresen 97f844dd95 Merge pull request #3180 from pstratem/processgetdata 
Reduce latency in network processing
 2013-11-03 21:52:25 -08:00
Gavin Andresen a95a1c06b1 Merge pull request #3154 from gavinandresen/mempool_refactor 
Mempool refactor
 2013-11-03 20:07:36 -08:00
Gavin Andresen 319b11607f Refactor: CTxMempool class to its own txmempool.{cpp,h} 2013-11-04 11:27:02 +10:00
Gavin Andresen 39b4f0d7dd Merge pull request #3193 from joshtriplett/patch-1 
.gitignore: Simplify references to the same file in different directories
 2013-11-02 19:36:42 -07:00
Gavin Andresen 837369806a Merge pull request #3128 
0056095 Show short scriptPubKeys correctly (Peter Todd)
22de68d Relay OP_RETURN TxOut as standard transaction type (Peter Todd)

Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
 2013-11-01 12:13:38 +10:00
Gavin Andresen ef4b518aea Merge pull request #3067 from Diapolo/debug-switch 
re-work -debug switch handling
 2013-10-30 15:42:31 -07:00
Gavin Andresen 42a12f22d6 Merge pull request #3176 from Diapolo/key 
fix wrong memcmp() usage in CKey::operator==
 2013-10-30 01:03:25 -07:00
Gavin Andresen 951ed190fb Merge pull request #3173 from gavinandresen/fuzzmessages 
-fuzzmessagestest=N : randomly corrupt 1-of-N sent messages
 2013-10-30 00:51:25 -07:00
Gavin Andresen e13934c94e Merge pull request #3115 from sipa/walletmain 
Interaction cleanups between main and wallet
 2013-10-29 18:01:57 -07:00
Gavin Andresen 9038b18f46 -fuzzmessagestest=N : randomly corrupt 1-of-N sent messages 
I needed this to test the new "reject" p2p message, but it should be generally
useful for fuzz-testing network message handling code.
 2013-10-29 11:20:14 +10:00
Gavin Andresen d5d1425657 Bug fix: CDataStream::GetAndClear() when nReadPos > 0 
Changed CDataStream::GetAndClear() to use the most obvious
get get and clear instead of a tricky swap().

Added a unit test for CDataStream insert/erase/GetAndClear.

Note: GetAndClear() is not performance critical, it is used only
by the send-a-message-to-the-network code. Bug was not noticed
before now because the send-a-message code never erased from the
stream.
 2013-10-29 11:20:14 +10:00
Gavin Andresen cd1fc2434c Merge pull request #3164 from TheBlueMatt/master 
Re-enable BitcoindComparisonTool on pull-tester
 2013-10-27 22:42:44 -07:00
Gavin Andresen 1f3d3647ff Send multiple inv messages if mempool.size > MAX_INV_SZ 
Changes the response to the 'mempool' command so that if
the memory pool has more than MAX_INV_SZ transactions (50,000)
it will respond with multiple 'inv' messages.
 2013-10-26 14:14:31 +10:00
Gavin Andresen 9bd5b0be53 Merge pull request #3133 from laanwj/2013_10_format_monetary_test 
Add test for monetary value formatting
 2013-10-23 02:13:18 -07:00
Gavin Andresen 125bdead3e Merge pull request #2740 from constantined/constantined 
UTF-8 support for JSON-RPC
 2013-10-22 01:20:02 -07:00
Gavin Andresen be484db274 Merge pull request #2738 from jgarzik/op_return 
Relay OP_RETURN data TxOut as standard transaction type.
 2013-10-21 22:47:24 -07:00
Gavin Andresen 10dc3c7473 Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoin 
Conflicts:
	src/wallet.cpp
Fixed LogPrint/printf merge conflict.
 2013-10-22 15:34:11 +10:00
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