From 624c04b989287404fc6997cb7f67b9f620b3d4f1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Mon, 26 Jul 2021 09:02:26 +0530
Subject: [PATCH 1/7] move-only: move CKeyPool and CReserveKey to a dedicated
 file

---
 src/Makefile.am                         |  2 +
 src/wallet/keypool.cpp                  | 57 +++++++++++++++++
 src/wallet/keypool.h                    | 85 +++++++++++++++++++++++++
 src/wallet/wallet.cpp                   | 46 -------------
 src/wallet/wallet.h                     | 71 +--------------------
 src/wallet/walletdb.h                   |  2 +-
 test/lint/lint-circular-dependencies.sh |  2 +
 7 files changed, 148 insertions(+), 117 deletions(-)
 create mode 100644 src/wallet/keypool.cpp
 create mode 100644 src/wallet/keypool.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 400f6436d689..971da21ddc55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,6 +292,7 @@ BITCOIN_CORE_H = \
   wallet/crypter.h \
   wallet/db.h \
   wallet/fees.h \
+  wallet/keypool.h \
   wallet/psbtwallet.h \
   wallet/rpcwallet.h \
   wallet/wallet.h \
@@ -440,6 +441,7 @@ libdash_wallet_a_SOURCES = \
   wallet/db.cpp \
   wallet/fees.cpp \
   wallet/init.cpp \
+  wallet/keypool.cpp \
   wallet/psbtwallet.cpp \
   wallet/rpcdump.cpp \
   wallet/rpcwallet.cpp \
diff --git a/src/wallet/keypool.cpp b/src/wallet/keypool.cpp
new file mode 100644
index 000000000000..0f98b48c352a
--- /dev/null
+++ b/src/wallet/keypool.cpp
@@ -0,0 +1,57 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2017 The Bitcoin Core developers
+// Copyright (c) 2021 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <wallet/keypool.h>
+
+#include <coinjoin/coinjoin-client.h>
+#include <wallet/wallet.h>
+
+CKeyPool::CKeyPool()
+{
+    nTime = GetTime();
+    fInternal = false;
+}
+
+CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn)
+{
+    nTime = GetTime();
+    vchPubKey = vchPubKeyIn;
+    fInternal = fInternalIn;
+}
+
+bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool fInternalIn)
+{
+    if (nIndex == -1)
+    {
+        CKeyPool keypool;
+        if (!pwallet->ReserveKeyFromKeyPool(nIndex, keypool, fInternalIn)) {
+            return false;
+        }
+        vchPubKey = keypool.vchPubKey;
+        fInternal = keypool.fInternal;
+    }
+    assert(vchPubKey.IsValid());
+    pubkey = vchPubKey;
+    return true;
+}
+
+void CReserveKey::KeepKey()
+{
+    if (nIndex != -1) {
+        pwallet->KeepKey(nIndex);
+    }
+    nIndex = -1;
+    vchPubKey = CPubKey();
+}
+
+void CReserveKey::ReturnKey()
+{
+    if (nIndex != -1) {
+        pwallet->ReturnKey(nIndex, fInternal, vchPubKey);
+    }
+    nIndex = -1;
+    vchPubKey = CPubKey();
+}
diff --git a/src/wallet/keypool.h b/src/wallet/keypool.h
new file mode 100644
index 000000000000..0fba1001a203
--- /dev/null
+++ b/src/wallet/keypool.h
@@ -0,0 +1,85 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2017 The Bitcoin Core developers
+// Copyright (c) 2021 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_WALLET_KEYPOOL_H
+#define BITCOIN_WALLET_KEYPOOL_H
+
+#include <pubkey.h>
+#include <serialize.h>
+#include <script/script.h>
+
+class CWallet;
+class CPubKey;
+
+/** A key pool entry */
+class CKeyPool
+{
+public:
+    int64_t nTime;
+    CPubKey vchPubKey;
+    bool fInternal; // for change outputs
+
+    CKeyPool();
+    CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn);
+
+    template<typename Stream>
+    void Serialize(Stream& s) const
+    {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH)) {
+            s << nVersion;
+        }
+        s << nTime << vchPubKey << fInternal;
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s)
+    {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH)) {
+            s >> nVersion;
+        }
+        s >> nTime >> vchPubKey;
+        try {
+            s >> fInternal;
+        } catch (std::ios_base::failure&) {
+            /* flag as external address if we can't read the internal boolean
+               (this will be the case for any wallet before the HD chain split version) */
+            fInternal = false;
+        }
+    }
+};
+
+/** A key allocated from the key pool. */
+class CReserveKey final : public CReserveScript
+{
+protected:
+    CWallet* pwallet;
+    int64_t nIndex{-1};
+    CPubKey vchPubKey;
+    bool fInternal{false};
+
+public:
+    explicit CReserveKey(CWallet* pwalletIn)
+    {
+        pwallet = pwalletIn;
+    }
+
+    CReserveKey(const CReserveKey&) = delete;
+    CReserveKey& operator=(const CReserveKey&) = delete;
+
+    ~CReserveKey()
+    {
+        ReturnKey();
+    }
+
+    void ReturnKey();
+    bool GetReservedKey(CPubKey &pubkey, bool fInternalIn /*= false*/);
+    void KeepKey();
+    void KeepScript() override { KeepKey(); }
+};
+
+#endif // BITCOIN_WALLET_KEYPOOL_H
\ No newline at end of file
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 268eeb239a41..6a29ff3000e5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4623,39 +4623,6 @@ void CWallet::DeleteLabel(const std::string& label)
     batch.EraseAccount(label);
 }
 
-bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool fInternalIn)
-{
-    if (nIndex == -1)
-    {
-        CKeyPool keypool;
-        if (!pwallet->ReserveKeyFromKeyPool(nIndex, keypool, fInternalIn)) {
-            return false;
-        }
-        vchPubKey = keypool.vchPubKey;
-        fInternal = keypool.fInternal;
-    }
-    assert(vchPubKey.IsValid());
-    pubkey = vchPubKey;
-    return true;
-}
-
-void CReserveKey::KeepKey()
-{
-    if (nIndex != -1) {
-        pwallet->KeepKey(nIndex);
-    }
-    nIndex = -1;
-    vchPubKey = CPubKey();
-}
-
-void CReserveKey::ReturnKey()
-{
-    if (nIndex != -1) {
-        pwallet->ReturnKey(nIndex, fInternal, vchPubKey);
-    }
-    nIndex = -1;
-    vchPubKey = CPubKey();
-}
 
 void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
 {
@@ -5516,19 +5483,6 @@ std::vector<const CGovernanceObject*> CWallet::GetGovernanceObjects()
     return vecObjects;
 }
 
