Sapling milestone 5: Graphical User Interface

CMakeLists.txt

@@ -455,6 +455,7 @@ set(SAPLING_SOURCES
         ./src/bech32.cpp
         ./src/sapling/sapling_util.cpp
         ./src/sapling/key_io_sapling.cpp
+        ./src/destination_io.cpp
         ./src/sapling/sapling_core_write.cpp
         ./src/sapling/prf.cpp
         ./src/sapling/noteencryption.cpp

src/Makefile.am

@@ -287,6 +287,7 @@ BITCOIN_CORE_H = \
   wallet/hdchain.h \
   wallet/rpcwallet.h \
   wallet/scriptpubkeyman.h \
+  destination_io.h \
   wallet/wallet.h \
   wallet/walletdb.h \
   zpivchain.h \
@@ -401,6 +402,7 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpczpiv.cpp \
   wallet/hdchain.cpp \
   wallet/scriptpubkeyman.cpp \
+  destination_io.cpp \
   wallet/wallet.cpp \
   wallet/wallet_zerocoin.cpp \
   wallet/walletdb.cpp \

src/Makefile.qt.include

@@ -24,6 +24,7 @@ QT_FORMS_UI = \
   qt/pivx/forms/lockunlock.ui \
   qt/pivx/forms/expandablebutton.ui \
   qt/pivx/forms/receivedialog.ui \
+  qt/pivx/forms/balancebubble.ui \
   qt/pivx/forms/topbar.ui \
   qt/pivx/forms/txrow.ui \
   qt/pivx/forms/dashboardwidget.ui \
@@ -228,6 +229,7 @@ BITCOIN_QT_H = \
   qt/pivx/txviewholder.h \
   qt/pivx/qtutils.h \
   qt/pivx/expandablebutton.h \
+  qt/pivx/balancebubble.h \
   qt/pivx/topbar.h \
   qt/pivx/txrow.h \
   qt/pivx/addressholder.h \
@@ -492,11 +494,11 @@ RES_ICONS = \
   qt/pivx/res/img/ic-transaction-cs-contract.svg \
   qt/pivx/res/img/ic-transaction-cs-contract-inactive.svg \
   qt/pivx/res/img/ic-check-box-indeterminate.svg \
+  qt/pivx/res/img/ic-information.svg \
+  qt/pivx/res/img/ic-information-hover.svg \
   qt/pivx/res/img/ani-loading-dark.gif \
   qt/pivx/res/img/ani-loading.gif
 
-
-
 BITCOIN_QT_BASE_CPP = \
   qt/bantablemodel.cpp \
   qt/bitcoinaddressvalidator.cpp \
@@ -548,6 +550,7 @@ BITCOIN_QT_WALLET_CPP = \
   qt/pivx/txviewholder.cpp \
   qt/pivx/qtutils.cpp \
   qt/pivx/expandablebutton.cpp \
+  qt/pivx/balancebubble.cpp \
   qt/pivx/topbar.cpp \
   qt/pivx/txrow.cpp \
   qt/pivx/addressholder.cpp \

src/addressbook.cpp

@@ -15,24 +15,40 @@ namespace AddressBook {
         const std::string DELEGATOR{"delegator"};
         const std::string COLD_STAKING{"coldstaking"};
         const std::string COLD_STAKING_SEND{"coldstaking_send"};
+        const std::string SHIELDED_RECEIVE{"shielded_receive"};
+        const std::string SHIELDED_SEND{"shielded_spend"};
     }
 
     bool IsColdStakingPurpose(const std::string& purpose) {
         return purpose == AddressBookPurpose::COLD_STAKING
                || purpose == AddressBookPurpose::COLD_STAKING_SEND;
     }
 
+    bool IsShieldedPurpose(const std::string& purpose) {
+        return purpose == AddressBookPurpose::SHIELDED_RECEIVE
+               || purpose == AddressBookPurpose::SHIELDED_SEND;
+    }
+
     bool CAddressBookData::isSendColdStakingPurpose() const {
         return purpose == AddressBookPurpose::COLD_STAKING_SEND;
     }
 
     bool CAddressBookData::isSendPurpose() const {
         return purpose == AddressBookPurpose::SEND;
     }
+
     bool CAddressBookData::isReceivePurpose() const {
         return purpose == AddressBookPurpose::RECEIVE;
     }
 
+    bool CAddressBookData::isShieldedReceivePurpose() const {
+        return purpose == AddressBookPurpose::SHIELDED_RECEIVE;
+    }
+
+    bool CAddressBookData::isShielded() const {
+        return IsShieldedPurpose(purpose);
+    }
+
 
 }
 

src/addressbook.h

@@ -18,9 +18,12 @@ namespace AddressBook {
         extern const std::string DELEGATOR;
         extern const std::string COLD_STAKING;
         extern const std::string COLD_STAKING_SEND;
+        extern const std::string SHIELDED_RECEIVE;
+        extern const std::string SHIELDED_SEND;
     }
 
     bool IsColdStakingPurpose(const std::string& purpose);
