Commit graph

4636 commits

Author SHA1 Message Date
Wladimir J. van der Laan 08596fc15d Merge pull request #3021 from Diapolo/fix_extract_strings_qt
fix extract_strings_qt.py
2013-09-19 08:01:51 -07:00
Philip Kaufmann 01cbaeb62f fix extract_strings_qt.py
- a recent pull changed xgettext to gettext, this is reverted here
2013-09-19 14:59:45 +02:00
Pieter Wuille b4355ccaf7 Merge pull request #3019 from sipa/fugbix
Bugfix: nHeightLast instead of nHeightFirst
2013-09-19 03:45:29 -07:00
Pieter Wuille 367c29d6e0 Bugfix: nHeightLast instead of nHeightFirst 2013-09-19 10:44:35 +02: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
Pieter Wuille 1657ed2ab4 Fix minor unit test memory leaks 2013-09-19 00:01:46 +02:00
Cory Fields 5ceb9c9637 win32: only check for windres for win32, and fail if missing 2013-09-18 17:58:53 -04:00
Cory Fields dee632cc25 win32: add version info to bitcoind.exe
TODO: Add icon info
2013-09-18 17:58:53 -04:00
Cory Fields 7a3df1cd94 autotools: fix the Makefile.include to be safely included anywhere.
This way we can reuse rules rather than duplicating them.
2013-09-18 17:12:39 -04:00
Cory Fields c546dc05bb autotools: fix subdir m4 check, never let it return -I
If BDB_CPPFLAGS returns only "-I", the next argument sent to the preprocessor
is treated as a path. There are 2 fixes here:

1. Check in CPPFLAGS, as a user might have manually passed a path to check.
2. Ensure the value is not empty before setting BDB_CPPFLAGS to "-I value"
2013-09-18 17:11:41 -04:00
Cory Fields 7f1c162aae gitian: remove obsolete --disable-debug flag 2013-09-18 15:37:54 -04:00
Cory Fields 8d36b2dcfb gitian: fix win32 build after configure bdb changes
bitcoin incorrectly linked against the dll after the configure changes, so
ensure that only the static lib is installed.
2013-09-18 15:36:48 -04:00
Jeff Garzik 2e9c8aed31 configure.ac: remove unneeded OSX flags 2013-09-18 08:21:39 -04:00
Jeff Garzik 87d7a0ee10 Merge pull request #3011 from jgarzik/autoconf
configure.ac: remove debug/release concept, prefer autotools default CXXFLAGS
2013-09-18 05:18:21 -07:00
Jeff Garzik 8bd6d19a92 configure.ac: remove debug/release concept, prefer autotools default CXXFLAGS 2013-09-18 07:58:05 -04:00
Wladimir J. van der Laan 9a4a7d3c6a qt: english translation update 2013-09-18 13:32:09 +02:00
Jeff Garzik acafc9ceb1 Add src/.gitignore: ignore src/test_bitcoin 2013-09-18 07:07:41 -04:00
Jeff Garzik e0d6dd11e3 Merge pull request #3009 from gavinandresen/LogPrint
Remove #define printf, replace OutputDebugStringf with LogPrint(f)
2013-09-18 04:00:03 -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
Matt Corallo 9085c8c7c3 Update contrib/debian: proper desktop category and update changelog 2013-09-17 22:41:46 -04:00
Gregory Maxwell d6eb259953 [Fee logic] Don't count txins for priority to encourage sweeping.
This changes the priority calculation to not include the size of per-txin
 data including up to 110 bytes of scriptsig so that transactions which
 sweep up extra UTXO don't lose priority relative to ones that don't.

I'd toyed with some other variations, but it seems like any formulation
 which results in an incentive stronger than making them not count will
 sometimes create incentives to add extra outputs so that you have
 extra inputs to consume later.  The maximum credit is limited so that
 users don't lose the disincentive to stuff random data in their
 transactions, the limit of 110 is based on the size of a P2SH
 redemption with a compressed public key.

This shouldn't need a staged deployment because the priority is not
 used as a relay criteria, only a mining criteria.
2013-09-17 10:56:54 -07:00
coblee d64eef48a4 Add getnetworkhashps to get the calculated network hashrate 2013-09-17 11:15:02 +08: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
Cory Fields 152e51c7af included-tests: generate binary data from test files for inclusion into test binaries
This change moves test data into the binaries rather than reading them from
the disk at runtime.

Advantages:
- Tests become distributable
- Cross-compile friendly. Build on one machine and execute in an arbitrary
  location on another.
- Easier testing for backports. Users can verify that tests pass without having
  to track down corresponding test data.
