DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
5,523 Commits 6 Branches 7 Tags
23abc2ea48e8acbb50c4f82ea3dcf0231ff810ca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 23abc2ea48 Merge pull request #3937 
7b95c7b Ignore temporary object files (Chris Beams)
 2014-03-31 08:14:48 +02:00
Wladimir J. van der Laan ad603f815f Merge pull request #3950 
76cee18 fix permissions in application bundle (Andrea D'Amore)
 2014-03-31 05:00:34 +02:00
Wladimir J. van der Laan 09b9c2fcd5 Merge pull request #3980 
af4c2ac Fix `-printblocktree` output (Wladimir J. van der Laan)
 2014-03-31 04:47:32 +02:00
Wladimir J. van der Laan b725af7599 Merge pull request #3907 from schildbach/gitian-downloader-aschildbach-key 
Add Andreas Schildbach to gitian download scripts.
 2014-03-30 16:30:23 +02:00
Wladimir J. van der Laan 8adb7bca21 Merge pull request #3875 
89d72f3 Add new DNS seed from bitnodes.io. (Addy Yeow)
 2014-03-29 19:38:23 +01:00
Wladimir J. van der Laan af4c2ac8ce Fix -printblocktree output 
PrintBlockTree output was broken starting from e010af70.
Everything appears on one line.

PrintWallet() added the newline after a block, but this functionality
was removed and no newline was added.

Seemingly, no one noticed. Add a newline after the block information
to fix this.
 2014-03-29 16:25:47 +01:00
Wladimir J. van der Laan 55027a8c85 Merge pull request #3973 
a60ab0b Make GetAvailableCredit run GetHash() only once per transaction. (Gregory Maxwell)
 2014-03-29 09:35:11 +01:00
Wladimir J. van der Laan e9d2e6ed90 Merge pull request #3922 
c17f0a5 [Qt] remove space from translation of client bitness (Philip Kaufmann)
 2014-03-29 06:03:08 +01:00
Wladimir J. van der Laan acac57b8af Merge pull request #3730 
1d46fe3 'sendrawtransaction' improvements (Wladimir J. van der Laan)
 2014-03-28 09:53:49 +01:00
Wladimir J. van der Laan e33cc87212 Merge pull request #3698 
5409404 add constant for shared (GUI/core) -par settings (Philip Kaufmann)
 2014-03-27 13:02:24 +01:00
Wladimir J. van der Laan 1d46fe3327 'sendrawtransaction' improvements 
- Make it report the reject code and reason
- Make it possible to re-send transactions that are already in the mempool
 2014-03-27 12:33:55 +01:00
Wladimir J. van der Laan ebb783a9f2 Merge pull request #3603 
a486abd replace custom GetFilesize() with boost::filesystem::file_size() (Philip Kaufmann)
 2014-03-27 11:38:34 +01:00
Wladimir J. van der Laan 77eaa6fc45 Merge pull request #3682 
3e0753b always show syncnode in getpeerinfo (fixes #2717) (Philip Kaufmann)
 2014-03-27 11:20:49 +01:00
Wladimir J. van der Laan 410c2fa317 Merge pull request #3619 
7398f4a improve command-line options output (Cozz Lovan)
 2014-03-27 11:07:37 +01:00
Wladimir J. van der Laan 7f3c4f08ea Merge pull request #3923 
cfe4cad [Qt] fix style, formating, comment and indentation problems (Philip Kaufmann)
 2014-03-27 11:05:16 +01:00
Wladimir J. van der Laan 47ef190637 Merge pull request #3958 
dfd3996 Remove duplicate from src/makefile.am (Wladimir J. van der Laan)
 2014-03-26 12:03:54 +01:00
Wladimir J. van der Laan 95f0af5cb1 Merge pull request #3951 
3cb1edb Update moved and dead links (Luke Dashjr)
 2014-03-26 10:44:47 +01:00
Wladimir J. van der Laan f284b5998a Merge pull request #3935 
c61fe44 qt: Only override -datadir if different from the default (Wladimir J. van der Laan)
7e591c1 qt: Do proper boost::path conversion (Wladimir J. van der Laan)
 2014-03-26 10:42:54 +01:00
Wladimir J. van der Laan dfd3996217 Remove duplicate from src/makefile.am 
chainparams.cpp should not be in both libbitcoin_common and
libbitcoin_server. Also re-sort the sources list.
 2014-03-26 10:22:01 +01:00
Wladimir J. van der Laan c61fe44194 qt: Only override -datadir if different from the default 
Fixes #3905.
 2014-03-25 09:26:11 +01:00
Wladimir J. van der Laan 7e591c19e7 qt: Do proper boost::path conversion 
Convert from QString unicode from/to the OS-dependent locale
as used by boost::filesystem::path as needed.

Solves #3916.
 2014-03-25 09:20:10 +01:00
Wladimir J. van der Laan e3f5d4338d Fix test build after d138598 
Building the tests was giving some vague error message about a doubly-defined
symbol.

The solution is to define ShutdownRequested in test_bitcoin.cpp as well
so that init.cpp does not get pulled in.
 2014-03-25 07:54:53 +01:00
Wladimir J. van der Laan d3c3210fa3 Merge pull request #3927 
ab1edd4 [Qt] Fix enable/disable show and remove buttons (Cozz Lovan)
 2014-03-23 11:28:52 +01:00
Wladimir J. van der Laan 9c6f707172 Merge pull request #3938 
6540025 Remove stale and redundant src/.gitignore file (Chris Beams)
 2014-03-22 14:42:02 +01:00
Wladimir J. van der Laan 0a3acf260a Merge pull request #3926 
c337e2e Update gitian README.md (Wladimir J. van der Laan)
 2014-03-21 14:53:36 +01:00
Wladimir J. van der Laan 6039196b57 doc: version bump Doxyfile 
- bump version to 0.9.99
- exclude leveldb and json
- include call and caller graphs in the documentation.
 2014-03-21 14:46:00 +01:00
Wladimir J. van der Laan c337e2e905 Update gitian README.md 2014-03-21 13:31:22 +01:00
Wladimir J. van der Laan 178d6a1b65 Merge pull request #3924 
7885907 qt: translation update (Wladimir J. van der Laan)
 2014-03-21 12:16:11 +01:00
Wladimir J. van der Laan 788590736d qt: translation update 2014-03-21 12:13:10 +01:00
Wladimir J. van der Laan fc5d85c4bb Merge pull request #3806 
9e2872c Adjust branding in datadir lock error message (Michagogo)
d30d379 Slightly tweak error when unable to bind port (Michagogo)
 2014-03-21 09:58:02 +01:00
Wladimir J. van der Laan be0afe238b Merge pull request #3850 
16d281b [Qt] add expert section to wallet tab in optionsdialog (Cozz Lovan)
 2014-03-21 09:26:30 +01:00
Wladimir J. van der Laan 162c33d246 Merge pull request #3892 
b8edf6c Qt: Fix ESC in disablewallet mode (Wladimir J. van der Laan)
 2014-03-21 09:24:20 +01:00
Wladimir J. van der Laan 33207fc870 Merge pull request #3906 
7211bce Consistent use of 'sudo' in unix build doc (Mikael Wikman)
 2014-03-21 08:33:21 +01:00
Wladimir J. van der Laan 733a799218 Merge pull request #3920 
8c29273 [QT] Fixes feel when resizing the last column on tables (issue #2862) (gubatron)
 2014-03-21 08:10:45 +01:00
Wladimir J. van der Laan 6539cfc583 Merge pull request #3917 
5c80b9a build: build qt tests after qt libs/executable (Wladimir J. van der Laan)
 2014-03-20 18:35:19 +01:00
Wladimir J. van der Laan fac6bea8f0 Merge pull request #3885 
01e5327 build: hook up "make deploy" for cross osx builds (Cory Fields)
c4a10db build: ensure the correct strip is used for osx/win32 (Cory Fields)
b62bbb1 build: if cross-compiling for an apple host, locate some additional tools (Cory Fields)
0f21d39 build: fix qt.conf case-sensitivity in the deployed dmg (Cory Fields)
275d6a3 build: allow correct tools to be used for dmg creation. (Cory Fields)
 2014-03-20 18:14:01 +01:00
Wladimir J. van der Laan 5c80b9a7fb build: build qt tests after qt libs/executable 
Autotools defaults to a depth-first recursion which causes the qt tests
to be built before the executables and libraries.

This is inconvenient as make needs to be called twice to make sure the
tests are up to date after changing a source file.

Update the Makefile.am to change this order.
 2014-03-20 17:35:40 +01:00
Wladimir J. van der Laan 0d8e80fe07 Merge pull request #3895 
74f66a5 Fixed compile error on Debian jessie (gcc version 4.8.2 (Debian 4.8.2-16)) (Meeh)
 2014-03-19 09:24:35 +01:00
Wladimir J. van der Laan b8edf6c0d8 Qt: Fix ESC in disablewallet mode 
Fixes issue #3854
 2014-03-18 14:51:28 +01:00
Wladimir J. van der Laan 3fc6846181 Add licenses for tests and test data 
- Add license headers to source files (years based on commit dates)
  in `src/test` as well as `qa`
- Add `README.md` to `src/test/data` specifying MIT license

Fixes #3848
 2014-03-18 10:20:55 +01:00
Wladimir J. van der Laan 61774f82b3 Merge pull request #3855 
0fde3bb [Qt] Fill in label from address book also for URIs (Cozz Lovan)
 2014-03-18 09:24:02 +01:00
Wladimir J. van der Laan 5b6e9811fa Merge pull request #3867 
b40bdd6 qt: Show also value for options overridden on command line (Wladimir J. van der Laan)
 2014-03-17 10:38:37 +01:00
Wladimir J. van der Laan ff0c0dd6a9 Merge pull request #3874 
caee92d qt: Enable and disable the Show and Remove buttons for requested payments history based on whether any entry is selected. (Haakon Nilsen)
 2014-03-17 10:17:39 +01:00
Wladimir J. van der Laan 1699e3a868 Merge pull request #3881 
a22e9a3 build: fix explicit --disable-qt-dbus (Cory Fields)
 2014-03-16 11:04:52 +01:00
Wladimir J. van der Laan 16254b6e14 Merge pull request #3878 
da0b9d4 Revert "Squashed 'qa/rpc-tests/python-bitcoinrpc/' content from commit e484743" (Johnathan Corgan)
 2014-03-16 11:03:16 +01:00
Wladimir J. van der Laan cb0c42e7da Merge pull request #3876 
a1465ac qt: Show weeks as well as years behind for long timespans (Wladimir J. van der Laan)
 2014-03-15 16:40:02 +01:00
Wladimir J. van der Laan acfe60677c Merge pull request #3650 
2b45345 minor style cleanups (Philip Kaufmann)
 2014-03-15 10:24:04 +01:00
Wladimir J. van der Laan a1465ac8e6 qt: Show weeks as well as years behind for long timespans 
Closes #3811.
 2014-03-15 10:13:37 +01:00
Wladimir J. van der Laan a9801cf7ee Merge pull request #3871 
b51700a [Qt] Dont set table color in coin control (Cozz Lovan)
 2014-03-15 07:41:13 +01:00
Wladimir J. van der Laan b40bdd6532 qt: Show also value for options overridden on command line 
Currently only the name of the option is shown for GUI options
overridden by command line (or configuration file). This commit
adds the value of the options as well, which is useful for
troubleshooting.
 2014-03-14 07:22:59 +01:00
Wladimir J. van der Laan 74502e753b Merge pull request #3846 
3f2a017 [Qt] Fix coin control qt5 checkbox bug in tree mode (Cozz Lovan)
 2014-03-13 15:19:26 +01:00
Wladimir J. van der Laan fbdf4e5efa Merge pull request #3844 
c52c4e5 qt: Make it possible again to specify -testnet in config file (Wladimir J. van der Laan)
 2014-03-11 17:03:24 +01:00
Wladimir J. van der Laan 1264b3647d Merge pull request #3696 
c4656e0 Add progress to initial display of latest block downloaded. (R E Broadley)
75b8953 Display progress of rescan. (R E Broadley)
 2014-03-11 09:18:16 +01:00
Wladimir J. van der Laan c52c4e5d14 qt: Make it possible again to specify -testnet in config file 
Changes for the datadir chooser have made it impossible to specify
the network (testnet/regtest) in the configuration file for the GUI.

Reorganize the initialization sequence to make this possible again.

- Moves the "datadir" QSetting so that is no longer dependent on the
  network-specific application name (doing otherwise would create a
  chicken-and-egg problem).

- Re-initialize translations after choosing network. There may be a
  different language configured in network-specific settings
  (slim chance, but handle it for sanity).

Fixes point 1 of #3840.
 2014-03-11 08:46:01 +01:00
Wladimir J. van der Laan 0ffd87f1c1 qt: Remove control characters from ko_KR translation 
Last Transifex pull (064a690) introduced a few control characters
into the Korean translation, which sometimes causes the build to fail.

Manually remove these characters for now to get the build working --
they should still be removed at Transifex too.
 2014-03-10 17:04:35 +01:00
Wladimir J. van der Laan 636d8e4de6 Merge pull request #3815 
5283410 Remove unused includes of boost lexical_cast (Wladimir J. van der Laan)
 2014-03-10 16:32:50 +01:00
Wladimir J. van der Laan 961326c505 Merge pull request #3829 
a75cacd doc/build-unix.md  use github flavored md for table (Torstein Husebø)
 2014-03-10 14:25:59 +01:00
Wladimir J. van der Laan dbb3ab5cbf Merge pull request #3835 
064a690 Transifex pull pre-0.9.0rc3/final (Wladimir J. van der Laan)
 2014-03-10 14:23:00 +01:00
Wladimir J. van der Laan 064a690515 Transifex pull pre-0.9.0rc3/final 2014-03-10 14:15:46 +01:00
Wladimir J. van der Laan b76733d8e8 Merge pull request #3514 
f59d8f0 Per-peer block download tracking and stalled download detection. (Pieter Wuille)
 2014-03-10 13:23:18 +01:00
Wladimir J. van der Laan 1795c69aaa Merge pull request #3833 
f5f157b add --enable-debug for configure (daniel)
 2014-03-10 12:34:53 +01:00
Wladimir J. van der Laan 70b8cb9ce8 qt: Adjust BLOCK_CHAIN_SIZE to 20GB 
This increases the space requirement for selecting a data directory in
the UI.
As suggested by @bardiharborow, fixes #3830.
 2014-03-10 10:06:15 +01:00
Wladimir J. van der Laan 218be95903 Merge pull request #3685 
8e29623 [Qt] show number of in/out connections in debug console (Philip Kaufmann)
 2014-03-10 10:03:53 +01:00
Wladimir J. van der Laan 6041fc85ea Merge pull request #3751 
b881100 convert tabs to whitespace in bitrpc.py (Bryan Bishop)
 2014-03-10 09:34:51 +01:00
Wladimir J. van der Laan 0ad72bf1a0 Merge pull request #3773 
947e23d Fix typo in doc/build-unix.md regarding building without UPnP (Rune K. Svendsen)
 2014-03-10 09:34:08 +01:00
Wladimir J. van der Laan 1cab453ff8 Merge pull request #3817 
e935293 Minor code cleanup: remove indentation (Mark Friedenbach)
 2014-03-10 09:33:19 +01:00
Wladimir J. van der Laan fb4f40a0dc Merge pull request #3823 
89ec3a2 MainNet is the special case for the GUI (jtimon)
 2014-03-10 09:31:19 +01:00
Wladimir J. van der Laan 5283410568 Remove unused includes of boost lexical_cast 
We don't use lexical_cast anywhere, no need to include it.
 2014-03-07 17:55:13 +01:00
Wladimir J. van der Laan d33f69a447 Merge pull request #3796 
16bfd68 update bash-completion for v0.9 (Christian von Roques)
 2014-03-07 09:26:10 +01:00
Wladimir J. van der Laan c7c3262774 Merge pull request #3768 
fecba4e Total money limit test (Pieter Wuille)
 2014-03-07 08:59:03 +01:00
Wladimir J. van der Laan 9b7449bae6 Merge pull request #3805 
8a6894c Log which wallet is used during init (Wladimir J. van der Laan)
 2014-03-07 07:51:53 +01:00
Wladimir J. van der Laan 63e1da9278 Merge pull request #3809 
1bcf81e gui: Prevent status icons from being cut off (Wladimir J. van der Laan)
 2014-03-06 15:00:26 +01:00
Wladimir J. van der Laan 1bcf81e042 gui: Prevent status icons from being cut off 
After the Qt5 switch, status icons were being cut off by 1-2px.

Also fixes some other cases where the UI is slightly off mentioned in #3800.

Fixes #3800.
 2014-03-06 14:56:31 +01:00
Wladimir J. van der Laan f5352da490 Merge pull request #3804 
ba51c7d Fix null pointer in IsTrusted() (Cozz Lovan)
 2014-03-05 19:39:59 +01:00
Wladimir J. van der Laan 8a6894ca3e Log which wallet is used during init 
Now that the wallet can be selected using -wallet it is important
to log which wallet is being used for later troubleshooting.
 2014-03-05 16:15:04 +01:00
Wladimir J. van der Laan 334bd22e75 Merge pull request #3798 
2d2d8fa Clarify the error message when unable to bind to port (paveljanik)
094eeff Bitcoin is running fine... (paveljanik)
 2014-03-05 11:53:08 +01:00
Wladimir J. van der Laan c975e99ca9 Merge pull request #3784 
dc01ba7 Fix coin control sorts date as text (Cozz Lovan)
 2014-03-04 15:06:18 +01:00
Wladimir J. van der Laan ad6ae48939 build: Version bump to 0.9.99, disable IS_RELEASE 
`master` is not a release. Use the same convention as before and label
these intermediate builds as x.x.99.
 2014-03-04 13:33:39 +01:00
Wladimir J. van der Laan aefbf6e30c doc: Empty release notes for next release 
Now that 0.9 is branched off, the new release notes for 0.10 or 0.11 or
1.0 should be added here.

Edits to preliminary 0.9.0 release notes should be made in the 0.9.0 branch.
 2014-03-03 09:45:36 +01:00
Wladimir J. van der Laan d6e0e171ab Merge pull request #3692 
098316c English translation update (Wladimir J. van der Laan)
 2014-03-01 09:34:03 +01:00
Wladimir J. van der Laan 098316c70f English translation update 
A few new messages have been added since last update.
 2014-03-01 09:06:10 +01:00
Wladimir J. van der Laan 280aa2abc6 Merge pull request #3769 
d6b3689 qttools5-dev is required in order to build with qt5 on debian and ubuntu (Haakon Nilsen)
 2014-03-01 08:48:59 +01:00
Wladimir J. van der Laan 97f2bbd753 Merge pull request #3719 
f642fd9 qt: Modernize 'confirmed' terminology in shown tx status (Wladimir J. van der Laan)
 2014-02-28 13:14:56 +01:00
Wladimir J. van der Laan f642fd9dd6 qt: Modernize 'confirmed' terminology in shown tx status 
These days we regard transactions with one confirmation to be
'Confirmed'.
Waiting for 6 confirmations is a recommendation but should not
keep the transaction shown as unconfirmed.

Misc code sanity:

- Merge maturity/status enums, they had become completely disjunct
- 'confirmed' flag is now called 'countsForBalance' for clarity
 2014-02-28 13:04:50 +01:00
Wladimir J. van der Laan 7ac375d1c2 Merge pull request #3758 
f8a7b50 Update build information (Drak)
 2014-02-28 12:34:57 +01:00
Wladimir J. van der Laan 04b4aa5256 Merge pull request #3762 
93c3e21 Re-enable UPnP by default in gitian builds (Wladimir J. van der Laan)
 2014-02-28 09:56:44 +01:00
Wladimir J. van der Laan 1b8fd35aad Make tinyformat errors raise an exception instead of assert()ing 
By default tinyformat errors such as 'wrong number of conversion
specifiers in format string' cause an assertion failure.

Raise an exception instead so that error handling can recover or can
show an appropriate error.
 2014-02-28 09:25:00 +01:00
Wladimir J. van der Laan 93c3e21e92 Re-enable UPnP by default in gitian builds 
IIRC this was the case with 0.8.6, so let's keep this to avoid the risk
of losing connectable nodes with 0.9 release.

Also our miniupnpc library was recently updated and I've heard
reports that it works better than before now.
 2014-02-27 15:44:00 +01:00
Wladimir J. van der Laan 4877b99532 Merge pull request #3761 
a270ca2 Transifex pull pre-0.9.0rc2 (Wladimir J. van der Laan)
 2014-02-27 14:55:58 +01:00
Wladimir J. van der Laan a270ca2b42 Transifex pull pre-0.9.0rc2 2014-02-27 14:18:53 +01:00
Wladimir J. van der Laan dcb1280d8e Merge pull request #3752 
5d5b0d2 Add shell null to else block (Wil Bown)
 2014-02-27 12:35:11 +01:00
Wladimir J. van der Laan b81f9718df Merge pull request #3749 
4423571 Replace PrintException with PrintExceptionContinue + throw (Wladimir J. van der Laan)
 2014-02-26 20:52:39 +01:00
Wladimir J. van der Laan 44235713ed Replace PrintException with PrintExceptionContinue + throw 
Just a pet peeve.

(PrintException has exactly the same body as PrintExceptionContinue but
does a re-throw at the end. Move these re-throws to the call
site, this aids understanding what is going on as well as eliminates a
bit of code duplication in util.cpp)
 2014-02-26 13:23:52 +01:00
Wladimir J. van der Laan 3480bf7c65 Merge pull request #3736 
a719903 Fix bitcoin-cli exit status code (Cozz Lovan)
 2014-02-26 13:19:46 +01:00
Wladimir J. van der Laan 12f5787d45 Merge pull request #3559 
e6c6bc9 Adds additional zero checks for setCompact  These encoded values should all decode to zero (Noel Tiernan)
 2014-02-25 16:25:52 +01:00
Wladimir J. van der Laan 3198604293 Merge pull request #3712 
a3138ed add test of DecodeBase58 skipping whitespace (Christian von Roques)
 2014-02-25 16:24:03 +01:00
Wladimir J. van der Laan 31b3d94ef5 gitian: Make protobuf win32 intermediate output deterministic 
While building protobuf in different environments we noticed that
the host tool protoc was slightly different between builds (a symbol table
sorting issue).
Add a deterministic seed as well as disable zlib support.

Exected output is now:

    e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip
    a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip

No effect on final executables so no version bump.
 2014-02-25 07:58:11 +01:00
Wladimir J. van der Laan 2f5da74362 Remove definition of PRI?64 in util.h 
This was a bad idea. This can't be solved with macros as any
other library that includes inttypes.h will get in the way.

The parent commit has removed all usages from the source, this commit
removes the definition.
 2014-02-24 09:11:33 +01:00
Wladimir J. van der Laan f48742c2bf Get rid of C99 PRI?64 usage in source files 
Amend to d5f1e72. It turns out that BerkelyDB was including inttypes.h
indirectly, so we cannot fix this with just macros.

Trivial commit: apply the following script to all .cpp and .h files:

    # Middle
    sed -i 's/"PRIx64"/x/g' "$1"
    sed -i 's/"PRIu64"/u/g' "$1"
    sed -i 's/"PRId64"/d/g' "$1"
    # Initial
    sed -i 's/PRIx64"/"x/g' "$1"
    sed -i 's/PRIu64"/"u/g' "$1"
    sed -i 's/PRId64"/"d/g' "$1"
    # Trailing
    sed -i 's/"PRIx64/x"/g' "$1"
    sed -i 's/"PRIu64/u"/g' "$1"
    sed -i 's/"PRId64/d"/g' "$1"

After this commit, `git grep` for PRI.64 should turn up nothing except
the defines in util.h.
 2014-02-24 09:08:56 +01:00
Wladimir J. van der Laan 4fd082ded7 Merge pull request #3729 
d5f1e72 Don't use PRIx64 formatting derives from inttypes.h (Wladimir J. van der Laan)
 2014-02-23 09:04:07 +01:00