This contains most of the changes of #10563 “remove safe mode” by @achow101, but doesn’t remove the safe mode yet, but put an ObserveSafeMode() check in (all 23) individual calls which used to have okSafeMode=false.
This cleans up the ugly “okSafeMode” flag from the dispatch tables, which is not a concern for the RPC server.
Extra-author: Wladimir J. van der Laan laanwj@gmail.com
36 #include <univalue.h>
37
38+void ObserveSafeMode()
39+{
40+ std::string strWarning = GetWarnings("rpc");
41+ if (strWarning != "" && !gArgs.GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE))
{.
strWarning to warning? 🙏
33
34 #include <stdint.h>
35
36 #include <univalue.h>
37
38+void ObserveSafeMode()
rpc/server.{cpp,h}?
server.cpp|h, the whole point here is that the concern of safemode is independent from the RPC server and is a bitcoin-specific concern.
help command where before OnRPCPreCommand prevented it?
Didn’t test, but with this change it is possible run help command where before OnRPCPreCommand prevented it?
Yes, that should be possible, I put the checks after the help check everywhere.
rpc/rawtransaction.h, utACK f9ec0b5.
ObserveSafeMode implementation and definition should only be in the wallet RPCs in (wallet/rpcwallet.{cpp/h}) since that is really the only place that safe mode is actually observed. For signrawtransaction, maybe make it only do safe mode when wallet is enabled?
Concept ACK. I think the ObserveSafeMode implementation and definition should only be in the wallet RPCs in (wallet/rpcwallet.{cpp/h}) since that is really the only place that safe mode is actually observed
Fine with me, although that’d no longer make this a pure refactor. I carefully preserved the current set of safe-mode-enforced calls for that reason, even though it seemed a bit silly to me at times.
For signrawtransaction, maybe make it only do safe mode when wallet is enabled?
If the implementation is used by even one call in rpctransaction.cpp, even if conditional on ENABLE_WALLET, it needs to be defined there. This is to avoid library linking circularity: libbitcoin_server cannot* depend on anything defined in the libbitcoin_wallet library.
So if people agree on that I’m fine with adding a commit “Observe safe mode only for wallet RPCs” which moves ObserveSafeMode and everything related to the wallet, and removes it from the rawtransaction calls. If that creates any kind of disagreement, though, I’d suggest that that is addressed in a later PR.
*: this is being violated in some places and some linkers are kind enough to accommodate this (#7965), but I will not make it worse
rpc/safe.h instead?
src/rpc/safemode.(h|cpp).
f9ec0b5 → a3ecc1e
0@@ -0,0 +1,13 @@
1+#include "safemode.h"
2+
3+#include "rpc/protocol.h"
4+#include "util.h"
5+#include "warnings.h"
6+
7+void ObserveSafeMode()
8+{
9+ std::string strWarning = GetWarnings("rpc");
std::string warning =
5+#include "warnings.h"
6+
7+void ObserveSafeMode()
8+{
9+ std::string strWarning = GetWarnings("rpc");
10+ if (strWarning != "" && !gArgs.GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE))
7+
8+static const bool DEFAULT_DISABLE_SAFEMODE = true;
9+
10+void ObserveSafeMode();
11+
12+#endif // BITCOIN_RPC_SAFEMODE_H
This contains most of the changes of 10563 "remove safe mode", but doesn't
remove the safe mode yet, but put an `ObserveSafeMode()` check in
individual calls with okSafeMode=false.
This cleans up the ugly "okSafeMode" flag from the dispatch tables,
which is not a concern for the RPC server.
Extra-author: Wladimir J. van der Laan <laanwj@gmail.com>
utACK ec6902d0ea2bbe75179684fc71849d5e34647a14
If the implementation is used by even one call in
rpctransaction.cpp, even if conditional on ENABLE_WALLET, it needs to be defined there. This is to avoid library linking circularity: libbitcoin_server cannot* depend on anything defined in the libbitcoin_wallet library.
Ugh circular linking. Lets not do that then.