-CKeyPool::CKeyPool()
-{
-    nTime = GetTime();
-    fInternal = false;
-}
-
-CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn)
-{
-    nTime = GetTime();
-    vchPubKey = vchPubKeyIn;
-    fInternal = fInternalIn;
-}
-
 CWalletKey::CWalletKey(int64_t nExpires)
 {
     nTimeCreated = (nExpires ? GetTime() : 0);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b4a203591a68..32f345d286f3 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -20,6 +20,7 @@
 #include <wallet/coincontrol.h>
 #include <wallet/crypter.h>
 #include <wallet/coinselection.h>
+#include <wallet/keypool.h>
 #include <wallet/walletdb.h>
 #include <wallet/walletutil.h>
 
@@ -72,7 +73,6 @@ class CBlockIndex;
 class CCoinControl;
 class CKey;
 class COutput;
-class CReserveKey;
 class CScript;
 class CTxDSIn;
 class CTxMemPool;
@@ -117,45 +117,6 @@ enum WalletFlags : uint64_t {
 
 static constexpr uint64_t g_known_wallet_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS;
 
-/** A key pool entry */
-class CKeyPool
-{
-public:
-    int64_t nTime;
-    CPubKey vchPubKey;
-    bool fInternal; // for change outputs
-
-    CKeyPool();
-    CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn);
-
-    template<typename Stream>
-    void Serialize(Stream& s) const
-    {
-        int nVersion = s.GetVersion();
-        if (!(s.GetType() & SER_GETHASH)) {
-            s << nVersion;
-        }
-        s << nTime << vchPubKey << fInternal;
-    }
-
-    template<typename Stream>
-    void Unserialize(Stream& s)
-    {
-        int nVersion = s.GetVersion();
-        if (!(s.GetType() & SER_GETHASH)) {
-            s >> nVersion;
-        }
-        s >> nTime >> vchPubKey;
-        try {
-            s >> fInternal;
-        } catch (std::ios_base::failure&) {
-            /* flag as external address if we can't read the internal boolean
-               (this will be the case for any wallet before the HD chain split version) */
-            fInternal = false;
-        }
-    }
-};
-
 /** Address book data */
 class CAddressBookData
 {
@@ -1336,36 +1297,6 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
     bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const override;
 };
 
-/** A key allocated from the key pool. */
-class CReserveKey final : public CReserveScript
-{
-protected:
-    CWallet* pwallet;
-    int64_t nIndex{-1};
-    CPubKey vchPubKey;
-    bool fInternal{false};
-
-public:
-    explicit CReserveKey(CWallet* pwalletIn)
-    {
-        pwallet = pwalletIn;
-    }
-
-    CReserveKey(const CReserveKey&) = delete;
-    CReserveKey& operator=(const CReserveKey&) = delete;
-
-    ~CReserveKey()
-    {
-        ReturnKey();
-    }
-
-    void ReturnKey();
-    bool GetReservedKey(CPubKey &pubkey, bool fInternalIn /*= false*/);
-    void KeepKey();
-    void KeepScript() override { KeepKey(); }
-};
-
-
 /**
  * DEPRECATED Account information.
  * Stored in wallet with key "acc"+string account name.
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 3ff20fdd53e4..f51ba6bb5736 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -8,6 +8,7 @@
 
 #include <amount.h>
 #include <wallet/db.h>
+#include <wallet/keypool.h>
 #include <hdchain.h>
 #include <key.h>
 
@@ -35,7 +36,6 @@ class CAccount;
 class CAccountingEntry;
 struct CBlockLocator;
 class CGovernanceObject;
-class CKeyPool;
 class CMasterKey;
 class CScript;
 class CWallet;
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 99b59581d2d4..ba941f4f2f94 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -93,6 +93,8 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> evo/deterministicmns"
     "evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/specialtx"
     "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
+    "wallet/keypool -> wallet/wallet -> wallet/keypool"
+    "wallet/keypool -> wallet/wallet -> wallet/walletdb -> wallet/keypool"
 
     "coinjoin/coinjoin-client -> net_processing -> coinjoin/coinjoin-client"
     "llmq/quorums -> net_processing -> llmq/quorums"

From d28e7d1b5aa43199a6dc7b8969861cb774d1195a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Thu, 5 Aug 2021 20:59:17 +0530
Subject: [PATCH 2/7] wallet: make CKeyPool and CReserveKey a template class

---
 src/coinjoin/coinjoin-client.cpp   |  2 +-
 src/coinjoin/coinjoin-util.h       |  6 +++---
 src/interfaces/wallet.cpp          |  2 +-
 src/rpc/governance.cpp             |  2 +-
 src/rpc/rpcevo.cpp                 |  2 +-
 src/wallet/keypool.cpp             | 24 ++++++++++++++++--------
 src/wallet/keypool.h               | 13 ++++++++-----
 src/wallet/rpcwallet.cpp           |  6 +++---
 src/wallet/test/coinjoin_tests.cpp |  4 ++--
 src/wallet/test/wallet_tests.cpp   | 10 +++++-----
 src/wallet/wallet.cpp              | 22 +++++++++++-----------
 src/wallet/wallet.h                |  8 ++++----
 src/wallet/walletdb.cpp            |  6 +++---
 src/wallet/walletdb.h              |  4 ++--
 14 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/src/coinjoin/coinjoin-client.cpp b/src/coinjoin/coinjoin-client.cpp
index 6832e00c20d3..5d3395c83f52 100644
--- a/src/coinjoin/coinjoin-client.cpp
+++ b/src/coinjoin/coinjoin-client.cpp
@@ -1540,7 +1540,7 @@ bool CCoinJoinClientSession::CreateCollateralTransaction(CMutableTransaction& tx
         // make our change address
         CScript scriptChange;
         CPubKey vchPubKey;
-        CReserveKey reservekey(&mixingWallet);
+        CReserveKey<CPubKey> reservekey(&mixingWallet);
         bool success = reservekey.GetReservedKey(vchPubKey, true);
         assert(success); // should never fail, as we just unlocked
         scriptChange = GetScriptForDestination(vchPubKey.GetID());
diff --git a/src/coinjoin/coinjoin-util.h b/src/coinjoin/coinjoin-util.h
index ac536030eb46..860059bfdce4 100644
--- a/src/coinjoin/coinjoin-util.h
+++ b/src/coinjoin/coinjoin-util.h
@@ -12,7 +12,7 @@ class CTransactionBuilder;
 class CKeyHolder
 {
 private:
-    CReserveKey reserveKey;
+    CReserveKey<CPubKey> reserveKey;
     CPubKey pubKey;
 
 public:
@@ -46,7 +46,7 @@ class CTransactionBuilderOutput
     /// Used for amount updates
     CTransactionBuilder* pTxBuilder{nullptr};
     /// Reserve key where the amount of this output will end up
-    CReserveKey key;
+    CReserveKey<CPubKey> key;
     /// Amount this output will receive
     CAmount nAmount{0};
     /// ScriptPubKey of this output
@@ -82,7 +82,7 @@ class CTransactionBuilder
     /// Dummy since we anyway use tallyItem's destination as change destination in coincontrol.
     /// Its a member just to make sure ReturnKey can be called in destructor just in case it gets generated/kept
     /// somewhere in CWallet code.
-    CReserveKey dummyReserveKey;
+    CReserveKey<CPubKey> dummyReserveKey;
     /// Contains all utxos available to generate this transactions. They are all from the same address.
     CompactTallyItem tallyItem;
     /// Contains the number of bytes required for a transaction with only the inputs of tallyItems, no outputs
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index 83d1e9d73d58..69b7fdb266dc 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -55,7 +55,7 @@ class PendingWalletTxImpl : public PendingWalletTx
 
     CTransactionRef m_tx;
     CWallet& m_wallet;
-    CReserveKey m_key;
+    CReserveKey<CPubKey> m_key;
 };
 
 //! Construct wallet tx struct.
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ff44d4ccae3a..f0700bf65caa 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -224,7 +224,7 @@ static UniValue gobject_prepare(const JSONRPCRequest& request)
     }
 
     // -- make our change address
-    CReserveKey reservekey(pwallet);
+    CReserveKey<CPubKey> reservekey(pwallet);
     // -- send the tx to the network
     CValidationState state;
     if (!pwallet->CommitTransaction(tx, {}, {}, {}, reservekey, g_connman.get(), state)) {
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 0e042bfbf0b5..efa4f104c508 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -210,7 +210,7 @@ static void FundSpecialTx(CWallet* pwallet, CMutableTransaction& tx, const Speci
     }
 
     CTransactionRef newTx;
-    CReserveKey reservekey(pwallet);
+    CReserveKey<CPubKey> reservekey(pwallet);
     CAmount nFee;
     int nChangePos = -1;
     std::string strFailReason;
diff --git a/src/wallet/keypool.cpp b/src/wallet/keypool.cpp
index 0f98b48c352a..c526ca8ec8c4 100644
--- a/src/wallet/keypool.cpp
+++ b/src/wallet/keypool.cpp
@@ -9,24 +9,27 @@
 #include <coinjoin/coinjoin-client.h>
 #include <wallet/wallet.h>
 
-CKeyPool::CKeyPool()
+template <class PublicKey>
+CKeyPool<PublicKey>::CKeyPool()
 {
     nTime = GetTime();
     fInternal = false;
 }
 
-CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn)
+template <class PublicKey>
+CKeyPool<PublicKey>::CKeyPool(const PublicKey& vchPubKeyIn, bool fInternalIn)
 {
     nTime = GetTime();
     vchPubKey = vchPubKeyIn;
     fInternal = fInternalIn;
 }
 
-bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool fInternalIn)
+template <class PublicKey>
+bool CReserveKey<PublicKey>::GetReservedKey(PublicKey& pubkey, bool fInternalIn)
 {
     if (nIndex == -1)
     {
-        CKeyPool keypool;
+        CKeyPool<CPubKey> keypool;
         if (!pwallet->ReserveKeyFromKeyPool(nIndex, keypool, fInternalIn)) {
             return false;
         }
@@ -38,20 +41,25 @@ bool CReserveKey::GetReservedKey(CPubKey& pubkey, bool fInternalIn)
     return true;
 }
 
-void CReserveKey::KeepKey()
+template <class PublicKey>
+void CReserveKey<PublicKey>::KeepKey()
 {
     if (nIndex != -1) {
         pwallet->KeepKey(nIndex);
     }
     nIndex = -1;
-    vchPubKey = CPubKey();
+    vchPubKey = PublicKey();
 }
 
-void CReserveKey::ReturnKey()
+template <class PublicKey>
+void CReserveKey<PublicKey>::ReturnKey()
 {
     if (nIndex != -1) {
         pwallet->ReturnKey(nIndex, fInternal, vchPubKey);
     }
     nIndex = -1;
-    vchPubKey = CPubKey();
+    vchPubKey = PublicKey();
 }
+
+template class CKeyPool<CPubKey>;
+template class CReserveKey<CPubKey>;
diff --git a/src/wallet/keypool.h b/src/wallet/keypool.h
index 0fba1001a203..ce0555347773 100644
--- a/src/wallet/keypool.h
+++ b/src/wallet/keypool.h
@@ -7,23 +7,25 @@
 #ifndef BITCOIN_WALLET_KEYPOOL_H
 #define BITCOIN_WALLET_KEYPOOL_H
 
-#include <pubkey.h>
 #include <serialize.h>
 #include <script/script.h>
 
 class CWallet;
 class CPubKey;
+class CBLSPublicKey;
+class CReserveScript;
 
+template <typename PublicKey>
 /** A key pool entry */
 class CKeyPool
 {
 public:
     int64_t nTime;
-    CPubKey vchPubKey;
+    PublicKey vchPubKey;
     bool fInternal; // for change outputs
 
     CKeyPool();
-    CKeyPool(const CPubKey& vchPubKeyIn, bool fInternalIn);
+    CKeyPool(const PublicKey& vchPubKeyIn, bool fInternalIn);
 
     template<typename Stream>
     void Serialize(Stream& s) const
@@ -53,13 +55,14 @@ class CKeyPool
     }
 };
 