+    bool IsShieldedPurpose(const std::string& purpose);
 
 /** Address book data */
     class CAddressBookData {
@@ -39,6 +42,8 @@ namespace AddressBook {
         bool isSendColdStakingPurpose() const;
         bool isSendPurpose() const;
         bool isReceivePurpose() const;
+        bool isShieldedReceivePurpose() const;
+        bool isShielded() const;
     };
 
 }

src/coincontrol.h

@@ -10,6 +10,22 @@
 #include "policy/feerate.h"
 #include "primitives/transaction.h"
 #include "script/standard.h"
+#include <unordered_set>
+
+class OutPointWrapper {
+public:
+    BaseOutPoint outPoint;
+    CAmount value;
+    bool isP2CS;
+
+    bool operator<(const OutPointWrapper& obj2) const {
+        return this->outPoint < obj2.outPoint;
+    }
+
+    bool operator==(const OutPointWrapper& obj2) const {
+        return this->outPoint == obj2.outPoint;
+    }
+};
 
 /** Coin Control Features. */
 class CCoinControl
@@ -52,27 +68,27 @@ class CCoinControl
         return (!setSelected.empty());
     }
 
-    bool IsSelected(const COutPoint& output) const
+    bool IsSelected(const BaseOutPoint& output) const
     {
-        return (setSelected.count(output) > 0);
+        return (setSelected.count(OutPointWrapper{output, 0, false}) > 0);
     }
 
-    void Select(const COutPoint& output)
+    void Select(const BaseOutPoint& output, CAmount value = 0, bool isP2CS = false)
     {
-        setSelected.insert(output);
+        setSelected.insert(OutPointWrapper{output, value, isP2CS});
     }
 
-    void UnSelect(const COutPoint& output)
+    void UnSelect(const BaseOutPoint& output)
     {
-        setSelected.erase(output);
+        setSelected.erase(OutPointWrapper{output, 0, false});
     }
 
     void UnSelectAll()
     {
         setSelected.clear();
     }
 
-    void ListSelected(std::vector<COutPoint>& vOutpoints) const
+    void ListSelected(std::vector<OutPointWrapper>& vOutpoints) const
     {
         vOutpoints.assign(setSelected.begin(), setSelected.end());
     }
@@ -82,14 +98,15 @@ class CCoinControl
         return setSelected.size();
     }
 
-    void SetSelection(std::set<COutPoint> setSelected)
-    {
-        this->setSelected.clear();
-        this->setSelected = setSelected;
-    }
-
 private:
-    std::set<COutPoint> setSelected;
+
+    struct SimpleOutpointHash {
+        size_t operator() (const OutPointWrapper& obj) const {
+            return (UintToArith256(obj.outPoint.hash) + obj.outPoint.n).GetCheapHash();
+        }
+    };
+
+    std::unordered_set<OutPointWrapper, SimpleOutpointHash> setSelected;
 };
 
 #endif // BITCOIN_COINCONTROL_H

src/destination_io.cpp

@@ -0,0 +1,68 @@
+// Copyright (c) 2020 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#include "destination_io.h"
+#include "base58.h"
+#include "sapling/key_io_sapling.h"
+
+namespace Standard {
+
+    std::string EncodeDestination(const CWDestination &address, const CChainParams::Base58Type addrType) {
+        const CTxDestination *dest = boost::get<CTxDestination>(&address);
+        if (!dest) {
+            return KeyIO::EncodePaymentAddress(*boost::get<libzcash::SaplingPaymentAddress>(&address));
+        }
+        return EncodeDestination(*dest, addrType);
+    };
+
+    CWDestination DecodeDestination(const std::string& strAddress)
+    {
+        bool isStaking = false;
+        return DecodeDestination(strAddress, isStaking);
+    }
+
+    CWDestination DecodeDestination(const std::string& strAddress, bool& isStaking)
+    {
+        bool isShielded = false;
+        return DecodeDestination(strAddress, isStaking, isShielded);
+    }
+
+    // agregar isShielded
+    CWDestination DecodeDestination(const std::string& strAddress, bool& isStaking, bool& isShielded)
+    {
+        CWDestination dest;
+        CTxDestination regDest = ::DecodeDestination(strAddress, isStaking);
+        if (!IsValidDestination(regDest)) {
+            const auto sapDest = KeyIO::DecodeSaplingPaymentAddress(strAddress);
+            if (sapDest) {
+                isShielded = true;
+                return *sapDest;
+            }
+        }
+        return regDest;
+
+    }
+
+    bool IsValidDestination(const CWDestination& address)
+    {
+        // Only regular base58 addresses and shielded addresses accepted here for now
+        const libzcash::SaplingPaymentAddress *dest1 = boost::get<libzcash::SaplingPaymentAddress>(&address);
+        if (dest1) return true;
+
+        const CTxDestination *dest = boost::get<CTxDestination>(&address);
+        return dest && ::IsValidDestination(*dest);
+    }
+
+    const libzcash::SaplingPaymentAddress* GetShieldedDestination(const CWDestination& dest)
+    {
+        return boost::get<libzcash::SaplingPaymentAddress>(&dest);
+    }
+
+    const CTxDestination* GetTransparentDestination(const CWDestination& dest)
+    {
+        return boost::get<CTxDestination>(&dest);
+    }
+
+} // End Standard namespace
+

