Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491)

This commit is contained in:
Byron Hambly 2025-05-23 13:02:22 +02:00
commit cbd7b123d9
93 changed files with 546 additions and 303 deletions

View file

@ -138,7 +138,7 @@ static fs::path GetMainchainAuthCookieFile()
{
std::string cookie_file = MAINCHAIN_COOKIEAUTH_FILE;
// Bitcoin mainnet exception
if (gArgs.GetChainName() == "liquidv1") {
if (gArgs.GetChainTypeMeta().chain_type == ChainType::LIQUID1) {
cookie_file = ".cookie";
}
fs::path cookie_path = fs::PathFromString(gArgs.GetArg("-mainchainrpccookiefile", cookie_file));