+template <typename PublicKey>
 /** A key allocated from the key pool. */
 class CReserveKey final : public CReserveScript
 {
 protected:
     CWallet* pwallet;
     int64_t nIndex{-1};
-    CPubKey vchPubKey;
+    PublicKey vchPubKey;
     bool fInternal{false};
 
 public:
@@ -77,7 +80,7 @@ class CReserveKey final : public CReserveScript
     }
 
     void ReturnKey();
-    bool GetReservedKey(CPubKey &pubkey, bool fInternalIn /*= false*/);
+    bool GetReservedKey(PublicKey &pubkey, bool fInternalIn /*= false*/);
     void KeepKey();
     void KeepScript() override { KeepKey(); }
 };
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 526a9683823e..775eec67c814 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -275,7 +275,7 @@ static UniValue getrawchangeaddress(const JSONRPCRequest& request)
         pwallet->TopUpKeyPool();
     }
 
-    CReserveKey reservekey(pwallet);
+    CReserveKey<CPubKey> reservekey(pwallet);
     CPubKey vchPubKey;
     if (!reservekey.GetReservedKey(vchPubKey, true))
         throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
@@ -470,7 +470,7 @@ static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &
     CScript scriptPubKey = GetScriptForDestination(address);
 
     // Create and send the transaction
-    CReserveKey reservekey(pwallet);
+    CReserveKey<CPubKey> reservekey(pwallet);
     CAmount nFeeRequired;
     std::string strError;
     std::vector<CRecipient> vecSend;
@@ -1346,7 +1346,7 @@ static UniValue sendmany(const JSONRPCRequest& request)
     }
 
     // Send
-    CReserveKey keyChange(pwallet);
+    CReserveKey<CPubKey> keyChange(pwallet);
     CAmount nFeeRequired = 0;
     int nChangePosRet = -1;
     std::string strFailReason;
