Skip to content

merge bitcoin 15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports #4708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 16 commits into from
Mar 15, 2022
Merged

merge bitcoin 15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports #4708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eda7bb0
partial bitcoin#16240: JSONRPCRequest-aware RPCHelpMan
kwvg Feb 27, 2022
cd42b00
rpc: adapt Dash-specific help messages to JSONRPCRequest-aware RPCHel…
kwvg Feb 27, 2022
61b96f7
merge bitcoin#15746: Always name dictionary keys
kwvg Apr 4, 2019
62cbb81
merge bitcoin#17192: Add CHECK_NONFATAL and use it in src/rpc
kwvg Feb 27, 2022
e1dd37c
merge bitcoin#18098: Add missing spaces in RPCResult, Normalize type …
kwvg Feb 27, 2022
14585f3
partial bitcoin#17809: Auto-format RPCResult
kwvg Dec 25, 2019
c014b7d
rpc: restore legacy RPCResult support
kwvg Mar 4, 2022
a2917af
rpc: Import conflict-free RPCResult formatting from fa6b061fc118995ee…
kwvg Jan 9, 2020
792b73c
merge bitcoin#18444: Remove final comma for last entry of fixed-size …
kwvg Mar 26, 2020
a9e82ad
merge bitcoin#19100: Combine GetWalletForJSONRPCRequest and EnsureWal…
kwvg May 28, 2020
e5bea93
rpc: Refactor code to no longer use removed EnsureWalletIsAvailable
kwvg Feb 27, 2022
9cadff8
merge bitcoin#17318: replace asserts in RPC code with CHECK_NONFATAL …
kwvg Feb 27, 2022
f1eea61
merge bitcoin#18607: Fix named arguments in documentation
kwvg Mar 1, 2022
3ac0b5c
merge bitcoin#19386: Assert that RPCArg names are equal to CRPCComman…
kwvg Apr 17, 2020
1215535
rpc: unconditionally print HelpRequiringPassphrase reminder
kwvg Feb 27, 2022
7573b12
merge bitcoin#19250: Make RPC help compile-time static
kwvg Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ BITCOIN_CORE_H = \
rpc/client.h \
rpc/mining.h \
rpc/protocol.h \
rpc/server.h \
rpc/rawtransaction_util.h \
rpc/register.h \
rpc/request.h \
rpc/server.h \
rpc/util.h \
saltedhasher.h \
scheduler.h \
Expand Down Expand Up @@ -292,6 +293,7 @@ BITCOIN_CORE_H = \
unordered_lru_cache.h \
util/bip32.h \
util/bytevectorhash.h \
util/check.h \
util/error.h \
util/fees.h \
util/spanparsing.h \
Expand Down Expand Up @@ -678,7 +680,7 @@ libdash_util_a_SOURCES = \
interfaces/handler.cpp \
logging.cpp \
random.cpp \
rpc/protocol.cpp \
rpc/request.cpp \
stacktraces.cpp \
support/cleanse.cpp \
sync.cpp \
Expand Down
1 change: 1 addition & 0 deletions src/dash-cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <clientversion.h>
#include <rpc/client.h>
#include <rpc/protocol.h>
#include <rpc/request.h>
#include <stacktraces.h>
#include <util/system.h>
#include <util/strencodings.h>
Expand Down
1 change: 1 addition & 0 deletions src/rest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <primitives/block.h>
#include <primitives/transaction.h>
#include <rpc/blockchain.h>
#include <rpc/protocol.h>
#include <rpc/server.h>
#include <streams.h>
#include <sync.h>
Expand Down
306 changes: 150 additions & 156 deletions src/rpc/blockchain.cpp
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 26 additions & 27 deletions src/rpc/coinjoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
#ifdef ENABLE_WALLET
static UniValue coinjoin(const JSONRPCRequest& request)
{
std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
return NullUniValue;

if (request.fHelp || request.params.size() != 1)
throw std::runtime_error(
RPCHelpMan{"coinjoin",
Expand All @@ -37,6 +32,10 @@ static UniValue coinjoin(const JSONRPCRequest& request)
RPCExamples{""},
}.ToString());

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
if (!wallet) return NullUniValue;
CWallet* const pwallet = wallet.get();

if (fMasternodeMode)
throw JSONRPCError(RPC_INTERNAL_ERROR, "Client-side mixing is not supported on masternodes");

Expand Down Expand Up @@ -103,36 +102,36 @@ static UniValue getcoinjoininfo(const JSONRPCRequest& request)
RPCResults{
{"for regular nodes",
"{\n"
" \"enabled\": true|false, (bool) Whether mixing functionality is enabled\n"
" \"multisession\": true|false, (bool) Whether CoinJoin Multisession option is enabled\n"
" \"max_sessions\": xxx, (numeric) How many parallel mixing sessions can there be at once\n"
" \"max_rounds\": xxx, (numeric) How many rounds to mix\n"
" \"max_amount\": xxx, (numeric) Target CoinJoin balance in " + CURRENCY_UNIT + "\n"
" \"denoms_goal\": xxx, (numeric) How many inputs of each denominated amount to target\n"
" \"denoms_hardcap\": xxx, (numeric) Maximum limit of how many inputs of each denominated amount to create\n"
" \"queue_size\": xxx, (numeric) How many queues there are currently on the network\n"
" \"running\": true|false, (bool) Whether mixing is currently running\n"
" \"sessions\": (array of json objects)\n"
" \"enabled\" : true|false, (boolean) Whether mixing functionality is enabled\n"
" \"multisession\" : true|false, (boolean) Whether CoinJoin Multisession option is enabled\n"
" \"max_sessions\" : xxx, (numeric) How many parallel mixing sessions can there be at once\n"
" \"max_rounds\" : xxx, (numeric) How many rounds to mix\n"
" \"max_amount\" : xxx, (numeric) Target CoinJoin balance in " + CURRENCY_UNIT + "\n"
" \"denoms_goal\" : xxx, (numeric) How many inputs of each denominated amount to target\n"
" \"denoms_hardcap\" : xxx, (numeric) Maximum limit of how many inputs of each denominated amount to create\n"
" \"queue_size\" : xxx, (numeric) How many queues there are currently on the network\n"
" \"running\" : true|false, (boolean) Whether mixing is currently running\n"
" \"sessions\" : (array of json objects)\n"
" [\n"
" {\n"
" \"protxhash\": \"...\", (string) The ProTxHash of the masternode\n"
" \"outpoint\": \"txid-index\", (string) The outpoint of the masternode\n"
" \"service\": \"host:port\", (string) The IP address and port of the masternode\n"
" \"denomination\": xxx, (numeric) The denomination of the mixing session in " + CURRENCY_UNIT + "\n"
" \"state\": \"...\", (string) Current state of the mixing session\n"
" \"entries_count\": xxx, (numeric) The number of entries in the mixing session\n"
" \"protxhash\" : \"...\", (string) The ProTxHash of the masternode\n"
" \"outpoint\" : \"txid-index\", (string) The outpoint of the masternode\n"
" \"service\" : \"host:port\", (string) The IP address and port of the masternode\n"
" \"denomination\" : xxx, (numeric) The denomination of the mixing session in " + CURRENCY_UNIT + "\n"
" \"state\" : \"...\", (string) Current state of the mixing session\n"
" \"entries_count\" : xxx, (numeric) The number of entries in the mixing session\n"
" }\n"
" ,...\n"
" ],\n"
" \"keys_left\": xxx, (numeric) How many new keys are left since last automatic backup\n"
" \"warnings\": \"...\" (string) Warnings if any\n"
" \"keys_left\" : xxx, (numeric) How many new keys are left since last automatic backup\n"
" \"warnings\" : \"...\" (string) Warnings if any\n"
"}\n"
}, {"for masternodes",
"{\n"
" \"queue_size\": xxx, (numeric) How many queues there are currently on the network\n"
" \"denomination\": xxx, (numeric) The denomination of the mixing session in " + CURRENCY_UNIT + "\n"
" \"state\": \"...\", (string) Current state of the mixing session\n"
" \"entries_count\": xxx, (numeric) The number of entries in the mixing session\n"
" \"queue_size\" : xxx, (numeric) How many queues there are currently on the network\n"
" \"denomination\" : xxx, (numeric) The denomination of the mixing session in " + CURRENCY_UNIT + "\n"
" \"state\" : \"...\", (string) Current state of the mixing session\n"
" \"entries_count\" : xxx, (numeric) The number of entries in the mixing session\n"
"}\n"
}},
RPCExamples{
Expand Down
Loading