Wladimir J. van der Laan
345cb52e8b
Merge pull request #4297
...
b917555#4296 (Ashley Holman)
2014-06-06 10:13:48 +02:00
Ashley Holman
b917555b04
qt: PeerTableModel: Fix potential deadlock. #4296
2014-06-06 16:59:15 +09:30
Cory Fields
efe6888407
build: fix version dependency
2014-06-05 16:05:57 -04:00
Cory Fields
f4d81129f0
build: quit abusing AM_CPPFLAGS
...
Now that the build is non-recursive, adding to AM_CPPFLAGS means adding to
_all_ cppflags.
Logical groups of includes have been added instead, and are used individually
by various targets.
2014-06-05 16:05:57 -04:00
Cory Fields
56c157d5e0
build: avoid the use of top_ and abs_ dir paths
...
Using them has the side effect of confusing the dependency-tracking logic.
2014-06-05 16:05:57 -04:00
Cory Fields
70c71c50ce
build: Tidy up file generation output
...
- Some file generation was still noisy, silence it.
- AM_V_GEN is used rather than @ so that 'make V=1' works as intended
- Cut down on file copies and moves when using sed, use pipes instead
- Avoid the use of top_ and abs_ dirs where possible
2014-06-05 16:05:57 -04:00
Cory Fields
6b9f0d5554
build: nuke Makefile.include from orbit
...
Rules and targets no longer need to be shared between subdirectories, so
this is no longer needed.
2014-06-05 16:05:57 -04:00
Cory Fields
8b09ef7b63
build: add stub makefiles for easier subdir builds
2014-06-05 16:05:43 -04:00
Cory Fields
be4e9aeb14
build: delete old Makefile.am's
2014-06-05 16:05:42 -04:00
Cory Fields
65e8ba4dbe
build: Switch to non-recursive make
...
Build logic moves from individual Makefile.am's to include files, which
the main src/Makefile.am includes. This avoids having to manage a gigantic
single Makefile.
TODO: Move the rules from the old Makefile.include to where they actually
belong and nuke the old file.
2014-06-05 16:05:17 -04:00
Wladimir J. van der Laan
7d4dda7630
Remove global strWalletFile
...
As it says on the tin. There is no need to have this variable be
global, it's only used in AppInit2.
2014-06-05 14:52:34 +02:00
Wladimir J. van der Laan
a92aded70e
Fix GUI build with --disable-wallet
...
fe6bff265f78a1
2014-06-05 07:00:16 +02:00
Wladimir J. van der Laan
d900ab9e66
Merge pull request #4291
...
fe6bff2
2014-06-05 06:29:11 +02:00
Gavin Andresen
4fee61a905
Merge pull request #4287 from laanwj/2014_06_sideeffect
...
Remove side effect in assertion in ProcessGetData
2014-06-04 20:15:45 -04:00
Philip Kaufmann
fe6bff2eae
[Qt] add BerkeleyDB version info to RPCConsole
...
- to match info function between debug.log and RPCConsole
2014-06-04 22:00:59 +02:00
Philip Kaufmann
5bd02cf715
log used config file to debug.log on startup
2014-06-04 21:19:22 +02:00
Jeff Garzik
b8ac6cdf53
Merge pull request #4282 from jgarzik/fix-wallet-init
...
CWallet: fix nTimeFirstKey init, by making constructor init common code
2014-06-04 15:00:58 -04:00
Jeff Garzik
c79897af31
Merge pull request #4247 from Diapolo/listen
...
rename fNoListen to fListen and move to net
2014-06-04 15:00:38 -04:00
Wladimir J. van der Laan
f0f4904bec
Merge pull request #4258
...
7b45d94fixes #4253 ) (shshshsh)
2014-06-04 19:30:44 +02:00
Wladimir J. van der Laan
d24310d23a
Merge pull request #4260
...
aab2c0f
2014-06-04 19:27:03 +02:00
Wladimir J. van der Laan
4a48a0671d
Remove side effect in assertion in ProcessGetData
...
A side-effect was introduced into an assertion in 7a0e84d
2014-06-04 16:02:04 +02:00
jtimon
f0a83fc256
Use Params().NetworkID() instead of TestNet() from the payment protocol
2014-06-04 15:33:11 +02:00
shshshsh
7b45d943b2
Make max number of orphan blocks kept in memory a startup parameter ( fixes #4253 )
2014-06-04 11:58:18 +00:00
jtimon
2871889e83
net.h was using std namespace through chainparams.h included in protocol.h
2014-06-04 13:29:36 +02:00
jtimon
c8c52de3a0
Replace virtual methods with static attributes, chainparams.h depends on
...
protocol.h instead of the other way around
2014-06-04 13:29:36 +02:00
jtimon
a3d946ebdc
Get rid of TestNet()
2014-06-04 13:29:36 +02:00
jtimon
6fc0fa63d9
Add RPCisTestNet chain parameter
2014-06-04 13:29:36 +02:00
jtimon
cfeb8235fd
Add RequireStandard chain parameter
2014-06-04 13:29:36 +02:00
jtimon
21913a9ac9
Add AllowMinDifficultyBlocks chain parameter
2014-06-04 13:29:36 +02:00
jtimon
d754f34e8d
Move majority constants to chainparams
2014-06-04 13:29:36 +02:00
jtimon
8d26721498
Get rid of RegTest()
2014-06-04 13:29:35 +02:00
jtimon
cb9bd83bba
Add DefaultCheckMemPool chain parameter
2014-06-04 13:29:35 +02:00
jtimon
2595b9ac23
Add DefaultMinerThreads chain parameter
2014-06-04 13:29:35 +02:00
jtimon
bfa9a1a638
Add MineBlocksOnDemand chain parameter
2014-06-04 13:29:35 +02:00
jtimon
1712adbe0b
Add MiningRequiresPeers chain parameter
2014-06-04 13:29:35 +02:00
Kosta Zertsekel
71aaff393f
Remove double-dash parameters from mapArgs
...
Should be merged after pull request #4281
("Add `-version` option to get just the version #4281 "),
because is changed "--help" to "-help".
Checked that grep of 'mapArgs.count("--' returned only
three places that are fixed by pull request #4281 .
2014-06-04 11:27:15 +03:00
Wladimir J. van der Laan
358a61ee06
Merge pull request #4223
...
06a91d9
2014-06-04 09:14:51 +02:00
Andrew Poelstra
4a09e1df51
key.cpp: fail with a friendlier message on missing ssl EC support
...
Previously if bitcoind is linked with an OpenSSL which is compiled
without EC support, this is seen as an assertion failure "pKey !=
NULL" at key.cpp:134, which occurs after several seconds. It is an
esoteric piece of knowledge to interpret this as "oops, I linked
with the wrong OpenSSL", and because of the delay it may not even
be noticed.
The new output is
: OpenSSL appears to lack support for elliptic curve cryptography. For
more information, visit
https://en.bitcoin.it/wiki/OpenSSL_and_EC_Libraries
: Initialization sanity check failed. Bitcoin Core is shutting down.
which occurs immediately after attempted startup.
This also blocks in an InitSanityCheck() function which currently only
checks for EC support but should eventually do more. See #4081 .
2014-06-03 12:09:51 -07:00
Jeff Garzik
d04fd3e2af
CWallet: fix nTimeFirstKey init, by making constructor init common code
...
Don't repeat yourself etc.
2014-06-03 12:55:33 -04:00
Cozz Lovan
06a91d9698
VerifyDB progress
2014-06-03 15:21:47 +02:00
Philip Kaufmann
bbe1925ce3
[Qt] style police and small addition in rpcconsole
...
- fix spaces, indentation and coding style glitches
2014-06-03 15:01:50 +02:00
Wladimir J. van der Laan
4c097f9669
Merge pull request #4225
...
65f78a1#4133 (Ashley Holman)
2014-06-03 11:13:51 +02:00
Ashley Holman
65f78a111f
Qt: Add GUI view of peer information. #4133
2014-06-03 17:37:34 +09:30
tm314159
91855f279d
Properly initialize CWallet::nTimeFirstKey
2014-06-02 11:32:33 -07:00
Wladimir J. van der Laan
73b072252b
Merge pull request #3837
...
75ebced
2014-06-02 18:00:37 +02:00
Wladimir J. van der Laan
52d7a54434
Merge pull request #3683
...
bdc83e8
2014-06-02 17:59:20 +02:00
Wladimir J. van der Laan
51615e1693
Merge pull request #4213
...
516053c
2014-06-02 15:21:42 +02:00
Wladimir J. van der Laan
be7d0adcdb
Merge pull request #4238
...
b90711c
2014-06-02 15:12:12 +02:00
Wladimir J. van der Laan
42d87749eb
Merge pull request #4261
...
09a54a6
2014-06-02 14:25:09 +02:00
Wladimir J. van der Laan
ead1f65256
Merge pull request #4268
...
223a6f7
2014-06-02 10:54:20 +02:00
