Add ChangeAddressType method

ryanofsky · ryanofsky · commit 38c2647588d1 · 2018-04-05T12:19:35.000-04:00
Suggested #12729 (comment)
diff --git a/src/interface/wallet.cpp b/src/interface/wallet.cpp
@@ -406,7 +406,7 @@ class WalletImpl : public Wallet
     }
     bool hdEnabled() override { return m_wallet.IsHDEnabled(); }
     OutputType getDefaultAddressType() override { return m_wallet.m_default_address_type; }
-    OutputType getDefaultChangeType() override { return m_wallet.m_default_change_type; }
+    OutputType getChangeAddressType() override { return m_wallet.ChangeAddressType(); }
     std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
     {
         return MakeHandler(m_wallet.ShowProgress.connect(fn));
diff --git a/src/interface/wallet.h b/src/interface/wallet.h
@@ -221,8 +221,8 @@ class Wallet
     // Get default address type.
     virtual OutputType getDefaultAddressType() = 0;
 
-    // Get default change type.
-    virtual OutputType getDefaultChangeType() = 0;
+    // Get change type to use for a new address.
+    virtual OutputType getChangeAddressType() = 0;
 
     //! Register handler for show progress messages.
     using ShowProgressFn = std::function<void(const std::string& title, int progress)>;
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
@@ -648,7 +648,7 @@ void PaymentServer::fetchPaymentACK(WalletModel* walletModel, const SendCoinsRec
         // use for change. Despite an actual payment and not change, this is a close match:
         // it's the output type we use subject to privacy issues, but not restricted by what
         // other software supports.
-        const OutputType change_type = walletModel->wallet().getDefaultChangeType() != OutputType::CHANGE_AUTO ? walletModel->wallet().getDefaultChangeType() : walletModel->wallet().getDefaultAddressType();
+        const OutputType change_type = walletModel->wallet().getChangeAddressType();
         walletModel->wallet().learnRelatedScripts(newKey, change_type);
         CTxDestination dest = GetDestinationForKey(newKey, change_type);
         std::string label = tr("Refund from %1").arg(recipient.authenticatedMerchant).toStdString();
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -258,7 +258,7 @@ UniValue getrawchangeaddress(const JSONRPCRequest& request)
         pwallet->TopUpKeyPool();
     }
 
-    OutputType output_type = pwallet->m_default_change_type != OutputType::CHANGE_AUTO ? pwallet->m_default_change_type : pwallet->m_default_address_type;
+    OutputType output_type = pwallet->ChangeAddressType();
     if (!request.params[0].isNull()) {
         if (!ParseOutputType(request.params[0].get_str(), output_type)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown address type '%s'", request.params[0].get_str()));
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2673,6 +2673,11 @@ OutputType CWallet::TransactionChangeType(OutputType change_type, const std::vec
     return m_default_address_type;
 }
 
+OutputType CWallet::ChangeAddressType() const
+{
+    return m_default_change_type != OutputType::CHANGE_AUTO ? m_default_change_type : m_default_address_type;
+}
+
 bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet,
                                 int& nChangePosInOut, std::string& strFailReason, const CCoinControl& coin_control, bool sign)
 {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -963,8 +963,16 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
     CAmount GetLegacyBalance(const isminefilter& filter, int minDepth, const std::string* account) const;
     CAmount GetAvailableBalance(const CCoinControl* coinControl = nullptr) const;
 
+    /**
+     * Return change type to use for a new transaction.
+     */
     OutputType TransactionChangeType(OutputType change_type, const std::vector<CRecipient>& vecSend);
 
+    /**
+     * Return change type to use for a new address.
+     */
+    OutputType ChangeAddressType() const;
+
     /**
      * Insert additional inputs into the transaction by
      * calling CreateTransaction();

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ class WalletImpl : public Wallet`
`406`	`406`	`}`
`407`	`407`	`bool hdEnabled() override { return m_wallet.IsHDEnabled(); }`
`408`	`408`	`OutputType getDefaultAddressType() override { return m_wallet.m_default_address_type; }`
`409`		`- OutputType getDefaultChangeType() override { return m_wallet.m_default_change_type; }`
	`409`	`+ OutputType getChangeAddressType() override { return m_wallet.ChangeAddressType(); }`
`410`	`410`	`std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override`
`411`	`411`	`{`
`412`	`412`	`return MakeHandler(m_wallet.ShowProgress.connect(fn));`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ UniValue getrawchangeaddress(const JSONRPCRequest& request)`
`258`	`258`	`pwallet->TopUpKeyPool();`
`259`	`259`	`}`
`260`	`260`
`261`		`- OutputType output_type = pwallet->m_default_change_type != OutputType::CHANGE_AUTO ? pwallet->m_default_change_type : pwallet->m_default_address_type;`
	`261`	`+ OutputType output_type = pwallet->ChangeAddressType();`
`262`	`262`	`if (!request.params[0].isNull()) {`
`263`	`263`	`if (!ParseOutputType(request.params[0].get_str(), output_type)) {`
`264`	`264`	`throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown address type '%s'", request.params[0].get_str()));`
Original file line number	Diff line number	Diff line change
`@@ -2673,6 +2673,11 @@ OutputType CWallet::TransactionChangeType(OutputType change_type, const std::vec`
`2673`	`2673`	`return m_default_address_type;`
`2674`	`2674`	`}`
`2675`	`2675`
	`2676`	`+OutputType CWallet::ChangeAddressType() const`
	`2677`	`+{`
	`2678`	`+ return m_default_change_type != OutputType::CHANGE_AUTO ? m_default_change_type : m_default_address_type;`
	`2679`	`+}`
	`2680`	`+`
`2676`	`2681`	`bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet,`
`2677`	`2682`	`int& nChangePosInOut, std::string& strFailReason, const CCoinControl& coin_control, bool sign)`
`2678`	`2683`	`{`