LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Remove CKeyStore and squash into CBasicKeyStore

Browse source
This commit is contained in:
Andrew Chow 2019-06-06 16:31:31 +02:00
parent 1b699a5083
commit c7797ec655
8 changed files with 30 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bitcoin-tx.cpp
View file

@ -631,7 +631,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
} }
} }
const CKeyStore& keystore = tempKeystore; const CBasicKeyStore& keystore = tempKeystore;
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE); bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);

4
src/keystore.cpp
View file

@ -174,7 +174,7 @@ bool CBasicKeyStore::HaveWatchOnly() const
return (!setWatchOnly.empty()); return (!setWatchOnly.empty());
} }
CKeyID GetKeyForDestination(const CKeyStore& store, const CTxDestination& dest) CKeyID GetKeyForDestination(const CBasicKeyStore& store, const CTxDestination& dest)
{ {
// Only supports destinations which map to single public keys, i.e. P2PKH, // Only supports destinations which map to single public keys, i.e. P2PKH,
// P2WPKH, and P2SH-P2WPKH. // P2WPKH, and P2SH-P2WPKH.
@ -197,7 +197,7 @@ CKeyID GetKeyForDestination(const CKeyStore& store, const CTxDestination& dest)
return CKeyID(); return CKeyID();
} }
bool HaveKey(const CKeyStore& store, const CKey& key) bool HaveKey(const CBasicKeyStore& store, const CKey& key)
{ {
CKey key2; CKey key2;
key2.Set(key.begin(), key.end(), !key.IsCompressed()); key2.Set(key.begin(), key.end(), !key.IsCompressed());

57
src/keystore.h
View file

@ -15,29 +15,8 @@
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
/** A virtual base class for key stores */
class CKeyStore : public SigningProvider
{
public:
//! Add a key to the store.
virtual bool AddKeyPubKey(const CKey &key, const CPubKey &pubkey) =0;
//! Check whether a key corresponding to a given address is present in the store.
virtual std::set<CKeyID> GetKeys() const =0;
//! Support for BIP 0013 : see https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki
virtual bool AddCScript(const CScript& redeemScript) =0;
virtual std::set<CScriptID> GetCScripts() const =0;
//! Support for Watch-only addresses
virtual bool AddWatchOnly(const CScript &dest) =0;
virtual bool RemoveWatchOnly(const CScript &dest) =0;
virtual bool HaveWatchOnly(const CScript &dest) const =0;
virtual bool HaveWatchOnly() const =0;
};
/** Basic key store, that keeps keys in an address->secret map */ /** Basic key store, that keeps keys in an address->secret map */
class CBasicKeyStore : public CKeyStore class CBasicKeyStore : public SigningProvider
{ {
protected: protected:
mutable CCriticalSection cs_KeyStore; mutable CCriticalSection cs_KeyStore;
@ -55,27 +34,27 @@ protected:
void ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); void ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore);
public: public:
bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override; virtual bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
bool AddKey(const CKey &key) { return AddKeyPubKey(key, key.GetPubKey()); } virtual bool AddKey(const CKey &key) { return AddKeyPubKey(key, key.GetPubKey()); }
bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override; virtual bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
bool HaveKey(const CKeyID &address) const override; virtual bool HaveKey(const CKeyID &address) const override;
std::set<CKeyID> GetKeys() const override; virtual std::set<CKeyID> GetKeys() const;
bool GetKey(const CKeyID &address, CKey &keyOut) const override; virtual bool GetKey(const CKeyID &address, CKey &keyOut) const override;
bool AddCScript(const CScript& redeemScript) override; virtual bool AddCScript(const CScript& redeemScript);
bool HaveCScript(const CScriptID &hash) const override; virtual bool HaveCScript(const CScriptID &hash) const override;
std::set<CScriptID> GetCScripts() const override; virtual std::set<CScriptID> GetCScripts() const;
bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override; virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override;
bool AddWatchOnly(const CScript &dest) override; virtual bool AddWatchOnly(const CScript &dest);
bool RemoveWatchOnly(const CScript &dest) override; virtual bool RemoveWatchOnly(const CScript &dest);
bool HaveWatchOnly(const CScript &dest) const override; virtual bool HaveWatchOnly(const CScript &dest) const;
bool HaveWatchOnly() const override; virtual bool HaveWatchOnly() const;
}; };
/** Return the CKeyID of the key involved in a script (if there is a unique one). */ /** Return the CKeyID of the key involved in a script (if there is a unique one). */
CKeyID GetKeyForDestination(const CKeyStore& store, const CTxDestination& dest); CKeyID GetKeyForDestination(const CBasicKeyStore& store, const CTxDestination& dest);
/** Checks if a CKey is in the given CKeyStore compressed or otherwise*/ /** Checks if a CKey is in the given CBasicKeyStore compressed or otherwise*/
bool HaveKey(const CKeyStore& store, const CKey& key); bool HaveKey(const CBasicKeyStore& store, const CKey& key);
#endif // BITCOIN_KEYSTORE_H #endif // BITCOIN_KEYSTORE_H