src/destination_io.h

@@ -0,0 +1,29 @@
+// Copyright (c) 2020 The PIVX developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DESTINATION_IO_H
+#define DESTINATION_IO_H
+
+#include "script/standard.h"
+
+// Regular + shielded addresses variant.
+typedef boost::variant<CTxDestination, libzcash::SaplingPaymentAddress> CWDestination;
+
+namespace Standard {
+
+    std::string EncodeDestination(const CWDestination &address, const CChainParams::Base58Type addrType = CChainParams::PUBKEY_ADDRESS);
+
+    CWDestination DecodeDestination(const std::string& strAddress);
+    CWDestination DecodeDestination(const std::string& strAddress, bool& isStaking);
+    CWDestination DecodeDestination(const std::string& strAddress, bool& isStaking, bool& isShielded);
+
+    bool IsValidDestination(const CWDestination& dest);
+
+    // boost::get wrapper
+    const libzcash::SaplingPaymentAddress* GetShieldedDestination(const CWDestination& dest);
+    const CTxDestination * GetTransparentDestination(const CWDestination& dest);
+
+} // End Standard namespace
+
+#endif //DESTINATION_IO_H

src/interface/wallet.cpp

@@ -21,6 +21,8 @@ namespace interfaces {
         }
         result.delegate_balance = m_wallet.GetDelegatedBalance();
         result.coldstaked_balance = m_wallet.GetColdStakingBalance();
+        result.shielded_balance = m_wallet.GetAvailableShieldedBalance();
+        result.unconfirmed_shielded_balance = m_wallet.GetUnconfirmedShieldedBalance();
         return result;
     }
 

src/interface/wallet.h

@@ -23,14 +23,17 @@ struct WalletBalances
     CAmount immature_watch_only_balance{0};
     CAmount delegate_balance{0};
     CAmount coldstaked_balance{0};
+    CAmount shielded_balance{0};
+    CAmount unconfirmed_shielded_balance{0};
 
     bool balanceChanged(const WalletBalances& prev) const
     {
         return balance != prev.balance || unconfirmed_balance != prev.unconfirmed_balance ||
                immature_balance != prev.immature_balance || watch_only_balance != prev.watch_only_balance ||
                unconfirmed_watch_only_balance != prev.unconfirmed_watch_only_balance ||
                immature_watch_only_balance != prev.immature_watch_only_balance ||
-               delegate_balance != prev.delegate_balance || coldstaked_balance != prev.coldstaked_balance;
+               delegate_balance != prev.delegate_balance || coldstaked_balance != prev.coldstaked_balance ||
+               shielded_balance != prev.shielded_balance || unconfirmed_shielded_balance != prev.unconfirmed_shielded_balance;
     }
 };
 

src/primitives/transaction.h

@@ -31,9 +31,11 @@ class BaseOutPoint
 public:
     uint256 hash;
     uint32_t n;
+    bool isTransparent{true};
 
     BaseOutPoint() { SetNull(); }
-    BaseOutPoint(uint256 hashIn, uint32_t nIn) { hash = hashIn; n = nIn; }
+    BaseOutPoint(const uint256& hashIn, const uint32_t nIn, bool isTransparentIn = true) :
+        hash(hashIn), n(nIn), isTransparent(isTransparentIn) { }
 
     ADD_SERIALIZE_METHODS;
 
@@ -75,7 +77,7 @@ class COutPoint : public BaseOutPoint
 {
 public:
     COutPoint() : BaseOutPoint() {};
-    COutPoint(uint256 hashIn, uint32_t nIn) : BaseOutPoint(hashIn, nIn) {};
+    COutPoint(const uint256& hashIn, const uint32_t nIn) : BaseOutPoint(hashIn, nIn, true) {};
     std::string ToString() const;
 };
 
@@ -85,7 +87,7 @@ class SaplingOutPoint : public BaseOutPoint
 {
 public:
     SaplingOutPoint() : BaseOutPoint() {};
-    SaplingOutPoint(uint256 hashIn, uint32_t nIn) : BaseOutPoint(hashIn, nIn) {};
+    SaplingOutPoint(const uint256& hashIn, const uint32_t nIn) : BaseOutPoint(hashIn, nIn, false) {};
     std::string ToString() const;
 };
 

src/qt/CMakeLists.txt

@@ -123,6 +123,7 @@ SET(QT_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/furabstractlistitemdelegate.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/txviewholder.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/qtutils.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/balancebubble.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/expandablebutton.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/topbar.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/txrow.cpp