diff --git a/src/wallet/test/coinjoin_tests.cpp b/src/wallet/test/coinjoin_tests.cpp
index de507382795e..b2d8a84e2c65 100644
--- a/src/wallet/test/coinjoin_tests.cpp
+++ b/src/wallet/test/coinjoin_tests.cpp
@@ -75,8 +75,8 @@ class CTransactionBuilderTestSetup : public TestChain100Setup
     {
         CompactTallyItem tallyItem;
         CTransactionRef tx;
-        CReserveKey destKey(wallet.get());
-        CReserveKey reserveKey(wallet.get());
+        CReserveKey<CPubKey> destKey(wallet.get());
+        CReserveKey<CPubKey> reserveKey(wallet.get());
         CAmount nFeeRet;
         int nChangePosRet = -1;
         std::string strError;
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 285c62312c10..639e7710cded 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -293,7 +293,7 @@ class ListCoinsTestingSetup : public TestChain100Setup
     CWalletTx& AddTx(CRecipient recipient)
     {
         CTransactionRef tx;
-        CReserveKey reservekey(wallet.get());
+        CReserveKey<CPubKey> reservekey(wallet.get());
         CAmount fee;
         int changePos = -1;
         std::string error;
@@ -442,7 +442,7 @@ class CreateTransactionTestSetup : public TestChain100Setup
     bool CreateTransaction(const std::vector<std::pair<CAmount, bool>>& vecEntries, std::string strErrorExpected, int nChangePosRequest = -1, bool fCreateShouldSucceed = true, ChangeTest changeTest = ChangeTest::Skip)
     {
         CTransactionRef tx;
-        CReserveKey reservekey(wallet.get());
+        CReserveKey<CPubKey> reservekey(wallet.get());
         CAmount nFeeRet;
         int nChangePos = nChangePosRequest;
         std::string strError;
@@ -494,7 +494,7 @@ class CreateTransactionTestSetup : public TestChain100Setup
     std::vector<COutPoint> GetCoins(const std::vector<std::pair<CAmount, bool>>& vecEntries)
     {
         CTransactionRef tx;
-        CReserveKey reserveKey(wallet.get());
+        CReserveKey<CPubKey> reserveKey(wallet.get());
         CAmount nFeeRet;
         int nChangePosRet = -1;
         std::string strError;
@@ -831,8 +831,8 @@ BOOST_FIXTURE_TEST_CASE(select_coins_grouped_by_addresses, ListCoinsTestingSetup
     // Create two conflicting transactions, add one to the wallet and mine the other one.
     CTransactionRef tx1;
     CTransactionRef tx2;
-    CReserveKey reservekey1(wallet.get());
-    CReserveKey reservekey2(wallet.get());
+    CReserveKey<CPubKey> reservekey1(wallet.get());
+    CReserveKey<CPubKey> reservekey2(wallet.get());
     CAmount fee;
     int changePos = -1;
     std::string error;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6a29ff3000e5..1a60d57a9529 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3275,7 +3275,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
     if (tx.nVersion == 3 && tx.nType != TRANSACTION_NORMAL)
         nExtraPayloadSize = (int)tx.vExtraPayload.size();
 
-    CReserveKey reservekey(this);
+    CReserveKey<CPubKey> reservekey(this);
     CTransactionRef tx_new;
     if (!CreateTransaction(vecSend, tx_new, reservekey, nFeeRet, nChangePosInOut, strFailReason, coinControl, false, nExtraPayloadSize)) {
         return false;
@@ -3516,7 +3516,7 @@ bool CWallet::HasCollateralInputs(bool fOnlyConfirmed) const
 bool CWallet::GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAmount amount, const COutPoint& outpoint)
 {
     // make our change address
-    CReserveKey reservekey(this);
+    CReserveKey<CPubKey> reservekey(this);
 
     CScript scriptChange;
     scriptChange << OP_RETURN << ToByteVector(hash);
@@ -3540,7 +3540,7 @@ bool CWallet::GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAm
     return true;
 }
 
-bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet,
+bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey<CPubKey>& reservekey, CAmount& nFeeRet,
                          int& nChangePosInOut, std::string& strFailReason, const CCoinControl& coin_control, bool sign, int nExtraPayloadSize)
 {
     CAmount nValue = 0;
@@ -3961,7 +3961,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
 /**
  * Call after CreateTransaction unless you want to abort
  */
-bool CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, std::string fromAccount, CReserveKey& reservekey, CConnman* connman, CValidationState& state)
+bool CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, std::string fromAccount, CReserveKey<CPubKey>& reservekey, CConnman* connman, CValidationState& state)
 {
     {
         LOCK2(cs_main, mempool.cs);
@@ -4250,7 +4250,7 @@ size_t CWallet::KeypoolCountExternalKeys()
     return setExternalKeyPool.size();
 }
 
-void CWallet::LoadKeyPool(int64_t nIndex, const CKeyPool &keypool)
+void CWallet::LoadKeyPool(int64_t nIndex, const CKeyPool<CPubKey> &keypool)
 {
     AssertLockHeld(cs_wallet);
     if (keypool.fInternal) {
@@ -4320,7 +4320,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
 
             // TODO: implement keypools for all accounts?
             CPubKey pubkey(GenerateNewKey(batch, 0, fInternal));
-            if (!batch.WritePool(index, CKeyPool(pubkey, fInternal))) {
+            if (!batch.WritePool(index, CKeyPool<CPubKey>(pubkey, fInternal))) {
                 throw std::runtime_error(std::string(__func__) + ": writing generated key failed");
             }
 
@@ -4345,7 +4345,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
     return true;
 }
 
-bool CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRequestedInternal)
+bool CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool<CPubKey>& keypool, bool fRequestedInternal)
 {
     nIndex = -1;
     keypool.vchPubKey = CPubKey();
@@ -4421,7 +4421,7 @@ bool CWallet::GetKeyFromPool(CPubKey& result, bool internal)
         return false;
     }
 
-    CKeyPool keypool;
+    CKeyPool<CPubKey> keypool;
     {
         LOCK(cs_wallet);
         int64_t nIndex;
@@ -4440,7 +4440,7 @@ bool CWallet::GetKeyFromPool(CPubKey& result, bool internal)
 }
 
 static int64_t GetOldestKeyInPool(const std::set<int64_t>& setKeyPool, WalletBatch& batch) {
-    CKeyPool keypool;
+    CKeyPool<CPubKey> keypool;
     int64_t nIndex = *(setKeyPool.begin());
     if (!batch.ReadPool(nIndex, keypool)) {
         throw std::runtime_error(std::string(__func__) + ": read oldest key in keypool failed");
@@ -4637,7 +4637,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
         const int64_t& index = *(it);
         if (index > keypool_id) break; // set*KeyPool is ordered
 
-        CKeyPool keypool;
+        CKeyPool<CPubKey> keypool;
         if (batch.ReadPool(index, keypool)) { //TODO: This should be unnecessary
             m_pool_key_to_index.erase(keypool.vchPubKey.GetID());
         }
@@ -4649,7 +4649,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
 
 void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)
 {
-    std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
+    std::shared_ptr<CReserveKey<CPubKey>> rKey = std::make_shared<CReserveKey<CPubKey>>(this);
     CPubKey pubkey;
     if (!rKey->GetReservedKey(pubkey, false))
         return;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 32f345d286f3..86d3049e6cea 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -830,7 +830,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
      */
     const std::string& GetName() const { return m_location.GetName(); }
 
-    void LoadKeyPool(int64_t nIndex, const CKeyPool &keypool) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    void LoadKeyPool(int64_t nIndex, const CKeyPool<CPubKey> &keypool) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     // Map from Key ID to key metadata.
     std::map<CKeyID, CKeyMetadata> mapKeyMetadata GUARDED_BY(cs_wallet);
@@ -1051,9 +1051,9 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
      * selected by SelectCoins(); Also create the change output, when needed
      * @note passing nChangePosInOut as -1 will result in setting a random position
      */
-    bool CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
+    bool CreateTransaction(const std::vector<CRecipient>& vecSend, CTransactionRef& tx, CReserveKey<CPubKey>& reservekey, CAmount& nFeeRet, int& nChangePosInOut,
                            std::string& strFailReason, const CCoinControl& coin_control, bool sign = true, int nExtraPayloadSize = 0);
-    bool CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, std::string fromAccount, CReserveKey& reservekey, CConnman* connman, CValidationState& state);
+    bool CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm, std::string fromAccount, CReserveKey<CPubKey>& reservekey, CConnman* connman, CValidationState& state);
 
     void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries);
     bool AddAccountingEntry(const CAccountingEntry&);
@@ -1099,7 +1099,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
      *     was not found in the wallet, or was misclassified in the internal
      *     or external keypool
      */
-    bool ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRequestedInternal);
+    bool ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool<CPubKey>& keypool, bool fRequestedInternal);
     void KeepKey(int64_t nIndex);
     void ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey);
     bool GetKeyFromPool(CPubKey &key, bool fInternal /*= false*/);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 52d8f57f973f..7649089031d8 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -136,12 +136,12 @@ bool WalletBatch::WriteOrderPosNext(int64_t nOrderPosNext)
     return WriteIC(std::string("orderposnext"), nOrderPosNext);
 }
 
