From 39a231053a94afaaca140d3ec8ad795f37accfc1 Mon Sep 17 00:00:00 2001
From: Ross Nicoll <jrn@jrn.me.uk>
Date: Thu, 3 Jun 2021 12:15:24 +0100
Subject: Add node context to wallet RPC request object

Add node context to wallet RPC request object, as getauxblock needs access to the node to determine if it is in initial block download, and requires access to the wallet to get an address to pay to.
---
 src/interfaces/wallet.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/interfaces/wallet.cpp')

diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index f68016b55..599b265ba 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -7,6 +7,7 @@
 #include <amount.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
+#include <node/context.h>
 #include <policy/fees.h>
 #include <primitives/transaction.h>
 #include <rpc/server.h>
@@ -489,8 +490,9 @@ public:
 class WalletClientImpl : public WalletClient
 {
 public:
-    WalletClientImpl(Chain& chain, ArgsManager& args)
+    WalletClientImpl(NodeContext& node, Chain& chain, ArgsManager& args)
     {
+        m_context.nodeContext = &node;
         m_context.chain = &chain;
         m_context.args = &args;
     }
@@ -566,9 +568,9 @@ public:
 
 std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet) { return wallet ? MakeUnique<WalletImpl>(wallet) : nullptr; }
 
-std::unique_ptr<WalletClient> MakeWalletClient(Chain& chain, ArgsManager& args)
+std::unique_ptr<WalletClient> MakeWalletClient(NodeContext& node, Chain& chain, ArgsManager& args)
 {
-    return MakeUnique<WalletClientImpl>(chain, args);
+    return MakeUnique<WalletClientImpl>(node, chain, args);
 }
 
 } // namespace interfaces
-- 
cgit v1.2.3


From 803923ca58c67ad9cd2335ee501d27c21ec71f66 Mon Sep 17 00:00:00 2001
From: Ross Nicoll <jrn@jrn.me.uk>
Date: Wed, 9 Jun 2021 08:38:00 +0100
Subject: Remove separate node and wallet contexts

---
 src/interfaces/wallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/interfaces/wallet.cpp')

diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index 599b265ba..4124bc786 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -568,9 +568,9 @@ public:
 
 std::unique_ptr<Wallet> MakeWallet(const std::shared_ptr<CWallet>& wallet) { return wallet ? MakeUnique<WalletImpl>(wallet) : nullptr; }
 
-std::unique_ptr<WalletClient> MakeWalletClient(NodeContext& node, Chain& chain, ArgsManager& args)
+std::unique_ptr<WalletClient> MakeWalletClient(NodeContext& node, ArgsManager& args)
 {
-    return MakeUnique<WalletClientImpl>(node, chain, args);
+    return MakeUnique<WalletClientImpl>(node, *node.chain, args);
 }
 
 } // namespace interfaces
-- 
cgit v1.2.3