Skip to content

Commit aa69471

Browse files
author
MarcoFalke
committed
Merge #21572: Fix wrong wallet RPC context set after #21366
937fd4a Fix wrong wallet RPC context set after #21366 (Russell Yanofsky) Pull request description: 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 bitcoin/bitcoin#21366 (comment) eliminates these and would be a good followup for a future PR. This PR just implements the simplest possible fix. ACKs for top commit: theStack: Code-review ACK 937fd4a meshcollider: Code review ACK 937fd4a Tree-SHA512: 53e6265ed6c7abb47d2b3e77d1604edfeb993c3a2440f0c19679cfeb23516965e6707ff486196a0acfbeff21c79a9a08b5cd33bae9a232d33d0134bca1bd0ff3
2 parents 2b3e5bf + 937fd4a commit aa69471

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/wallet/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ class WalletClientImpl : public WalletClient
522522
#ifdef ENABLE_EXTERNAL_SIGNER
523523
for (const CRPCCommand& command : GetSignerRPCCommands()) {
524524
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);
526526
}, command.argNames, command.unique_id);
527527
m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
528528
}

0 commit comments

Comments
 (0)