-bool WalletBatch::ReadPool(int64_t nPool, CKeyPool& keypool)
+bool WalletBatch::ReadPool(int64_t nPool, CKeyPool<CPubKey>& keypool)
 {
     return m_batch.Read(std::make_pair(std::string("pool"), nPool), keypool);
 }
 
-bool WalletBatch::WritePool(int64_t nPool, const CKeyPool& keypool)
+bool WalletBatch::WritePool(int64_t nPool, const CKeyPool<CPubKey>& keypool)
 {
     return WriteIC(std::make_pair(std::string("pool"), nPool), keypool);
 }
@@ -481,7 +481,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             int64_t nIndex;
             ssKey >> nIndex;
-            CKeyPool keypool;
+            CKeyPool<CPubKey> keypool;
             ssValue >> keypool;
             pwallet->LoadKeyPool(nIndex, keypool);
         }
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index f51ba6bb5736..4955bffb8897 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -148,8 +148,8 @@ class WalletBatch
 
     bool WriteOrderPosNext(int64_t nOrderPosNext);
 
-    bool ReadPool(int64_t nPool, CKeyPool& keypool);
-    bool WritePool(int64_t nPool, const CKeyPool& keypool);
+    bool ReadPool(int64_t nPool, CKeyPool<CPubKey>& keypool);
+    bool WritePool(int64_t nPool, const CKeyPool<CPubKey>& keypool);
     bool ErasePool(int64_t nPool);
 
     bool WriteMinVersion(int nVersion);

From 29bd6578e5d2ea11190ea1de0ebdc8c686eb30f7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:50:38 +0530
Subject: [PATCH 3/7] script: add new opcode for BLS12-381 transactions

---
 src/keystore.cpp                |  2 +-
 src/script/interpreter.cpp      |  4 +++-
 src/script/script.cpp           |  4 +++-
 src/script/script.h             |  4 +++-
 src/test/data/script_tests.json | 10 +++-------
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/keystore.cpp b/src/keystore.cpp
index fe28ea7a7938..3af3c95b53b4 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -106,7 +106,7 @@ static bool ExtractPubKey(const CScript &dest, CPubKey& pubKeyOut)
     pubKeyOut = CPubKey(vch);
     if (!pubKeyOut.IsFullyValid())
         return false;
-    if (!dest.GetOp(pc, opcode, vch) || opcode != OP_CHECKSIG || dest.GetOp(pc, opcode, vch))
+    if (!dest.GetOp(pc, opcode, vch) || opcode != OP_CHECKSIG || opcode != OP_BLS_CHECKSIG || dest.GetOp(pc, opcode, vch))
         return false;
     return true;
 }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index a22a4a5a1485..f68d23bf22cc 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -970,6 +970,8 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
 
                 case OP_CHECKSIG:
                 case OP_CHECKSIGVERIFY:
