Gavin Andresen
8cd98a9a26
Merge branch 'bugfix_gitian' of git://github.com/luke-jr/bitcoin
2012-08-27 11:52:56 -04:00
Luke Dashjr
d0377a70e2
Bugfix: Adjust gitian-win32 to use Boost 1.49 for real
2012-08-27 00:49:27 +00:00
Luke Dashjr
1837696580
Bugfix: Move boost::interprocess Win32 workaround to Bitcoin-Qt sources, rather than hacking boost in gitian
2012-08-27 00:49:23 +00:00
Gavin Andresen
772351b0d5
Merge branch '2012_08_progressbarwin' of git://github.com/laanwj/bitcoin
2012-08-25 11:14:11 -04:00
Gavin Andresen
9db9642db4
Merge branch 'nozeroout' of git://github.com/sipa/bitcoin
2012-08-25 11:05:59 -04:00
Gavin Andresen
b9c078ea96
Merge branch 'checkpoint'
2012-08-25 11:05:24 -04:00
Wladimir J. van der Laan
8f3f554053
Merge pull request #1724 from laanwj/2012_08_updtrans_cs
...
Update Czech translation from Transifex
2012-08-25 01:21:41 -07:00
Wladimir J. van der Laan
12324c1693
Update Czech translation from Transifex
2012-08-25 10:19:35 +02:00
Luke Dashjr
bc8d832335
Abstract all IPC communication to qtipcserver
2012-08-24 16:59:27 +00:00
Wladimir J. van der Laan
382b75f528
Override progress bar on platforms with segmented progress bars
...
Windows & WindowsXP style have a problem with displaying the block progress.
Add a custom stylesheet as workaround, but only when one of those renderers is active,
otherwise leave the theme alone (issue #1071 ).
2012-08-24 15:01:07 +02:00
Pieter Wuille
af1c6b93b7
Merge pull request #1699 from laanwj/2012_08_securealloc
...
Handle locked pages more robustly (Fixes issue #1462 )
2012-08-24 04:38:57 -07:00
Pieter Wuille
65ce215641
Make 0-value outputs non-standard
2012-08-24 12:15:12 +02:00
Gregory Maxwell
c68c4bc7a4
Merge pull request #1672 from gmaxwell/filter_listunspent
...
Listunspent txout address filtering and listaddressgroupings
2012-08-24 00:46:24 -07:00
Gregory Maxwell
b1093efa83
Change CWallet addressgrouping to use CTxDestination instead of strings.
...
This is cleanup for the listaddressgroupings code. Also add some
real help text.
2012-08-24 03:28:45 -04:00
Gregory Maxwell
bdab0cf58c
Avoid leaving return types or function attributes on their own lines.
2012-08-24 02:48:19 -04:00
Gregory Maxwell
0050cf21ce
Merge pull request #1409 from luke-jr/listtx_generate_fold
...
Treat generation (mined) transactions less different from receive transactions
2012-08-23 16:31:45 -07:00
Luke Dashjr
e07c8e9123
Treat generation (mined) transactions less different from receive transactions
...
- Show address receiving the generation, and include it in the correct "account"
- Multiple entries in listtransactions output if the coinbase has multiple outputs to us
2012-08-23 23:20:01 +00:00
Gregory Maxwell
1bcd3f26c0
Merge pull request #1431 from luke-jr/opt_ipv6
...
Make IPv6 support optional again (defaults to enabled)
2012-08-23 14:17:35 -07:00
Luke Dashjr
9655d73f49
Allow building with IPv6 support, but it disabled by default
2012-08-23 21:01:01 +00:00
Luke Dashjr
45beb88966
Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too
2012-08-23 21:00:57 +00:00
Luke Dashjr
e422bebbdc
Make IPv6 support buildtime-optional again (defaults to enabled)
2012-08-23 20:49:51 +00:00
Wladimir J. van der Laan
579d011738
Merge pull request #1713 from laanwj/2012_08_aboutqticon
...
Add icon for "About Qt" in menu
2012-08-23 13:03:14 -07:00
Wladimir J. van der Laan
05fa0de6d8
Add icon for "About Qt" in menu
...
Use the built-in icon that is also used in the dialog box itself.
2012-08-23 21:57:20 +02:00
Gregory Maxwell
92735bca31
Add txout address filtering to listunspent.
...
This applies on top of the coincontrol listaddressgroupings patch
and makes finding eligible outputs from the groups returned
by listaddressgroupings possible.
2012-08-23 15:55:50 -04:00
coderrr
22dfd73598
Add address groupings RPC from the coincontrol patches.
...
Signed-off-by: Gregory Maxwell <greg@xiph.org>
2012-08-23 15:55:42 -04:00
Gregory Maxwell
47753fa369
Merge pull request #1393 from luke-jr/refactor_times
...
Refactor transaction/accounting time
2012-08-23 12:38:50 -07:00
Luke Dashjr
c3f95ef13f
Choose reasonable "smart" times to display for transactions
...
Logic:
- If sending a transaction, assign its timestamp to the current time.
- If receiving a transaction outside a block, assign its timestamp to the current time.
- If receiving a block with a future timestamp, assign all its (not already known) transactions' timestamps to the current time.
- If receiving a block with a past timestamp, before the most recent known transaction (that we care about), assign all its (not already known) transactions' timestamps to the same timestamp as that most-recent-known transaction.
- If receiving a block with a past timestamp, but after the most recent known transaction, assign all its (not already known) transactions' timestamps to the block time.
2012-08-23 18:38:22 +00:00
Luke Dashjr
bdbfd2329a
JSON-RPC: Add "blocktime" and (for wallet transactions) "timereceived" to transaction Object outputs
2012-08-23 18:30:30 +00:00
Luke Dashjr
9c7722b7c5
Store a fixed order of transactions (and accounting) in the wallet
...
For backward compatibility, new accounting data is stored after a \0 in the comment string.
This way, old versions and third-party software should load and store them, but all actual use (listtransactions, for example) ignores it.
2012-08-23 18:18:20 +00:00
Jeff Garzik
cf78183fad
Merge pull request #1707 from xanatos/patch-7
...
Removed useless assignment
2012-08-23 06:41:02 -07:00
Pieter Wuille
de363e73ea
Merge pull request #1709 from xanatos/patch-10
...
Spaces in strings
2012-08-23 05:34:47 -07:00
xanatos
331544bc37
Spaces in strings
...
One added space + one removed space.
2012-08-23 15:19:13 +03:00
xanatos
b765385a3e
Removed useless assignment
...
nLoadWalletRet is already equal to DB_NEED_REWRITE (we are in an if)
2012-08-23 14:47:00 +03:00
Wladimir J. van der Laan
0b886ad1bd
Make CCrypter use LockedPageManager to manage locked pages
...
Replace direct calls to mlock.
Also, change the class to lock the memory areas in the constructor and unlock them again in the destructor. This makes sure that locked pages won't leak.
2012-08-23 06:55:35 +02:00
Wladimir J. van der Laan
e95568b78d
Handle locked pages more robustly (Fixes issue #1462 )
...
Memory locks do not stack, that is, pages which have been locked several times by calls to mlock()
will be unlocked by a single call to munlock(). This can result in keying material ending up in swap when
those functions are used naively. In this commit a class "LockedPageManager" is added
that simulates stacking memory locks by keeping a counter per page.
2012-08-23 06:55:35 +02:00
Wladimir J. van der Laan
fedd060d81
Merge pull request #1700 from laanwj/2012_08_testsotherfiles
...
bitcoin-qt.pro: Add test sources to OTHER_FILES
2012-08-22 10:49:38 -07:00
Gregory Maxwell
a159d6caf0
Merge pull request #1694 from sipa/fix_netloops
...
Fix infinite loops in connection logic
2012-08-22 07:15:03 -07:00
Wladimir J. van der Laan
4942b21203
bitcoin-qt.pro: Add test sources to OTHER_FILES so that they can be edited easier in Qt creator
...
- Also add src/version.h
2012-08-22 14:18:27 +02:00
Wladimir J. van der Laan
ba1cdb6883
Merge pull request #1701 from laanwj/2012_08_pull_transifex
...
Update translations from transifex
2012-08-22 05:09:29 -07:00
Wladimir J. van der Laan
d9725378b0
Update translations from transifex
2012-08-22 14:05:01 +02:00
Pieter Wuille
f161a2c211
Fix infinite loops in connection logic
2012-08-22 13:35:33 +02:00
Pieter Wuille
1a3dcca8f4
Merge pull request #1695 from sipa/noloadorphan
...
Do not accept orphan blocks in -loadblock mode
2012-08-22 04:32:39 -07:00
Gavin Andresen
80cfc3a485
Checkpoint at block 193,000
2012-08-21 22:50:00 -04:00
Gavin Andresen
f39ab4c8d0
Merge branch 'testdata' of git://github.com/TheBlueMatt/bitcoin
2012-08-21 13:58:24 -04:00
Pieter Wuille
5c88e3c108
Do not accept orphan blocks in -loadblock mode
2012-08-21 19:18:53 +02:00
Jeff Garzik
1954d40691
Merge pull request #1493 from jgarzik/unlocked-rpc
...
RPC: add facility to enable RPCs to run outside cs_main, wallet locks
2012-08-21 09:22:13 -07:00
Jeff Garzik
0e1d3551da
RPC: add facility to enable RPCs to run outside cs_main, wallet locks
...
Use with 'stop' and 'help' RPCs.
This provides a facility to individually evaluate the locking for an RPC, and
potentially make it more parallel.
2012-08-21 12:03:52 -04:00
Gavin Andresen
cd58f05894
Restore OSX 10.5 compatibility (do not use pthread_setname_np)
2012-08-21 12:00:05 -04:00
Gavin Andresen
b4b7ed1915
Fix 32-bit build error: include util.h to get int64 typedef
2012-08-21 11:59:59 -04:00
Jeff Garzik
5f2b41d54d
Merge pull request #1693 from jgarzik/rpcwallet
...
Move code to new modules rpcwallet.cpp, rpcblockchain.cpp
2012-08-21 08:44:21 -07:00
