These changes make it possible to build bitcoind as a node only. If built with --disable-wallet, there is no dependency on BDB.
The commits should be self-explanatory.
No functional changes: only code movements, build system changes and added #ifdefs.
(Depends on #3320)
52 | - sync.cpp txdb.cpp txmempool.cpp util.cpp version.cpp wallet.cpp walletdb.cpp $(JSON_H) \ 53 | + chainparams.cpp \ 54 | + checkpoints.cpp \ 55 | + coins.cpp \ 56 | + init.cpp \ 57 | + keystore.cpp \
Do you need keystore and crypter without wallet?
Yes, at least if we want signrawtransaction, which creates a local keystore. In turn, this depends on crypter.
You could move CCryptoKeyStore to crypter to break the dependency of rawtransaction on crypter.
Ok, good point, done
1511 | @@ -1511,3 +1512,132 @@ void RenameThread(const char* name) 1512 | (void)name; 1513 | #endif 1514 | } 1515 | +
I don't think this really belongs in util; why can't it stay in init? Alternatively, some common.cpp or so?
It can't stay in init because bitcoin-cli uses the function, and putting init.cpp in libbitcoin_common would not make sense as it's really part of the server (and would pull in a lot of other stuff...).
I'm fine with a common.cpp, but didn't want to create a new file for one function. Maybe some other things from util.cpp could be moved there as well.
Also: after dropping the -cli functionality from bitcoind, which will happen eventually but not yet, we can stop pretending this is common functionality and simply copy the function (as few options will apply to both)
I have a possible solution for this too: split up the help function and put a part in rpcclient.cpp and a part in init.cpp. Bitcoind can call both for now to get all the options.
That reminds me, there are some wallet-specific options as well. We don't want to show them in --disable-wallet builds.
Didn't test, but I really like this!
I have tested this patch.
--disable-wallet set.--disable-wallet unset.disablewallet=0 and --disable-wallet causes no failure, the wallet remains disabled while No wallet compiled in! is printed to the debug log.
General functions used throughout the RPC framework
don't belong in rpcwallet.
Where to place `getinfo` is a difficult issue
as it shows information from the wallet, net and
block chain. However, I moved it out of rpcwallet
as the command needs also to be available without
wallet.
Delimit all code that uses the wallet functions
in implementation files that conditionally use the wallet.
This was a leftover from the times in which
peers.dat depended in BDB.
Other functions in db.cpp still depend on BerkelyDB,
to be able to compile without BDB this (small)
functionality needs to be moved to another file.
Make it possible to build Bitcoin without wallet
(and thus without BDB) so that it only functions as node.
Mention the new --disable-wallet mode.
Also, correct the BDB entry in the dependencies table.
This breaks the dependency on crypter for disable-wallet builds.
Split wallet tests from other RPC tests.
Now no #ifdef ENABLE_WALLET are needed anymore in either file.
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/5094f8d46fe3a0f0bcee913d6f1586dcef35749e for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
ACK, seems to work fine.