- More trustworthy test results and easier quality assurance as tests make
  fewer assumptions about their environment.
- Tests could theoretically run at client/daemon startup and exit on failure.

Disadvantages:
- Required 'hexdump' build-dependency. This is a standard bsd tool that should
  be usable everywhere. It is likely already installed on all build-machines.
- Tests can no longer be fudged after build by altering test-data.
2013-09-16 12:53:11 -04:00
Cory Fields 08081e393b included-tests: update gitian descriptors for hexdump dependency 2013-09-16 12:53:11 -04:00
Jeff Garzik a25cd0bfdf Merge pull request #3000 from gmaxwell/more_osx_fsync
More fixes for blockchain corruption on OSX.
2013-09-16 06:25:12 -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
Cory Fields cae63be6c9 autotools: fix a parallel build race condition spotted by the pull-tester
libleveldb.a and libmemenv.a should be able to build in parallel, but in
practice calling the leveldb makefile ends up rewriting build_config.mk. If
one target tries to build while the other is halfway through writing the
.mk, the make ends up in an undefined state.

Fix that by making one depend on the other. This also reorders the variables
to be passed by param rather than via the environment, and combines the targets
into a single rule to avoid needless duplication.
2013-09-16 01:59:03 -04:00
Gregory Maxwell e7bad10c12 More fixes for blockchain corruption on OSX.
As we'd previously learned, OSX's fsync is a data eating lie.

Since 0.8.4 we're still getting some reports of disk corruption on
 OSX but now all of it looks like the block files have gotten out of
 sync with the database. It turns out that we were still using fsync()
 on the block files, so this isn't surprising.
2013-09-15 20:34:29 -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
Cory Fields a0c3ab7ed1 autotools: update translation docs 2013-09-14 12:11:38 -04:00
Cory Fields 035ddf6f6b autotools: check for lupdate/xgettext 2013-09-14 12:11:38 -04:00
Cory Fields 21ffa3ce3a autotools: add translate target for qt translations 2013-09-14 12:11:38 -04:00
Philip Kaufmann b26f9d893c Bitcoin-Qt: BitcoinGUI::message() updates/fixes
- ensure message boxes are shown in center of our main window, not
  centered on the users desktop
- always prefer user supplied titles for message boxes over the functions
  defaults (fixes a bug, where transaction info messages did not contain
  information, if it was incoming or outgoing)
2013-09-14 18:04:30 +02:00
Cory Fields f3f09462cd autotools: teach extract_strings_qt.py to respect the XGETTEXT env variable 2013-09-14 11:53:28 -04:00
Cory Fields f286aa1611 autotools: rearrange qt sources to make them more flexible
Add BITCOIN_MM QR_CPP and BITCOIN_CPP in order to better accomodate complicated
targets. This is a no-op change.
2013-09-14 11:51:44 -04:00
Gregory Maxwell 4c5969b367 Merge pull request #2830 from petertodd/p2sh-rpc
P2SH related RPC improvements
2013-09-12 20:50:32 -07:00
Peter Todd 2253642287
Make validateaddress provide redeemScript 2013-09-12 22:54:43 -04:00
Peter Todd be066fad7d Add RPC call decodescript 2013-09-12 22:53:54 -04:00
Peter Todd 463c9710f5 Move Parse{Hash|Hex} to be usable by all RPC code 2013-09-12 22:53:54 -04:00
Gregory Maxwell 11a79680b1 Merge pull request #2979 from luke-jr/autoconf
Autoconf fixes
2013-09-10 17:51:05 -07:00
Gregory Maxwell 85311c1ef8 Merge pull request #2982 from gmaxwell/20130908_ccoins_corrupt
Longer term workaround for chainstate corruption from negative versions.
2013-09-10 16:07:34 -07:00
Luke Dashjr 1e9d3b1392 Bugfix: Since test_bitcoin is being built and run inside src/test/, try using relative directories from that point 2013-09-10 23:04:56 +00:00
Luke Dashjr 9a09c0091c configure: Prefer specific known-good versions of Qt metacompiler tools 2013-09-10 22:26:09 +00:00
Luke Dashjr 56ba02aa2a build-unix.md: Remove now-redundant and unnecessary Gentoo instructions 2013-09-10 22:26:05 +00:00
Luke Dashjr 941dba1783 configure: Check common include subdirectories for bdb headers, and refuse to use any version other than 4.8 by default 2013-09-10 22:26:00 +00:00
Cory Fields b4d8d03b86 autotools: use an absolute path to test data 2013-09-10 18:23:22 -04:00