Skip to content

Allow simple multiwallet rpc calls #18734

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

Closed
wants to merge 1 commit into from
Closed

Allow simple multiwallet rpc calls #18734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions src/wallet/rpcdump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ static void RescanWallet(CWallet& wallet, const WalletRescanReserver& reserver,

UniValue importprivkey(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &importprivkey);
}
Comment on lines +95 to +97
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid adding this to every wallet function?


std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -224,6 +228,10 @@ UniValue abortrescan(const JSONRPCRequest& request)

UniValue importaddress(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &importaddress);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -328,6 +336,10 @@ UniValue importaddress(const JSONRPCRequest& request)

UniValue importprunedfunds(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &importprunedfunds);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -388,6 +400,10 @@ UniValue importprunedfunds(const JSONRPCRequest& request)

UniValue removeprunedfunds(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &removeprunedfunds);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -428,6 +444,10 @@ UniValue removeprunedfunds(const JSONRPCRequest& request)

UniValue importpubkey(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &importpubkey);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -517,6 +537,10 @@ UniValue importpubkey(const JSONRPCRequest& request)

UniValue importwallet(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &importwallet);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -676,6 +700,10 @@ UniValue importwallet(const JSONRPCRequest& request)

UniValue dumpprivkey(const JSONRPCRequest& request)
{
if (IsMultiwalletJSONRPCRequest(request)) {
return ExecForeachWalletJSONRPCRequest(request, &dumpprivkey);
}
Comment on lines +703 to +705
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like dumpprivkey should probably just return the first result it gets (and ignore all the failures)?


std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
const CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
Expand Down Expand Up @@ -1266,6 +1294,10 @@ static int64_t GetImportTimestamp(const UniValue& data, int64_t now)

UniValue importmulti(const JSONRPCRequest& mainRequest)
{
if (IsMultiwalletJSONRPCRequest(mainRequest)) {
return ExecForeachWalletJSONRPCRequest(mainRequest, &importmulti);
}

std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(mainRequest);
CWallet* const pwallet = wallet.get();
if (!EnsureWalletIsAvailable(pwallet, mainRequest.fHelp)) {
Expand Down
Loading