From c5b277033a72650c221084ec0f1326623a810fd0 Mon Sep 17 00:00:00 2001
From: James O'Beirne <james.obeirne@gmail.com>
Date: Tue, 10 Apr 2018 11:50:10 -0400
Subject: Add purpose arg to Wallet::getAddress

Also make all arguments to getAddress required and document args at call sites.
---
 src/interfaces/wallet.cpp | 8 +++++++-
 src/interfaces/wallet.h   | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/interfaces')

diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index f4dfdae8ae..63b9d80a92 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -152,7 +152,10 @@ public:
     {
         return m_wallet.DelAddressBook(dest);
     }
-    bool getAddress(const CTxDestination& dest, std::string* name, isminetype* is_mine) override
+    bool getAddress(const CTxDestination& dest,
+        std::string* name,
+        isminetype* is_mine,
+        std::string* purpose) override
     {
         LOCK(m_wallet.cs_wallet);
         auto it = m_wallet.mapAddressBook.find(dest);
@@ -165,6 +168,9 @@ public:
         if (is_mine) {
             *is_mine = IsMine(m_wallet, dest);
         }
+        if (purpose) {
+            *purpose = it->second.purpose;
+        }
         return true;
     }
     std::vector<WalletAddress> getAddresses() override
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 2a03f6c60a..ff779cd0ad 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -99,8 +99,9 @@ public:
 
     //! Look up address in wallet, return whether exists.
     virtual bool getAddress(const CTxDestination& dest,
-        std::string* name = nullptr,
-        isminetype* is_mine = nullptr) = 0;
+        std::string* name,
+        isminetype* is_mine,
+        std::string* purpose) = 0;
 
     //! Get wallet address list.
     virtual std::vector<WalletAddress> getAddresses() = 0;
-- 
cgit v1.2.3