Jimmy Kiselak
e08d765f11
Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge
...
Conflicts:
Makefile.am
README.md
configure.ac
contrib/seeds/nodes_main.txt
qa/rpc-tests/decodescript.py
qa/rpc-tests/test_framework/util.py
src/Makefile.am
src/Makefile.qt.include
src/Makefile.qttest.include
src/Makefile.test.include
src/bitcoin-cli-res.rc
src/bitcoin-cli.cpp
src/bitcoin-tx.cpp
src/bitcoind.cpp
src/chainparams.cpp
src/chainparamsseeds.h
src/init.cpp
src/main.cpp
src/main.h
src/miner.cpp
src/net.cpp
src/primitives/block.cpp
src/rpc/mining.cpp
src/rpc/rawtransaction.cpp
src/rpc/server.cpp
src/rpcserver.h
src/script/interpreter.cpp
src/script/script.cpp
src/script/script.h
src/test/alert_tests.cpp
src/test/data/alertTests.raw
src/test/data/script_invalid.json
src/test/data/script_valid.json
src/test/data/tx_invalid.json
src/test/data/tx_valid.json
src/test/miner_tests.cpp
src/test/script_tests.cpp
src/test/test_bitcoin.cpp
src/test/test_bitcoin.h
src/test/transaction_tests.cpp
src/timedata.cpp
src/util.cpp
src/wallet/rpcwallet.cpp
src/wallet/wallet.cpp
src/wallet/wallet.h
2016-05-15 22:16:56 -04:00
MarcoFalke
fa24439ff3
Bump copyright headers to 2015
2015-12-13 18:08:39 +01:00
Jorge Timón
fad0088e75
TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams
2015-12-02 15:18:23 +01:00
Luke Dashjr
02354c93be
Constrain rpcport default values to a single location in code
2015-12-01 10:18:18 +00:00
Jimmy Kiselak
f976d965c7
merge upstream changes, set up testnet and regtestnet
2015-10-21 22:30:56 -04:00
Jorge Timón
55a89751fa
Chainparams: Translations: DRY: options and error strings
...
Also remove SelectBaseParamsFromCommandLine and SelectParamsFromCommandLine
2015-10-20 14:28:43 +02:00
Jorge Timón
f3525e24e3
Chainparams: Replace CBaseChainParams::Network enum with string constants (suggested by Wladimir)
2015-10-20 14:22:44 +02:00
Jimmy Kiselak
eb25177f5e
do some rebranding and change default ports
2015-09-24 01:15:28 -04:00
Jorge Timón
c4973aaaf6
Chainparams: CTestNetParams and CRegTestParams extend directly from CChainParams
...
...instead of CMainParams and CTestNetParams respectively
Do the same for CBaseChainParams.
The inheritance was only reducing readibility in this case
2015-07-12 11:13:47 +02:00
Wladimir J. van der Laan
59bd89f116
test: Remove UNITTEST params
...
UNITTEST parameter are not used by any current tests, and the model
(modifyable parameters) is inconvenient when unit-testing. As
they are stored in a global structure eevery test
would have to (re)set up its own parameters.
For consistency it is also better to test with MAIN parameters.
2015-03-09 16:06:14 +01:00
Wladimir J. van der Laan
729ba31749
Merge pull request #5513
...
856e8629b1ab86a324199
2015-01-06 20:32:45 +01:00
Wladimir J. van der Laan
de70dd4904
Merge pull request #5598
...
eb0d34b
2015-01-06 18:12:58 +01:00
Cory Fields
856e862f4a
namespace: drop most boost namespaces and a few header cleanups
...
A few boost::asio were left around because they're very wordy otherwise.
2015-01-02 15:12:03 -05:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
...
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
jtimon
eb0d34b494
Remove unused chainparam networkID
2014-12-11 23:32:30 +01:00
Michael Ford
f2e03ffae9
Update comments in chainparams to be doxygen compatible
2014-10-25 17:24:16 +08:00
Wladimir J. van der Laan
494ff05a4c
Merge pull request #4804 from jtimon/chainparams3
...
Remove CBaseChainParams::NetworkID()
2014-10-17 08:47:11 +02:00
jtimon
ca3ce0fa03
squashme on 3fdb9e8c (Bluematt's bikeshedding)
2014-10-16 22:49:33 +02:00
jtimon
b796cb084b
SQUASHME: NetworkIdFromCommandLine() function instead of method
2014-10-10 12:05:20 +02:00
SergioDemianLerner
f0fd00cb77
Switch testing framework from MAIN to new UNITTEST network
...
UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
2014-10-02 13:51:39 +02:00
Wladimir J. van der Laan
8d132431b4
Revert merge of pull #4845
...
It breaks the new mingw tests!
See
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582
This reverts commit 47059027775e2e7fcb99a25fd6be13
2014-10-02 10:39:55 +02:00
SergioDemianLerner
a25fd6be13
Switch testing framework from MAIN to new UNITTEST network
...
UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
2014-09-29 13:03:22 +02:00
jtimon
3fdb9e8c15
Remove CBaseChainParams::NetworkID()
2014-09-21 21:25:15 +02:00
Pieter Wuille
20e01b1a03
Apply clang-format on some infrequently-updated files
2014-09-19 19:21:46 +02:00
Philip Kaufmann
187115c01d
cleanup include of assert.h
2014-08-28 23:02:49 +02:00
Wladimir J. van der Laan
96ff9d6403
Can't log to debug log before chain params initialized
...
Add a function `AreBaseParamsConfigured` and use this to check
before writing to the debug log. This avoids assertions when the
application happens to log too early, which happens in the GUI.
Messages logged before the base parameters are configured can be
shown using `-printtoconsole`.
2014-07-15 10:26:44 +02:00
Wladimir J. van der Laan
84ce18ca93
Remove unnecessary dependencies for bitcoin-cli
...
This commit removes all the unnecessary dependencies (key, core,
netbase, sync, ...) from bitcoin-cli.
To do this it shards the chain parameters into BaseParams, which
contains just the RPC port and data directory (as used by utils and
bitcoin-cli) and Params, with the rest.
2014-06-25 10:31:35 +02:00
