Wladimir J. van der Laan
bfc24bd4ce
Merge pull request #1717 from Diapolo/Qt_change_TX_display
...
Qt: show mined transactions at depth 1
2012-09-20 00:42:31 -07:00
Gavin Andresen
6cbae37667
Merge branch 'testdata' of git://github.com/TheBlueMatt/bitcoin
2012-09-18 19:22:40 -04:00
Jeff Garzik
b1d3e95a0a
When rejected TX relay due to lack of fees, log full txid
2012-09-18 15:24:31 -04:00
Jeff Garzik
ea0796bde3
Trim trailing whitespace for src/*.{h,cpp}
2012-09-18 15:07:58 -04:00
Gavin Andresen
8b371316c5
Merge branch 'master' of github.com:bitcoin/bitcoin
2012-09-18 12:20:01 -04:00
Gavin Andresen
8f09e4cac4
Give makefiles 'test' and 'check' targets to compile and run unit tests
2012-09-18 12:18:51 -04:00
Jeff Garzik
f8c449b5c8
Merge pull request #1812 from jgarzik/misc-07
...
Two minor generic cleanups done during OP_DROP hacking
2012-09-18 09:14:53 -07:00
Gavin Andresen
a0971337d0
Merge branch 'refactor_times' of git://github.com/luke-jr/bitcoin
2012-09-18 10:59:31 -04:00
Gavin Andresen
5add0b0d0f
Bump client version to 0.7.0.99 now that 0.7.0 release is final.
2012-09-18 10:58:22 -04:00
Wladimir J. van der Laan
7fddf1210e
update comment, secure_allocator is defined in allocators.h
2012-09-15 12:10:00 +02:00
Gavin Andresen
0a4e67afad
Bump client version number for 0.7.0rc3
2012-09-12 14:07:22 -04:00
Pieter Wuille
c1d79812f4
Do not abort if RPC listening for IPv6 fails
...
Instead, fall back to IPv4 listening.
2012-09-12 16:45:09 +02:00
Gregory Maxwell
ab91bf39b7
Apply BIP30 checks to all blocks except the two historic violations.
...
Matt pointed out some time ago that there existed a minor DOS
attack where a node in its initial block download could be wedged
by an overwrite attack in a fork created between checkpoints before
a time where BIP30 was enforced. Now that the BIP30 timestamp
is irreversibly past the check can be more aggressive and apply to
all blocks except the two historic violations.
2012-09-09 20:11:04 -04:00
Jeff Garzik
17f8d6e400
Improve debug logging, for mempool TXs that do not include sufficient fees
2012-09-09 17:05:26 -04:00
Jeff Garzik
76970091f1
Cosmetic: move CTransaction::GetMinFee out of header file
2012-09-09 17:01:18 -04:00
Wladimir J. van der Laan
b019ea17ec
Remove VC6 comment and pointless #ifdef'd benchmark code
...
We're in a wholly different world now, C++-compiler-wise.
Current std::stringstream implementations don't have the stated problem anymore,
and are just as fast as CDataStream.
The #ifdef'd block does not even compile anymore; CDataStream constructor changed,
and missing some std::. Also timing in whole seconds is also way too granular
to say anything sensible in such microbenchmarks. Just remove it,
it can always be found again in git history.
2012-09-09 17:24:00 +02:00
Wladimir J. van der Laan
d8ecd21ff7
Merge pull request #1802 from luke-jr/bugfix_ts
...
Update translations from Transifex (100% coverage for Finnish and Chinese (China)
2012-09-09 00:04:03 -07:00
Luke Dashjr
85eb1e7e56
Update translations from Transifex (100% coverage for Finnish and Chinese (China)
2012-09-08 20:32:54 +00:00
Wladimir J. van der Laan
31fac119dc
Merge pull request #1796 from luke-jr/bugfix_ts
...
Various translation fixups and restorations
2012-09-07 22:15:19 -07:00
Luke Dashjr
4ee706243c
Partially Bugfix: Update English translation strings and translations from Transifex
...
Bugfix: Correct doubled-up & in translations
Bugfix: Remove extra spaces after ampersand in translations (this fixes hotkeys)
Restore copyright translations, now split up
Restore old translations lost due to changes to English structure
Skipped: ca_ES et eu_ES fr_CA (under 10% coverage)
2012-09-08 04:59:13 +00:00
Luke Dashjr
da7b8c1260
Bugfix: Initialize CWallet::nOrderPosNext on an empty wallet, and save it in db
2012-09-08 04:55:36 +00:00
Wladimir J. van der Laan
db1967957d
Merge pull request #1798 from xanatos/patch-19
...
Wrong address added to collection in test (address1 instead of address2)
2012-09-07 07:13:23 -07:00
Philip Kaufmann
f875921176
Bitcoin-Qt (Windows only): add version info to Resource File
...
- add version information to bitcoin-qt.rc, which is displayed on Windows, when looking in the executable properties and selecting "Details"
- introduce a new clientversion.h (used in bitcoin-qt.rc to generate
version information), which takes only the version defines from
version.h and is included in it (to allow usage with the windres rc-file
compiler)
- move #define STRINGIFY(s) #s into clientversion.h as that is used in
bitcoin-qt.rc and rename to DO_STRINGIZE(X)
- add #define STRINGIZE(X) DO_STRINGIZE(X), which is needed to convert the
version defines into a version string in the rc-file
- this ensures we only need to update 1 file and have bitcoin-qt.exe
version information
- for RC-file documentation see:
http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
2012-09-07 16:08:18 +02:00
xanatos
af8c050bff
Wrong address added to collection in test
...
The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless).
2012-09-07 16:04:39 +03:00
Wladimir J. van der Laan
f106491fa2
Merge pull request #1786 from jgarzik/select-fix
...
select()'s first argument should be zero, if no file descriptors are selected
2012-09-06 23:30:22 -07:00
Gavin Andresen
1913b6e2fc
Fix double-paren typo
2012-09-06 16:29:59 -04:00
Matt Corallo
65786afb05
Add various tests for CTransaction::CheckTransaction()
2012-09-05 22:33:59 -04:00
Matt Corallo
1fcebc16c5
check tx.CheckTransaction for data-driven tx tests.
...
(and change so that only one case has to fail to make a tx_invalid
test correct)
2012-09-05 22:33:59 -04:00
Philip Kaufmann
4bd34b4966
replace 2x WSAGetLastError() with 1x WSAGetLastError() call
2012-09-05 22:20:26 +02:00
Jeff Garzik
2387944782
select(): Use precise fd presence check, rather than imprecise hSocketMax test
2012-09-05 16:01:28 -04:00
Gavin Andresen
8788221761
Bump version number for 0.7.0rc2
2012-09-05 12:38:37 -04:00
Gavin Andresen
91c218a1cb
Merge branch 'testnet_alert' of git://github.com/gavinandresen/bitcoin-git
2012-09-05 11:38:38 -04:00
xanatos
4f76be1dc5
Correct LoadWallet() return value (false -> DB_LOAD_OK)
...
Equivalent code. (false == 0 == DB_LOAD_OK). Fixes #1706 .
2012-09-05 11:32:13 +03:00
Jeff Garzik
e271c1d3d0
Merge pull request #1789 from Diapolo/fix_double_Startuptime
...
remove double logging of startup time, when !fLogTimestamps
2012-09-04 23:39:15 -07:00
Philip Kaufmann
274b7ab123
remove double logging of startup time, when !fLogTimestamps
2012-09-05 08:36:50 +02:00
Philip Kaufmann
8d367c7e66
fix signed/unsigned usage in BlockFilePath()
2012-09-05 08:34:41 +02:00
Jeff Garzik
42613c97d5
Add block file naming helper, BlockFilePath()
2012-09-04 21:40:26 -04:00
Jeff Garzik
dcb14198bb
init.cpp: fix build error, and possibly-uninit'd warning
2012-09-04 12:24:08 -04:00
Jeff Garzik
38e8f282d2
Merge pull request #1427 from rebroad/StartTimeFix
...
No need to log start time if it's already being done on every line.
2012-09-04 09:10:47 -07:00
Jeff Garzik
2fd6f067db
Merge pull request #1777 from laanwj/2012_09_eliminate_sprintf
...
Remove last occurrence of potentially insecure function sprintf
2012-09-04 09:00:02 -07:00
Jeff Garzik
bec02998b4
Merge pull request #1779 from xanatos/patch-15
...
Useless vector declaration
2012-09-04 08:59:05 -07:00
Jeff Garzik
8c7b6c05db
Merge pull request #1738 from laanwj/2012_08_boostthread
...
implement CreateThread with boost::thread
2012-09-04 08:53:05 -07:00
Wladimir J. van der Laan
9d7da11458
Merge pull request #1743 from xanatos/patch-14
...
Changed nprev->pprev
2012-09-03 08:11:36 -07:00
Wladimir J. van der Laan
acbe4a1f32
Merge pull request #1728 from xanatos/patch-11
...
Removed duplicated lock
2012-09-03 08:00:18 -07:00
xanatos
89fbd1f11c
Useless vector declaration
...
The vector isn't referenced in the small code block it's declared. I don't see any "useful" side effect in its declaration.
2012-09-03 17:53:27 +03:00
Wladimir J. van der Laan
9c80909452
Remove last occurrence of potentially insecure function sprintf.
...
%d can return up to 11 characters. Move away from fixed buffer completely and
use our own safe function strprintf.
2012-09-03 16:18:16 +02:00
Gavin Andresen
eaf00a3a5d
Merge pull request #1774 from luke-jr/refactor_times
...
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
2012-09-02 16:47:58 -07:00
Wladimir J. van der Laan
4d0c2b6cf4
Merge pull request #1761 from Diapolo/timeout_desc
...
add default value in -timeout description
2012-09-02 06:19:10 -07:00
Luke Dashjr
ddb709e9de
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
...
OrderedTxItems returns a multimap of pointers, but needs a place to store the actual CAccountingEntries it points to.
It had been using a stack item, which was clobbered as soon as it returned, resulting in undefined behaviour.
This fixes at least bug #1768 .
2012-09-02 08:02:46 +00:00
Jeff Garzik
0e1be81a4a
Merge pull request #1771 from luke-jr/bugfix_bip22_mode
...
Bugfix: getblocktemplate: Accept optional "mode" parameter not being provided
2012-09-01 12:30:13 -07:00