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

Merge 16a6174613 into merged_master (Bitcoin PR bitcoin/bitcoin#29904)

Browse source
This commit is contained in:
ivanlele 2026-02-18 16:43:54 +00:00
commit 9bf3ef6967
No known key found for this signature in database
13 changed files with 110 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bitcoin-cli.cpp
View file

@ -11,7 +11,6 @@
#include <clientversion.h>
#include <common/args.h>
#include <common/system.h>
#include <common/url.h>
#include <compat/compat.h>
#include <compat/stdin.h>
#include <policy/feerate.h>
@ -51,7 +50,6 @@
using CliClock = std::chrono::system_clock;
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
UrlDecodeFn* const URL_DECODE = urlDecode;
static const char DEFAULT_RPCCONNECT[] = "127.0.0.1";
static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900;