Wladimir J. van der Laan
3cdae61aa2
Merge pull request #4787
...
4b0deb3 Clean up CMerkleTx::SetMerkleBranch. (Daniel Kraft)
2014-09-22 14:18:54 +02:00
Wladimir J. van der Laan
565da68ed0
Merge pull request #4852
...
5e83bc4 [Qt] include and file header cleanup (Philip Kaufmann)
2014-09-22 12:20:36 +02:00
Wladimir J. van der Laan
321fd7dbee
Merge pull request #4947
...
6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
2014-09-22 10:34:12 +02:00
Wladimir J. van der Laan
aa340a8f07
Merge pull request #4951
...
d6712db Also create pid file in non-daemon mode (Wladimir J. van der Laan)
2014-09-22 10:32:21 +02:00
Wladimir J. van der Laan
cfc5cfb0f0
qt: Make splash and shutdown window ignore close events
...
It's strange to be able to close these windows while there is work
in progress.
Also set Qt::WA_DeleteOnClose on both windows to make sure that they
are deleted eventually, no matter what happens.
2014-09-22 10:13:52 +02:00
Wladimir J. van der Laan
6b09bc45b1
Merge pull request #4941
...
a49f11d qt: Change splash screen to normal window (Wladimir J. van der Laan)
2014-09-22 09:33:34 +02:00
Wladimir J. van der Laan
5547f08ec7
Merge pull request #4952
...
01c2807 Add warning about the merkle-tree algorithm duplicate txid flaw (Peter Todd)
2014-09-22 09:03:59 +02:00
Wladimir J. van der Laan
ae9966ed85
Merge pull request #4950
...
33a2771 test: Fix DoS tests after c74332c (Wladimir J. van der Laan)
2014-09-21 21:25:25 +02:00
Wladimir J. van der Laan
d6712db354
Also create pid file in non-daemon mode
...
Always make a pid file, not only when `-daemon` specified.
This is useful for troubleshooting, for attaching debuggers and loggers
and such.
- Write the pid file only after the datadir lock was acquired
- Don't create or remove a pid file on WIN32, and also don't show the option
2014-09-20 11:03:59 +02:00
Wladimir J. van der Laan
33a27716fc
test: Fix DoS tests after c74332c
...
Fix data structure mismatch ... The mind boggles that they were still passing at all.
2014-09-20 09:55:14 +02:00
Wladimir J. van der Laan
a49f11d9ed
qt: Change splash screen to normal window
...
Makes it possible to move, minimize, unminimize the window while
Bitcoin Core is initializing.
2014-09-18 13:21:26 +02:00
Wladimir J. van der Laan
7fd8813675
Merge pull request #4667
...
bbad683 [Qt] simplify return code and return values in txtablemodel (Philip Kaufmann)
21f1516 [Qt] add all used colors in txtablemodel to guiconstants (Philip Kaufmann)
2014-09-18 12:08:46 +02:00
Wladimir J. van der Laan
0db24bf5c3
Merge pull request #4939
...
d547ebf Remove mention of MacPorts from OSX build docs (Wladimir J. van der Laan)
2014-09-18 11:50:28 +02:00
Wladimir J. van der Laan
d547ebf56e
Remove mention of MacPorts from OSX build docs
2014-09-18 10:12:08 +02:00
Wladimir J. van der Laan
c14bfea8ee
Merge pull request #4936
...
c15e483 typo fix of booleamn to boolean (imharrywu)
2014-09-18 09:50:21 +02:00
Wladimir J. van der Laan
e9870c5ed4
Merge pull request #4931
...
93f84d0 cleanup class private and public areas in walletdb (Philip Kaufmann)
22d7e70 prefer const string& over char* in CDB and CWalletDB constructor (Philip Kaufmann)
2014-09-18 09:39:11 +02:00
Wladimir J. van der Laan
438c7e4cd2
Merge pull request #4555
...
6dcfda2 Don't pass nHashType to EvalScript nor CheckSig (jtimon)
2b23a87 Don't pass nHashType to VerifyScript (jtimon)
ce3649fb Remove CScriptCheck::nHashType (was always 0) (jtimon)
358562b Remove unused function main:VerifySignature (jtimon)
2014-09-17 13:44:22 +02:00
Wladimir J. van der Laan
5b9d1e10a8
Merge pull request #4863
...
1a61396 fix missing gettransaction entries in rpcclient (Benedict Chan)
57e1716 update rpc help message for gettransaction to add includeWatchonly param (Benedict Chan)
2014-09-17 13:05:41 +02:00
Wladimir J. van der Laan
69dd8c919a
Merge pull request #4899
...
0be990b Move CTxDestination from script/script to script/standard (Pieter Wuille)
2014-09-17 13:04:54 +02:00
Wladimir J. van der Laan
cf04923618
Merge pull request #4930
...
f4fe205 add nModSize init to default constructor of CTxMemPoolEntry (Philip Kaufmann)
2014-09-16 15:21:24 +02:00
Wladimir J. van der Laan
6fc1dc1a32
Merge pull request #4719
...
52a5f90 Create the common location for all m4 autotool build scripts, build-aux/m4.
2014-09-16 12:00:18 +02:00
Wladimir J. van der Laan
f010344156
Merge pull request #4460
...
604ee2a Remove tx from AlreadyAskedFor list once we receive it, not when we process it. (R E Broadley)
2014-09-16 11:31:54 +02:00
Wladimir J. van der Laan
2d782ab2ce
Merge pull request #4611
...
234bfbf Add init scripts and docs for Upstart and OpenRC (Adam Weiss)
2014-09-16 11:05:38 +02:00
Wladimir J. van der Laan
edb1eebabc
Merge pull request #4853
...
2605b94 [Qt] update form files for setting autoDefault explicitly to false (Philip Kaufmann)
2014-09-16 10:49:47 +02:00
Wladimir J. van der Laan
327dcfece7
Merge pull request #4869
...
6050ab6 netbase: Make SOCKS5 negotiation interruptible (Wladimir J. van der Laan)
2014-09-15 17:25:12 +02:00
Wladimir J. van der Laan
f3d4f1e5a1
Merge pull request #4919
...
21b7add Bugfix: Add missing equals-sign to Travis config (Luke Dashjr)
2014-09-15 10:35:41 +02:00
Wladimir J. van der Laan
c362c57568
Merge pull request #4798
...
d920f7d Move g_signals.SetBestChain(..) below SyncWithWallets (Cozz Lovan)
2014-09-15 10:32:59 +02:00
Wladimir J. van der Laan
e5fc6631b9
Merge pull request #4896
...
07d5287 Catch error when done reading files (Suhas Daftuar)
2014-09-12 19:04:53 +02:00
Wladimir J. van der Laan
3fa1c81b94
Merge pull request #4885
...
aa3c697 Store fewer orphan tx by default, add -maxorphantx option (Gavin Andresen)
c74332c Stricter handling of orphan transactions (Gavin Andresen)
2014-09-11 14:46:27 +02:00
Wladimir J. van der Laan
8040e938c5
Merge pull request #4892
...
e982b57 Use explicit fflush() instead of setvbuf() (Adam Weiss)
2014-09-11 08:56:34 +02:00
Wladimir J. van der Laan
d6af9856b0
Merge pull request #4878
...
540ac45 Avoid returning many "inv" orphans (Jeff Garzik)
d4168c8 Limit CNode::mapAskFor (Wladimir J. van der Laan)
2014-09-10 16:52:57 +02:00
Wladimir J. van der Laan
f23869e14b
Merge pull request #4623
...
e84843c Broken addresses on command line no longer trigger testnet. (Ross Nicoll)
2014-09-10 15:07:58 +02:00
Wladimir J. van der Laan
fd1caa0961
Merge pull request #4755
...
c1e433b Rename scriptutils.o to wallet_ismine.o (jtimon)
8b59a3d Move CAffectedKeysVisitor to wallet.cpp (remove ExtractAffectedKeys) (jtimon)
0d2fa14 Move scriptutils.o to wallet (jtimon)
2014-09-10 12:54:03 +02:00
Wladimir J. van der Laan
6050ab6855
netbase: Make SOCKS5 negotiation interruptible
...
Avoids that SOCKS5 negotiation will hold up the shutdown process.
- Sockets can stay in non-blocking mode, no need to switch it on/off
anymore
- Adds a timeout (20 seconds) on SOCK5 negotiation. This should be
enough for even Tor to get a connection to a hidden service, and
avoids blocking the opencon thread indefinitely on a hanging proxy.
Fixes #2954 .
2014-09-10 11:33:13 +02:00
Wladimir J. van der Laan
6a8d15cc16
Merge pull request #4874
...
21f139b qt: fix tablet crash. closes #4854 . (Cory Fields)
2014-09-10 10:55:40 +02:00
Wladimir J. van der Laan
4e8cc3cb86
Merge pull request #4867
...
a95b119 qt: Remove thousands separators after decimal point (Wladimir J. van der Laan)
2014-09-10 10:28:47 +02:00
Wladimir J. van der Laan
d4168c82be
Limit CNode::mapAskFor
...
Tighten resource constraints on CNode.
2014-09-09 09:19:15 +02:00
Wladimir J. van der Laan
8bc0a0173e
Merge pull request #4873
...
89d91f6 Avoid repeated lookups in mapOrphanTransactions and mapOrphanTransactionsByPrev (Wladimir J. van der Laan)
2014-09-09 09:16:22 +02:00
Wladimir J. van der Laan
89d91f6aa7
Avoid repeated lookups in mapOrphanTransactions and mapOrphanTransactionsByPrev
2014-09-08 17:38:43 +02:00
Wladimir J. van der Laan
f7d0a86bf6
netbase: Use .data() instead of .c_str() on binary string
...
`.c_str()` is only guaranteed to return the data up to the first NUL
character.
2014-09-08 12:20:50 +02:00
Wladimir J. van der Laan
bb4ef1e9dc
Merge pull request #4712
...
80daee0 [Qt] Call checkBalanceChanged() periodically instead for every updated transaction (Cozz Lovan)
2014-09-08 12:00:08 +02:00
Wladimir J. van der Laan
297998808a
Merge pull request #4697
...
da2ede2 [Wallet] Improve ReorderTransactions(..) (Cozz Lovan)
2014-09-08 11:07:00 +02:00
Wladimir J. van der Laan
a95b1199db
qt: Remove thousands separators after decimal point
...
Revert thousands separators after decimal point, as introduced in #4167 .
2014-09-08 10:46:52 +02:00
Wladimir J. van der Laan
1f01b29c6f
Merge pull request #4862
...
45a4baf Add testnet DNS seed of Andreas Schildbach. (Andreas Schildbach)
2014-09-08 09:14:25 +02:00
Wladimir J. van der Laan
6eb427ed6e
Merge pull request #4839
...
346193b Cleanup messy error messages (R E Broadley)
2014-09-06 11:05:50 +02:00
Wladimir J. van der Laan
41ef558aa9
univalue: make spaceStr thread-safe
...
Simply add spaces to the existing string instead of using a
temporary.
Fixes #4756 .
2014-09-05 14:42:22 +02:00
Wladimir J. van der Laan
5e824181c1
Merge pull request #4850
...
1ffb99b [Qt] copyright, style and indentation cleanup of Qt tests (Philip Kaufmann)
2014-09-05 13:35:18 +02:00
Wladimir J. van der Laan
406f18cfc4
Merge pull request #4843
...
81061ff travis: add osx build (Cory Fields)
e4cf9f8 depends: fix typo in source downloading. Regression from c897b1e732 . (Cory Fields)
2014-09-05 12:27:24 +02:00
Wladimir J. van der Laan
b4cd0975fb
Merge pull request #4783
...
fbe0fca [Qt] minor watch-only changes (Philip Kaufmann)
2014-09-04 16:44:39 +02:00
Wladimir J. van der Laan
d800dcc32a
Merge pull request #4762
...
399cdbc contrib/linearize: Add feature to set file's timestamp based on block header time. (Jeff Garzik)
8f5a423 contrib/linearize: split block files based on year-month, not just year (Jeff Garzik)
75400a2 contrib/linearize: Guarantee that output is generated in-order (Jeff Garzik)
2014-09-04 15:20:33 +02:00
Wladimir J. van der Laan
65b529ba93
Merge pull request #4833
...
bbda402 net: Remove MilliSleep from StopNode (Wladimir J. van der Laan)
2014-09-04 13:31:15 +02:00
Wladimir J. van der Laan
f2cc1ee439
Merge pull request #4790
...
9189f5f remove useless millisleep (phantomcircuit)
2014-09-04 13:30:34 +02:00
Wladimir J. van der Laan
b819d8c766
Merge pull request #4842
...
fb51e28 Added XML syntax highlighting (himynameismartin)
2014-09-04 13:21:37 +02:00
Wladimir J. van der Laan
0e66f1ab26
Merge pull request #4671
...
550d4fa Remove DNS Seeds run by entities which were never well-established. (Matt Corallo)
2014-09-03 18:29:35 +02:00
Wladimir J. van der Laan
bbda40226b
net: Remove MilliSleep from StopNode
...
I don't understand why it would be there in the first place. This looks
like voodoo, not programming.
2014-09-03 12:23:34 +02:00
Wladimir J. van der Laan
6ce927cf10
Merge pull request #4810
...
c0f5d4a Fixing Compiler Error C2466 (ENikS)
2014-09-02 10:16:02 +02:00
Wladimir J. van der Laan
f6a8105037
Merge pull request #4779
...
093303a add missing header end comments (Philip Kaufmann)
2014-09-01 15:35:09 +02:00
Wladimir J. van der Laan
107922663b
Merge pull request #4767
...
b144a74 depends: bump miniupnpc to 1.9.20140701. (Cory Fields)
f628127 depends: bump openssl to 1.0.1i (Cory Fields)
9f7f504 build: add -DMINIUPNP_STATICLIB for new version (Cory Fields)
2014-09-01 10:28:33 +02:00
Wladimir J. van der Laan
01113f7b43
Merge pull request #4780
...
4d04492 add missing copyright headers (Philip Kaufmann)
2014-09-01 10:26:48 +02:00
Wladimir J. van der Laan
2c995de4cd
Merge pull request #4776
...
6f5d33b Update translations after update script improvements (Wladimir J. van der Laan)
da59f28 Add deeper XML checking to update-translation script (Wladimir J. van der Laan)
2014-09-01 10:19:13 +02:00
Wladimir J. van der Laan
6f5d33b3d2
Update translations after update script improvements
2014-09-01 10:10:21 +02:00
Wladimir J. van der Laan
da59f28335
Add deeper XML checking to update-translation script
...
- Catch problems such as mismatched formatting characters. Remove
messages that can give problems at runtime.
- Also remove unfinished/untranslated messages, they just take up space
in the ts and waste parsing time.
Fixes #4774 .
2014-09-01 10:06:15 +02:00
Wladimir J. van der Laan
93f97aab62
Merge pull request #4768
...
2e28031 Perform CVerifyDB on pcoinsdbview instead of pcoinsTip (Wladimir J. van der Laan)
2014-09-01 09:42:10 +02:00
Wladimir J. van der Laan
ce223e7b7d
Merge pull request #4789
...
bac5586 Replace weird characters by normal spaces (Pieter Wuille)
2014-08-30 05:58:33 +02:00
Wladimir J. van der Laan
0101483f46
Move CMerkleTx to wallet.cpp/h
...
It is only used by the wallet so it has no place in main.
2014-08-29 17:26:01 +02:00
Wladimir J. van der Laan
57153d4e1a
rpc: Compute number of confirmations of a block from block height
...
Currently this uses a CMerkleTx, but that makes no sense as we
have the CBlockIndex available. As noted by @jgarzik.
2014-08-29 17:25:23 +02:00
Wladimir J. van der Laan
539abc4729
build: Remove message about Ubuntu 13.10 when no boost sleep implementation found
...
It's only confusing people into thinking that they should mess with
boost versions, which should not be necessary to get bitcoind to work.
If there is a bug in the build system with autodetecting boost it needs
to be solved not worked around.
2014-08-29 13:02:23 +02:00
Wladimir J. van der Laan
faeb341da3
Merge pull request #4777
...
8bdd287 Fix a few "Uninitialized scalar field" warnings (Wladimir J. van der Laan)
2014-08-29 10:53:47 +02:00
Wladimir J. van der Laan
3ed668dbe2
Merge pull request #4772
...
87d9819 fix comments ExtractAddress() -> ExtractDestination() (jtimon)
2014-08-28 18:14:03 +02:00
Wladimir J. van der Laan
b986924ac0
Merge pull request #4766
...
5a0823a Add travis build:passing/failing indicator. (randy-waterhouse)
2014-08-28 18:12:57 +02:00
Wladimir J. van der Laan
8bdd2877c4
Fix a few "Uninitialized scalar field" warnings
...
Fix a few warnings reported by Coverity.
None of these is critical, but making sure that class fields are
initialized can avoid heisenbugs.
2014-08-28 15:30:50 +02:00
Wladimir J. van der Laan
d2d6f708e4
Fix build with DEBUG_LOCKORDER
...
Fixes #4771
2014-08-28 01:52:22 +02:00
Wladimir J. van der Laan
70352e11c0
Revert "Add a getutxos command to the p2p protocol. It allows querying of the UTXO set"
...
This reverts commit da2ec100f3 .
2014-08-27 18:04:29 +02:00
Wladimir J. van der Laan
fd452c254f
Merge pull request #4752
...
df7565d depends: add sensible download timeout/retry values (Cory Fields)
c897b1e depends: add a fallback path in case package sources go missing (Cory Fields)
2014-08-27 10:21:45 +02:00
Wladimir J. van der Laan
2e280311b8
Perform CVerifyDB on pcoinsdbview instead of pcoinsTip
...
Bypassing the main coins cache allows more thorough checking with the same
memory budget.
This has no effect on performance because everything ends up in the child
cache created by VerifyDB itself.
It has bugged me ever since #4675 , which effectively reduced the
number of checked blocks to reduce peak memory usage.
- Pass the coinsview to use as argument to VerifyDB
- This also avoids that the first `pcoinsTip->Flush()` after VerifyDB
writes a large slew of unchanged coin records back to the database.
2014-08-27 09:20:33 +02:00
Wladimir J. van der Laan
f30801afbd
qt: Add null check in setClientModel(0)
...
Don't clear tray icon menu if it was never created.
Necessary precaution after #4649 .
2014-08-26 17:59:57 +02:00
Wladimir J. van der Laan
d49b0876a4
Merge pull request #4673
...
1c5f0af [Qt] Add column Watch-only to transactions list (Cozz Lovan)
939ed97 Add boolean HaveWatchonly and signal NotifyWatchonlyChanged (Cozz Lovan)
2014-08-26 17:41:33 +02:00
Wladimir J. van der Laan
b9bd6282c5
Merge pull request #4649
...
b197bf3 [Qt] disable tray interactions when client model set to 0 (Philip Kaufmann)
314fbd9 [Qt] use BitcoinGUI::DEFAULT_WALLET constant in bitcoin.cpp (Philip Kaufmann)
8ca6a16 [Qt] ensure all class attributes are init to 0 (Philip Kaufmann)
2014-08-26 17:39:16 +02:00
Wladimir J. van der Laan
ad49c256c3
Split up util.cpp/h
...
Split up util.cpp/h into:
- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)
The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).
Breaks dependency of sha256.cpp on all the things pulled in by util.
2014-08-26 13:25:22 +02:00
Wladimir J. van der Laan
f841aa2892
Move COIN and CENT to core.h
...
Eventually these should end up in `money.h` after monetary
amounts are typedef'ed, but at least they don't belong in `util.h`.
2014-08-26 13:25:22 +02:00
Wladimir J. van der Laan
6e5fd003e0
Move *Version() functions to version.h/cpp
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
b4aa769bcb
Move S_I* constants and MSG_NOSIGNAL to compat.h
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
af8297c010
Move functions in wallet.h to implementation file
...
Breaks compile-time dependency of wallet.h on util.
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
651480c8e4
move functions in main and net to implementation files
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
610a8c0759
Move SetThreadPriority implementation to util.cpp instead of the header
...
Put the THREAD_* and PRIO_ constants in compat.h.
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
f780e65ac6
Remove unused function ByteReverse from util.h
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
121d6ad9db
Remove unused alignup function from util.h
2014-08-26 13:25:21 +02:00
Wladimir J. van der Laan
d1e26d4e71
Move CMedianFilter to timedata.cpp
...
Now that we no longer use the median filter to keep track of
the number of blocks of peers, that's the only place it is used.
2014-08-26 13:25:20 +02:00
Wladimir J. van der Laan
0d763fc9e1
Merge pull request #4749
...
425c7a8 travis: add doc (Cory Fields)
9380d01 travis: initial descriptor (Cory Fields)
386efb7 build: work around ccache/autotools warning-spamming bug (Cory Fields)
2014-08-26 08:45:48 +02:00
Wladimir J. van der Laan
49f954f154
Merge pull request #4716
...
0d27dad Clean-up SyncWithWallets/SyncTransaction (Cozz Lovan)
2014-08-25 15:04:28 +02:00
Wladimir J. van der Laan
26f3a05cf1
Merge pull request #4654
...
c4a7709 Fixes ignored qt 4.8 codecs path on windows when configuring with --with-qt-libdir (ntrgn)
2014-08-25 13:44:41 +02:00
Wladimir J. van der Laan
11270ebde4
Merge pull request #4351
...
da2ec10 Add a getutxos command to the p2p protocol. It allows querying of the UTXO set given a set of outpoints. (Mike Hearn)
2014-08-25 10:37:40 +02:00
Wladimir J. van der Laan
92b3d3630d
Merge pull request #4718
...
88fe88c gui: remove redundant numTransactions tracking (Wladimir J. van der Laan)
2014-08-23 09:30:47 +02:00
Wladimir J. van der Laan
0a670bf5d7
Merge pull request #4753
...
df920c6 Build-osx: Force Fix. (Dominyk Tiller)
5a61553 Build-osx: Force Fix. (Dominyk Tiller)
2014-08-23 09:01:33 +02:00
Wladimir J. van der Laan
0b00bd3792
Merge pull request #4736
...
5d9f22b Remove link to now removed Windows Build Notes (Michael Ford)
2014-08-22 11:30:28 +02:00
Wladimir J. van der Laan
752f2b36c8
Merge pull request #4740
...
b1ed7c2 Update build-osx.md (Rose Toomey)
2014-08-21 18:26:46 +02:00
Wladimir J. van der Laan
93ed3d9b4e
Merge pull request #4735
...
3802224 Remove all other print() methods (Wladimir J. van der Laan)
9b6d4c5 Move strprintf define to tinyformat.h (Wladimir J. van der Laan)
8121258 Remove print() from core functions (Wladimir J. van der Laan)
2014-08-21 16:05:47 +02:00
Wladimir J. van der Laan
56953925db
Merge pull request #4706
...
8695a39 replace int with size_t in stream methods (Kamil Domanski)
2014-08-21 08:51:19 +02:00
Wladimir J. van der Laan
2fb886bffb
Merge pull request #4731
...
c53b1ec Fix github-merge with git version 2.1.0 (Gavin Andresen)
2014-08-21 05:48:26 +02:00
Wladimir J. van der Laan
27bc786641
Merge pull request #4739
...
de1f051 Added protobuf-compiler library to the Qt 5 Dependencies (elichai)
2014-08-21 05:20:46 +02:00