GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 712cab3a8f into merged_master (Bitcoin PR bitcoin/bitcoin#31061)

Browse source
This commit is contained in:
Tom Trevethan 2026-04-10 00:12:04 +01:00
commit c5cac8efa2
24 changed files with 125 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/mainchainrpc.cpp
View file

@ -103,8 +103,8 @@ UniValue CallMainChainRPC(const std::string& strMethod, const UniValue& params)
// Try fall back to cookie-based authentication if no password is provided
if (!GetMainchainAuthCookie(&strRPCUserColonPass)) {
throw std::runtime_error(strprintf(
_("Could not locate mainchain RPC credentials. No authentication cookie could be found, and no mainchainrpcpassword is set in the configuration file (%s)").translated,
gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME).c_str()));
_("Could not locate mainchain RPC credentials. No authentication cookie could be found, and no mainchainrpcpassword is set in the configuration file (%s)"),
gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME).c_str()).translated);
}
} else {
strRPCUserColonPass = gArgs.GetArg("-mainchainrpcuser", "") + ":" + gArgs.GetArg("-mainchainrpcpassword", "");