2
src/outputtype.cpp
View file

@ -73,7 +73,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
} }
} }
CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType type) CTxDestination AddAndGetDestinationForScript(CBasicKeyStore& keystore, const CScript& script, OutputType type)
{ {
// Add script to keystore // Add script to keystore
keystore.AddCScript(script); keystore.AddCScript(script);

2
src/outputtype.h
View file

@ -44,7 +44,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
* This function will automatically add the script (and any other * This function will automatically add the script (and any other
* necessary scripts) to the keystore. * necessary scripts) to the keystore.
*/ */
CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType); CTxDestination AddAndGetDestinationForScript(CBasicKeyStore& keystore, const CScript& script, OutputType);
#endif // BITCOIN_OUTPUTTYPE_H #endif // BITCOIN_OUTPUTTYPE_H

6
src/rpc/util.cpp
View file

@ -131,8 +131,8 @@ CPubKey HexToPubKey(const std::string& hex_in)
return vchPubKey; return vchPubKey;
} }
// Retrieves a public key for an address from the given CKeyStore // Retrieves a public key for an address from the given CBasicKeyStore
CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in) CPubKey AddrToPubKey(CBasicKeyStore* const keystore, const std::string& addr_in)
{ {
CTxDestination dest = DecodeDestination(addr_in); CTxDestination dest = DecodeDestination(addr_in);
if (!IsValidDestination(dest)) { if (!IsValidDestination(dest)) {
@ -153,7 +153,7 @@ CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in)
} }
// Creates a multisig address from a given list of public keys, number of signatures required, and the address type // Creates a multisig address from a given list of public keys, number of signatures required, and the address type
CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CKeyStore& keystore, CScript& script_out) CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CBasicKeyStore& keystore, CScript& script_out)
{ {
// Gather public keys // Gather public keys
if (required < 1) { if (required < 1) {

6
src/rpc/util.h
View file

@ -19,7 +19,7 @@
#include <boost/variant.hpp> #include <boost/variant.hpp>
class CKeyStore; class CBasicKeyStore;
class CPubKey; class CPubKey;
class CScript; class CScript;
struct InitInterfaces; struct InitInterfaces;
@ -72,8 +72,8 @@ extern std::string HelpExampleCli(const std::string& methodname, const std::stri
extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args); extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args);
CPubKey HexToPubKey(const std::string& hex_in); CPubKey HexToPubKey(const std::string& hex_in);
CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in); CPubKey AddrToPubKey(CBasicKeyStore* const keystore, const std::string& addr_in);
CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CKeyStore& keystore, CScript& script_out); CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CBasicKeyStore& keystore, CScript& script_out);
UniValue DescribeAddress(const CTxDestination& dest); UniValue DescribeAddress(const CTxDestination& dest);

2
src/test/transaction_tests.cpp
View file

@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE(test_Get)
BOOST_CHECK_EQUAL(coins.GetValueIn(CTransaction(t1)), (50+21+22)*CENT); BOOST_CHECK_EQUAL(coins.GetValueIn(CTransaction(t1)), (50+21+22)*CENT);
} }
static void CreateCreditAndSpend(const CKeyStore& keystore, const CScript& outscript, CTransactionRef& output, CMutableTransaction& input, bool success = true) static void CreateCreditAndSpend(const CBasicKeyStore& keystore, const CScript& outscript, CTransactionRef& output, CMutableTransaction& input, bool success = true)
{ {
CMutableTransaction outputm; CMutableTransaction outputm;
outputm.nVersion = 1; outputm.nVersion = 1;