Fix wrong wallet RPC context set after #21366

ryanofsky · ryanofsky · commit 937fd4a66f04 · 2021-04-02T12:48:20.000-04:00
This bug doesn't have any effects currently because it only affects external signer RPCs which aren't currently using the wallet context, but it does cause an appveyor failure in a upcoming PR: https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/38512882 This bug is subtle and could have been avoided if JSONRPCRequest didn't have constructors that were so loose with type checking. Suggested change #21366 (comment) eliminates these and would be a good followup for a future PR.
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
@@ -522,7 +522,7 @@ class WalletClientImpl : public WalletClient
 #ifdef ENABLE_EXTERNAL_SIGNER
         for (const CRPCCommand& command : GetSignerRPCCommands()) {
             m_rpc_commands.emplace_back(command.category, command.name, [this, &command](const JSONRPCRequest& request, UniValue& result, bool last_handler) {
-                return command.actor({request, m_context}, result, last_handler);
+                return command.actor({request, &m_context}, result, last_handler);
             }, command.argNames, command.unique_id);
             m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
         }

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ class WalletClientImpl : public WalletClient`
`522`	`522`	`#ifdef ENABLE_EXTERNAL_SIGNER`
`523`	`523`	`for (const CRPCCommand& command : GetSignerRPCCommands()) {`
`524`	`524`	`m_rpc_commands.emplace_back(command.category, command.name, [this, &command](const JSONRPCRequest& request, UniValue& result, bool last_handler) {`
`525`		`- return command.actor({request, m_context}, result, last_handler);`
	`525`	`+ return command.actor({request, &m_context}, result, last_handler);`
`526`	`526`	`}, command.argNames, command.unique_id);`
`527`	`527`	`m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));`
`528`	`528`	`}`