+                case OP_BLS_CHECKSIG:
+                case OP_BLS_CHECKSIGVERIFY:
                 {
                     // (sig pubkey -- bool)
                     if (stack.size() < 2)
@@ -1000,7 +1002,7 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                     popstack(stack);
                     popstack(stack);
                     stack.push_back(fSuccess ? vchTrue : vchFalse);
-                    if (opcode == OP_CHECKSIGVERIFY)
+                    if (opcode == OP_CHECKSIGVERIFY || opcode == OP_BLS_CHECKSIGVERIFY)
                     {
                         if (fSuccess)
                             popstack(stack);
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 78bc07a6f332..e9a1d1df02cf 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -142,6 +142,8 @@ const char* GetOpName(opcodetype opcode)
 
     case OP_CHECKDATASIG           : return "OP_CHECKDATASIG";
     case OP_CHECKDATASIGVERIFY     : return "OP_CHECKDATASIGVERIFY";
+    case OP_BLS_CHECKSIG           : return "OP_BLS_CHECKSIG";
+    case OP_BLS_CHECKSIGVERIFY     : return "OP_BLS_CHECKSIGVERIFY";
 
     case OP_INVALIDOPCODE          : return "OP_INVALIDOPCODE";
 
@@ -160,7 +162,7 @@ unsigned int CScript::GetSigOpCount(bool fAccurate) const
         opcodetype opcode;
         if (!GetOp(pc, opcode))
             break;
-        if (opcode == OP_CHECKSIG || opcode == OP_CHECKSIGVERIFY)
+        if (opcode == OP_CHECKSIG || opcode == OP_CHECKSIGVERIFY || opcode == OP_BLS_CHECKSIG || opcode == OP_BLS_CHECKSIGVERIFY)
             n++;
         else if (opcode == OP_CHECKMULTISIG || opcode == OP_CHECKMULTISIGVERIFY)
         {
diff --git a/src/script/script.h b/src/script/script.h
index c1514e1aa0f6..1758cc5c615f 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -192,12 +192,14 @@ enum opcodetype
     // More crypto
     OP_CHECKDATASIG = 0xba,
     OP_CHECKDATASIGVERIFY = 0xbb,
+    OP_BLS_CHECKSIG = 0xbc,
+    OP_BLS_CHECKSIGVERIFY = 0xbd,
 
     OP_INVALIDOPCODE = 0xff,
 };
 
 // Maximum value that an opcode can be
-static const unsigned int MAX_OPCODE = OP_CHECKDATASIGVERIFY;
+static const unsigned int MAX_OPCODE = OP_BLS_CHECKSIGVERIFY;
 
 const char* GetOpName(opcodetype opcode);
 
diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
index 48c4ddb5f6f5..b9df77d0391f 100644
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@@ -252,9 +252,7 @@
 ["0", "IF NOP10 ENDIF 1", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "OK",
  "Discouraged NOPs are allowed if not executed"],
 
-["0", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC", "OK", "opcodes above MAX_OPCODE invalid if executed"],
-["0", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
-["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK", "opcodes above MAX_OPCODE invalid if executed"],
 ["0", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
@@ -1282,9 +1280,7 @@
  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS", "Discouraged NOP10 in redeemScript"],
 
 ["0x50","1", "P2SH,STRICTENC", "BAD_OPCODE", "opcode 0x50 is reserved"],
-["1", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "opcodes above MAX_OPCODE invalid if executed"],
-["1", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
-["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "opcodes above MAX_OPCODE invalid if executed"],
 ["1", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
@@ -1403,7 +1399,7 @@
 ["1","RESERVED", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED is reserved"],
 ["1","RESERVED1", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED1 is reserved"],
 ["1","RESERVED2", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED2 is reserved"],
-["1","0xbc", "P2SH,STRICTENC", "BAD_OPCODE", "0xbc == MAX_OPCODE + 1"],
+["1","0xbe", "P2SH,STRICTENC", "BAD_OPCODE", "0xbe == MAX_OPCODE + 1"],
 
 ["2147483648", "1ADD 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers"],
 ["2147483648", "NEGATE 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers"],

From 77e845dc8dd2a6655f507d19f81a4d75d1fa8d47 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:54:42 +0530
Subject: [PATCH 4/7] crypto: add RIPEMD-160 based CBLSKeyID for CTxDestination

---
 src/bls/bls.cpp |  9 ++++++++-
 src/bls/bls.h   | 31 ++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index 47aeb8e3f9d1..d2bee13576e4 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -21,7 +21,14 @@ static const std::unique_ptr<bls::CoreMPL>& Scheme(const bool fLegacy)
     return fLegacy ? pSchemeLegacy : pScheme;
 }
 
-CBLSId::CBLSId(const uint256& nHash) : CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>()
+CBLSId::CBLSId(const uint256& nHash) : CBLSWrapper<CBLSIdImplicit<uint256>, BLS_CURVE_ID_SIZE, CBLSId>()
+{
+    impl = nHash;
+    fValid = true;
+    cachedHash.SetNull();
+}
+
+CBLSKeyID::CBLSKeyID(const uint160& nHash) : CBLSWrapper<CBLSIdImplicit<uint160>, BLS_CURVE_ID_SIZE, CBLSKeyID>()
 {
     impl = nHash;
     fValid = true;
diff --git a/src/bls/bls.h b/src/bls/bls.h
index 94bcb41f95f6..a1f816dccc1a 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -152,6 +152,12 @@ class CBLSWrapper
         return IsValid();
     }
 
+    //! CKey-like read only interface to access byte vector
+    unsigned int size() const { return (new std::vector<uint8_t>(ToByteVector()))->size(); }
+    const unsigned char* begin() const { return (new std::vector<uint8_t>(ToByteVector()))->data(); }
+    const unsigned char* end() const { return (new std::vector<uint8_t>(ToByteVector()))->data() + size(); }
+    const unsigned char& operator[](unsigned int pos) const { return (new std::vector<uint8_t>(ToByteVector()))->data()[pos]; }
+
 public:
     inline void Serialize(CSizeComputer& s) const
     {
@@ -193,12 +199,13 @@ class CBLSWrapper
     }
 };
 
-struct CBLSIdImplicit : public uint256
+template <typename T1>
+struct CBLSIdImplicit : public T1
 {
     CBLSIdImplicit() = default;
-    CBLSIdImplicit(const uint256& id)
+    CBLSIdImplicit(const T1& id)
     {
-        memcpy(begin(), id.begin(), sizeof(uint256));
+        memcpy(this->begin(), id.begin(), sizeof(T1));
     }
     static CBLSIdImplicit FromBytes(const uint8_t* buffer, const bool fLegacy = false)
     {
@@ -208,11 +215,11 @@ struct CBLSIdImplicit : public uint256
     }
     std::vector<uint8_t> Serialize(const bool fLegacy = false) const
     {
-        return {begin(), end()};
+        return {this->begin(), this->end()};
     }
 };
 
-class CBLSId : public CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>
+class CBLSId : public CBLSWrapper<CBLSIdImplicit<uint256>, BLS_CURVE_ID_SIZE, CBLSId>
 {
 public:
     using CBLSWrapper::operator=;
@@ -224,6 +231,20 @@ class CBLSId : public CBLSWrapper<CBLSIdImplicit, BLS_CURVE_ID_SIZE, CBLSId>
     explicit CBLSId(const uint256& nHash);
 };
 
+class CBLSKeyID : public CBLSWrapper<CBLSIdImplicit<uint160>, BLS_CURVE_ID_SIZE, CBLSKeyID>
+{
+public:
+    using CBLSWrapper::operator=;
+    using CBLSWrapper::operator==;
+    using CBLSWrapper::operator!=;
+    using CBLSWrapper::CBLSWrapper;
+
+    CBLSKeyID() = default;
+    explicit CBLSKeyID(const uint160& nHash);
+
+    friend inline bool operator<(const CBLSKeyID& a, const CBLSKeyID& b) { return a.impl.Compare(b.impl) < 0; }
+};
+
 class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE, CBLSSecretKey>
 {
 public:

From 22bc9d5c9c5b4863c165beb3afae87ca04b31a44 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:55:01 +0530
Subject: [PATCH 5/7] trivial: add headers needed before CTxDestination
 addition

---
 src/compressor.cpp               | 1 +
 src/evo/simplifiedmns.cpp        | 1 +
 src/interfaces/wallet.h          | 1 +
 src/key_io.h                     | 1 +
 src/keystore.h                   | 1 +
 src/rpc/util.cpp                 | 1 +
 src/rpc/util.h                   | 1 +
 src/script/descriptor.cpp        | 1 +
 src/script/standard.cpp          | 1 +
 src/test/test_dash.h             | 1 +
 src/wallet/coincontrol.h         | 1 +
 src/wallet/test/wallet_tests.cpp | 1 +
 12 files changed, 12 insertions(+)

diff --git a/src/compressor.cpp b/src/compressor.cpp
index b003a86ce7a4..5a4087c79924 100644
--- a/src/compressor.cpp
+++ b/src/compressor.cpp
@@ -5,6 +5,7 @@
 
 #include <compressor.h>
 
+#include <bls/bls.h>
 #include <hash.h>
 #include <pubkey.h>
 #include <script/standard.h>
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 3606248bc2ed..dcaad2bd5154 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -10,6 +10,7 @@
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 
+#include <bls/bls.h>
 #include <pubkey.h>
 #include <serialize.h>
 #include <version.h>
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index d681f49a6ba6..afafc2077146 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -8,6 +8,7 @@
 #include <amount.h>                    // For CAmount
 #include <fs.h>                        // For fs::path
 #include <pubkey.h>                    // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
+#include <bls/bls.h>                   // For CBLSKeyID (definition needed in CTxDestination instantiation)
 #include <script/ismine.h>             // For isminefilter, isminetype
 #include <script/standard.h>           // For CTxDestination
 #include <support/allocators/secure.h> // For SecureString
diff --git a/src/key_io.h b/src/key_io.h
index d75b5b31c82d..a468bb0f1770 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_KEY_IO_H
 #define BITCOIN_KEY_IO_H
 
+#include <bls/bls.h>
 #include <chainparams.h>
 #include <key.h>
 #include <pubkey.h>
diff --git a/src/keystore.h b/src/keystore.h
index 61d050286941..e1b3de35e391 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_KEYSTORE_H
 #define BITCOIN_KEYSTORE_H
 
+#include <bls/bls.h>
 #include <hdchain.h>
 #include <key.h>
 #include <pubkey.h>
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 2c904b3ba50b..844c138df2b8 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <bls/bls.h>
 #include <key_io.h>
 #include <keystore.h>
 #include <pubkey.h>
diff --git a/src/rpc/util.h b/src/rpc/util.h
index cc0b305f0a25..b67bed5f6d2e 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_RPC_UTIL_H
 #define BITCOIN_RPC_UTIL_H
 
+#include <bls/bls.h>
 #include <node/transaction.h>
 #include <pubkey.h>
 #include <script/standard.h>
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index 2f39bf634fb4..76c6a28a2881 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -4,6 +4,7 @@
 
 #include <script/descriptor.h>
 
+#include <bls/bls.h>
 #include <key_io.h>
 #include <pubkey.h>
 #include <script/script.h>
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 4211385d5743..92c42d8609ae 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -5,6 +5,7 @@
 
 #include <script/standard.h>
 
+#include <bls/bls.h>
 #include <pubkey.h>
 #include <script/script.h>
 #include <util/system.h>
diff --git a/src/test/test_dash.h b/src/test/test_dash.h
index c91dcd24fc04..f28e7d9c3a5c 100644
--- a/src/test/test_dash.h
+++ b/src/test/test_dash.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_TEST_TEST_DASH_H
 #define BITCOIN_TEST_TEST_DASH_H
 
+#include <bls/bls.h>
 #include <chainparamsbase.h>
 #include <fs.h>
 #include <key.h>
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 4f7669ae980f..f609df67069e 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_WALLET_COINCONTROL_H
 #define BITCOIN_WALLET_COINCONTROL_H
 
+#include <bls/bls.h>
 #include <key.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 639e7710cded..83716bde44e6 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -11,6 +11,7 @@
 #include <utility>
 #include <vector>
 
+#include <bls/bls.h>
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <rpc/server.h>

From 08da0221899ce2edaafde8e8db76900c4b479e05 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:39:47 +0530
Subject: [PATCH 6/7] script: add CBLSKeyID to CTxDestination variant

---
 src/chainparams.cpp      | 8 ++++++++
 src/chainparams.h        | 1 +
 src/key_io.cpp           | 7 +++++++
 src/rpc/util.cpp         | 6 ++++++
 src/script/standard.cpp  | 6 ++++++
 src/script/standard.h    | 3 ++-
 src/wallet/rpcwallet.cpp | 5 +++++
 src/wallet/wallet.cpp    | 4 ++++
 8 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 95a0bf284823..0b5c2be789f5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -443,6 +443,8 @@ class CMainParams : public CChainParams {
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,16);
         // Dash private keys start with '7' or 'X'
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,204);
+        // Dash BLS addresses start with 'D'
+        base58Prefixes[PUBKEY_ADDRESS_BLS] = std::vector<unsigned char>(1,30);
         // Dash BIP32 pubkeys start with 'xpub' (Bitcoin defaults)
         base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xB2, 0x1E};
         // Dash BIP32 prvkeys start with 'xprv' (Bitcoin defaults)
@@ -645,6 +647,8 @@ class CTestNetParams : public CChainParams {
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
         // Testnet private keys start with '9' or 'c' (Bitcoin defaults)
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
+        // Testnet Dash BLS addresses start with '5'
+        base58Prefixes[PUBKEY_ADDRESS_BLS] = std::vector<unsigned char>(1,10);
         // Testnet Dash BIP32 pubkeys start with 'tpub' (Bitcoin defaults)
         base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF};
         // Testnet Dash BIP32 prvkeys start with 'tprv' (Bitcoin defaults)
@@ -827,6 +831,8 @@ class CDevNetParams : public CChainParams {
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
         // Testnet private keys start with '9' or 'c' (Bitcoin defaults)
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
+        // Testnet Dash BLS addresses start with '5'
+        base58Prefixes[PUBKEY_ADDRESS_BLS] = std::vector<unsigned char>(1,10);
         // Testnet Dash BIP32 pubkeys start with 'tpub' (Bitcoin defaults)
         base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF};
         // Testnet Dash BIP32 prvkeys start with 'tprv' (Bitcoin defaults)
@@ -1007,6 +1013,8 @@ class CRegTestParams : public CChainParams {
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
         // Regtest private keys start with '9' or 'c' (Bitcoin defaults)
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
+        // Regtest Dash BLS addresses start with '5'
+        base58Prefixes[PUBKEY_ADDRESS_BLS] = std::vector<unsigned char>(1,10);
         // Regtest Dash BIP32 pubkeys start with 'tpub' (Bitcoin defaults)
         base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x35, 0x87, 0xCF};
         // Regtest Dash BIP32 prvkeys start with 'tprv' (Bitcoin defaults)
diff --git a/src/chainparams.h b/src/chainparams.h
index ce30aaad77c2..bbda337322a6 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -53,6 +53,7 @@ class CChainParams
         SECRET_KEY,     // BIP16
         EXT_PUBLIC_KEY, // BIP32
         EXT_SECRET_KEY, // BIP32
+        PUBKEY_ADDRESS_BLS,
 
         MAX_BASE58_TYPES
     };
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 5dc4113144d2..8722a0ec89f1 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -33,6 +33,13 @@ class DestinationEncoder : public boost::static_visitor<std::string>
         return EncodeBase58Check(data);
     }
 
+    std::string operator()(const CBLSKeyID& id) const
+    {
+        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::PUBKEY_ADDRESS_BLS);
+        data.insert(data.end(), id.begin(), id.end());
+        return EncodeBase58Check(data);
+    }
+
     std::string operator()(const CScriptID& id) const
     {
         std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 844c138df2b8..297c4abf93fe 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -87,6 +87,12 @@ class DescribeAddressVisitor : public boost::static_visitor<UniValue>
         obj.pushKV("isscript", true);
         return obj;
     }
+
+    UniValue operator()(const CBLSKeyID &keyID) const {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("isscript", false);
+        return obj;
+    }
 };
 
 UniValue DescribeAddress(const CTxDestination& dest)
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 92c42d8609ae..1e2e187b3d5f 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -215,6 +215,12 @@ class CScriptVisitor : public boost::static_visitor<bool>
         return false;
     }
 
+    bool operator()(const CBLSKeyID &keyID) const {
+        script->clear();
+        *script << OP_DUP << OP_HASH160 << keyID.ToByteVector() << OP_EQUALVERIFY << OP_BLS_CHECKSIG;
+        return true;
+    }
+
     bool operator()(const CKeyID &keyID) const {
         script->clear();
         *script << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
diff --git a/src/script/standard.h b/src/script/standard.h
index a4baf26232a6..9bdac54afe68 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -15,6 +15,7 @@
 
 static const bool DEFAULT_ACCEPT_DATACARRIER = true;
 
+class CBLSKeyID;
 class CKeyID;
 class CScript;
 
@@ -76,7 +77,7 @@ class CNoDestination {
  *  * CScriptID: TX_SCRIPTHASH destination
  *  A CTxDestination is the internal data type encoded in a bitcoin address
  */
-typedef boost::variant<CNoDestination, CKeyID, CScriptID> CTxDestination;
+typedef boost::variant<CNoDestination, CKeyID, CScriptID, CBLSKeyID> CTxDestination;
 
 /** Check whether a CTxDestination is a CNoDestination. */
 bool IsValidDestination(const CTxDestination& dest);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 775eec67c814..0ad1ed2555c5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4109,6 +4109,11 @@ class DescribeWalletAddressVisitor : public boost::static_visitor<UniValue>
         return obj;
     }
 
+    UniValue operator()(const CBLSKeyID &keyID) const {
+        throw std::runtime_error("Unimplemented logic!");
+        return UniValue(UniValue::VOBJ);
+    }
+
     UniValue operator()(const CScriptID &scriptID) const {
         UniValue obj(UniValue::VOBJ);
         CScript subscript;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1a60d57a9529..3349d3fe111c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -160,6 +160,10 @@ class CAffectedKeysVisitor : public boost::static_visitor<void> {
             Process(script);
     }
 
+    void operator()(const CBLSKeyID &keyId) {
+        throw std::runtime_error("Unimplemented logic!");
+    }
+
     void operator()(const CNoDestination &none) {}
 };
 

From f035a2be9bd516d8b5a937655429f3a8c4d1b5c8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:46:22 +0530
Subject: [PATCH 7/7] crypto: introduce non-legacy BLS public/private key
 objects

- Comes with CPubKey/CKey-like structures for easier code reuse
- CPrivKey is just a vector with secure_allocator so instead of including key.h, we just explicitly define it as a secure vector
---
 src/bls/bls.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/bls/bls.h   | 39 +++++++++++++++++++++++++++++++++--
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp
index d2bee13576e4..44a0fb3a082a 100644
--- a/src/bls/bls.cpp
+++ b/src/bls/bls.cpp
@@ -400,3 +400,57 @@ bool BLSInit()
 #endif
     return true;
 }
+
+bool CSecretKey::Load(const std::vector<unsigned char, secure_allocator<unsigned char> >& privkey, const CPublicKey& vchPubKey, bool fSkipCheck)
+{
+    CPublicKey pkTmp;
+    std::vector<unsigned char> vchTmp;
+    vchTmp.assign(privkey.begin(), privkey.end());
+    pkTmp.SetByteVector(vchTmp);
+    SetByteVector(vchTmp);
+    return fSkipCheck ? IsValid() : IsValid() && vchPubKey == pkTmp;
+}
+
+bool CSecretKey::Sign(const uint256& hash, std::vector<unsigned char>& vchSig) const
+{
+    CBLSSignature sig = Sign(hash);
+    if (sig.IsValid()) {
+        vchSig = sig.ToByteVector();
+        return true;
+    }
+    return false;
+}
+
+bool CSecretKey::VerifyPubKey(const CPublicKey& vchPubKey) const
+{
+    CPublicKey vchTmp;
+    vchTmp.SetByteVector(ToByteVector());
+    return vchPubKey == vchTmp;
+}
+
+CBLSKeyID CPublicKey::GetID() const
+{
+    return CBLSKeyID(Hash160(ToByteVector()));
+}
+
+uint256 CPublicKey::GetHash() const
+{
+    return uint256(ToByteVector());
+}
+
+bool CPublicKey::Verify(const uint256& hash, const std::vector<unsigned char>& vchSig) const
+{
+    return CBLSSignature(vchSig, false).VerifyInsecure(*this, hash);
+}
+
+std::vector<unsigned char, secure_allocator<unsigned char> > CSecretKey::GetPrivKey() const
+{
+    return std::vector<unsigned char, secure_allocator<unsigned char> >(ToByteVector().begin(), ToByteVector().end());
+}
+
+CPublicKey CSecretKey::GetPubKey() const
+{
+    CPublicKey vchPubKey;
+    vchPubKey.SetByteVector(ToByteVector());
+    return vchPubKey;
+}
\ No newline at end of file
diff --git a/src/bls/bls.h b/src/bls/bls.h
index a1f816dccc1a..bc4005e21cef 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -10,6 +10,8 @@
 #include <uint256.h>
 #include <util/strencodings.h>
 
+#include <support/allocators/secure.h>
+
 // bls-dash uses relic, which may define DEBUG and ERROR, which leads to many warnings in some build setups
 #undef ERROR
 #undef DEBUG
@@ -32,6 +34,8 @@ static const bool fLegacyDefault{true};
 #define BLS_CURVE_PUBKEY_SIZE 48
 #define BLS_CURVE_SIG_SIZE 96
 
+class CPublicKey;
+class CSecretKey;
 class CBLSSignature;
 class CBLSPublicKey;
 
@@ -42,10 +46,9 @@ class CBLSWrapper
     friend class CBLSPublicKey;
     friend class CBLSSignature;
 
-    bool fLegacy;
-
 protected:
     ImplType impl;
+    bool fLegacy = fLegacyDefault;
     bool fValid{false};
     mutable uint256 cachedHash;
 
@@ -269,6 +272,25 @@ class CBLSSecretKey : public CBLSWrapper<bls::PrivateKey, BLS_CURVE_SECKEY_SIZE,
     CBLSSignature Sign(const uint256& hash) const;
 };
 
+class CSecretKey : public CBLSSecretKey
+{
+protected:
+    bool fLegacy = false;
+public:
+    using CBLSSecretKey::Sign;
+
+    CSecretKey() = default;
+    CSecretKey(const CSecretKey&) = default;
+    CSecretKey& operator=(const CSecretKey&) = default;
+
+    std::vector<unsigned char, secure_allocator<unsigned char> > GetPrivKey() const;
+    CPublicKey GetPubKey() const;
+
+    bool Load(const std::vector<unsigned char, secure_allocator<unsigned char> >& privkey, const CPublicKey& vchPubKey, bool fSkipCheck);
+    bool Sign(const uint256& hash, std::vector<unsigned char>& vchSig) const;
+    bool VerifyPubKey(const CPublicKey& vchPubKey) const;
+};
+
 class CBLSPublicKey : public CBLSWrapper<bls::G1Element, BLS_CURVE_PUBKEY_SIZE, CBLSPublicKey>
 {
     friend class CBLSSecretKey;
@@ -290,6 +312,19 @@ class CBLSPublicKey : public CBLSWrapper<bls::G1Element, BLS_CURVE_PUBKEY_SIZE,
 
 };
 
+class CPublicKey : public CBLSPublicKey
+{
+protected:
+    bool fLegacy = false;
+public:
+    CPublicKey() = default;
+
+    CBLSKeyID GetID() const;
+    uint256 GetHash() const;
+
+    bool Verify(const uint256& hash, const std::vector<unsigned char>& vchSig) const;
+};
+
 class CBLSSignature : public CBLSWrapper<bls::G2Element, BLS_CURVE_SIG_SIZE, CBLSSignature>
 {
     friend class CBLSSecretKey;