cli: add multiwallet capability to GetNewAddress and -generate

jonatack · jonatack · commit 4b859cfff996 · 2020-06-02T08:50:51.000+02:00
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
@@ -538,8 +538,10 @@ static void GetWalletBalances(UniValue& result)
  */
 static UniValue GetNewAddress()
 {
+    Optional<std::string> wallet_name{};
+    if (gArgs.IsArgSet("-rpcwallet")) wallet_name = gArgs.GetArg("-rpcwallet", "");
     std::unique_ptr<BaseRequestHandler> rh{MakeUnique<DefaultRequestHandler>()};
-    return ConnectAndCallRPC(rh.get(), "getnewaddress", /* args=*/{});
+    return ConnectAndCallRPC(rh.get(), "getnewaddress", /* args=*/{}, wallet_name);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -538,8 +538,10 @@ static void GetWalletBalances(UniValue& result)`
`538`	`538`	`*/`
`539`	`539`	`static UniValue GetNewAddress()`
`540`	`540`	`{`
	`541`	`+ Optional<std::string> wallet_name{};`
	`542`	`+ if (gArgs.IsArgSet("-rpcwallet")) wallet_name = gArgs.GetArg("-rpcwallet", "");`
`541`	`543`	`std::unique_ptr<BaseRequestHandler> rh{MakeUnique<DefaultRequestHandler>()};`
`542`		`- return ConnectAndCallRPC(rh.get(), "getnewaddress", /* args=*/{});`
	`544`	`+ return ConnectAndCallRPC(rh.get(), "getnewaddress", /* args=*/{}, wallet_name);`
`543`	`545`	`}`
`544`	`546`
`545`	`547`	`/**`