scripted-diff: rename CBasicKeyStore to FillableSigningProvider

achow101 · achow101 · commit d9becff4e13d · 2019-07-09T16:20:18.000-04:00
-BEGIN VERIFY SCRIPT-
git grep -l "CBasicKeyStore" | xargs sed -i -e 's/CBasicKeyStore/FillableSigningProvider/g'
-END VERIFY SCRIPT-
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -375,7 +375,7 @@ reported in the debug.log file.
 
 Re-architecting the core code so there are better-defined interfaces
 between the various components is a goal, with any necessary locking
-done by the components (e.g. see the self-contained `CBasicKeyStore` class
+done by the components (e.g. see the self-contained `FillableSigningProvider` class
 and its `cs_KeyStore` lock for example).
 
 Threads
diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp
@@ -17,7 +17,7 @@
 // paid to a TX_PUBKEYHASH.
 //
 static std::vector<CMutableTransaction>
-SetupDummyInputs(CBasicKeyStore& keystoreRet, CCoinsViewCache& coinsRet)
+SetupDummyInputs(FillableSigningProvider& keystoreRet, CCoinsViewCache& coinsRet)
 {
     std::vector<CMutableTransaction> dummyTransactions;
     dummyTransactions.resize(2);
@@ -55,7 +55,7 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, CCoinsViewCache& coinsRet)
 // (https://github.com/bitcoin/bitcoin/issues/7883#issuecomment-224807484)
 static void CCoinsCaching(benchmark::State& state)
 {
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CCoinsView coinsDummy;
     CCoinsViewCache coins(&coinsDummy);
     std::vector<CMutableTransaction> dummyTransactions = SetupDummyInputs(keystore, coins);
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -557,7 +557,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
 
     if (!registers.count("privatekeys"))
         throw std::runtime_error("privatekeys register variable must be set.");
-    CBasicKeyStore tempKeystore;
+    FillableSigningProvider tempKeystore;
     UniValue keysObj = registers["privatekeys"];
 
     for (unsigned int kidx = 0; kidx < keysObj.size(); kidx++) {
@@ -631,7 +631,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
         }
     }
 
-    const CBasicKeyStore& keystore = tempKeystore;
+    const FillableSigningProvider& keystore = tempKeystore;
 
     bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
 
diff --git a/src/keystore.cpp b/src/keystore.cpp
@@ -7,7 +7,7 @@
 
 #include <util/system.h>
 
-void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)
+void FillableSigningProvider::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)
 {
     AssertLockHeld(cs_KeyStore);
     CKeyID key_id = pubkey.GetID();
@@ -32,7 +32,7 @@ void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)
     }
 }
 
-bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const
+bool FillableSigningProvider::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const
 {
     CKey key;
     if (!GetKey(address, key)) {
@@ -48,21 +48,21 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
     return true;
 }
 
-bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
+bool FillableSigningProvider::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
 {
     LOCK(cs_KeyStore);
     mapKeys[pubkey.GetID()] = key;
     ImplicitlyLearnRelatedKeyScripts(pubkey);
     return true;
 }
 
-bool CBasicKeyStore::HaveKey(const CKeyID &address) const
+bool FillableSigningProvider::HaveKey(const CKeyID &address) const
 {
     LOCK(cs_KeyStore);
     return mapKeys.count(address) > 0;
 }
 
-std::set<CKeyID> CBasicKeyStore::GetKeys() const
+std::set<CKeyID> FillableSigningProvider::GetKeys() const
 {
     LOCK(cs_KeyStore);
     std::set<CKeyID> set_address;
@@ -72,7 +72,7 @@ std::set<CKeyID> CBasicKeyStore::GetKeys() const
     return set_address;
 }
 
-bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const
+bool FillableSigningProvider::GetKey(const CKeyID &address, CKey &keyOut) const
 {
     LOCK(cs_KeyStore);
     KeyMap::const_iterator mi = mapKeys.find(address);
@@ -83,23 +83,23 @@ bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const
     return false;
 }
 
-bool CBasicKeyStore::AddCScript(const CScript& redeemScript)
+bool FillableSigningProvider::AddCScript(const CScript& redeemScript)
 {
     if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)
-        return error("CBasicKeyStore::AddCScript(): redeemScripts > %i bytes are invalid", MAX_SCRIPT_ELEMENT_SIZE);
+        return error("FillableSigningProvider::AddCScript(): redeemScripts > %i bytes are invalid", MAX_SCRIPT_ELEMENT_SIZE);
 
     LOCK(cs_KeyStore);
     mapScripts[CScriptID(redeemScript)] = redeemScript;
     return true;
 }
 
-bool CBasicKeyStore::HaveCScript(const CScriptID& hash) const
+bool FillableSigningProvider::HaveCScript(const CScriptID& hash) const
 {
     LOCK(cs_KeyStore);
     return mapScripts.count(hash) > 0;
 }
 
-std::set<CScriptID> CBasicKeyStore::GetCScripts() const
+std::set<CScriptID> FillableSigningProvider::GetCScripts() const
 {
     LOCK(cs_KeyStore);
     std::set<CScriptID> set_script;
@@ -109,7 +109,7 @@ std::set<CScriptID> CBasicKeyStore::GetCScripts() const
     return set_script;
 }
 
-bool CBasicKeyStore::GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const
+bool FillableSigningProvider::GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const
 {
     LOCK(cs_KeyStore);
     ScriptMap::const_iterator mi = mapScripts.find(hash);
@@ -137,7 +137,7 @@ static bool ExtractPubKey(const CScript &dest, CPubKey& pubKeyOut)
     return true;
 }
 
-bool CBasicKeyStore::AddWatchOnly(const CScript &dest)
+bool FillableSigningProvider::AddWatchOnly(const CScript &dest)
 {
     LOCK(cs_KeyStore);
     setWatchOnly.insert(dest);
@@ -149,7 +149,7 @@ bool CBasicKeyStore::AddWatchOnly(const CScript &dest)
     return true;
 }
 
-bool CBasicKeyStore::RemoveWatchOnly(const CScript &dest)
+bool FillableSigningProvider::RemoveWatchOnly(const CScript &dest)
 {
     LOCK(cs_KeyStore);
     setWatchOnly.erase(dest);
@@ -162,19 +162,19 @@ bool CBasicKeyStore::RemoveWatchOnly(const CScript &dest)
     return true;
 }
 
-bool CBasicKeyStore::HaveWatchOnly(const CScript &dest) const
+bool FillableSigningProvider::HaveWatchOnly(const CScript &dest) const
 {
     LOCK(cs_KeyStore);
     return setWatchOnly.count(dest) > 0;
 }
 
-bool CBasicKeyStore::HaveWatchOnly() const
+bool FillableSigningProvider::HaveWatchOnly() const
 {
     LOCK(cs_KeyStore);
     return (!setWatchOnly.empty());
 }
 
-CKeyID GetKeyForDestination(const CBasicKeyStore& store, const CTxDestination& dest)
+CKeyID GetKeyForDestination(const FillableSigningProvider& store, const CTxDestination& dest)
 {
     // Only supports destinations which map to single public keys, i.e. P2PKH,
     // P2WPKH, and P2SH-P2WPKH.
diff --git a/src/keystore.h b/src/keystore.h
@@ -16,7 +16,7 @@
 #include <boost/signals2/signal.hpp>
 
 /** Basic key store, that keeps keys in an address->secret map */
-class CBasicKeyStore : public SigningProvider
+class FillableSigningProvider : public SigningProvider
 {
 protected:
     mutable CCriticalSection cs_KeyStore;
@@ -52,6 +52,6 @@ class CBasicKeyStore : public SigningProvider
 };
 
 /** Return the CKeyID of the key involved in a script (if there is a unique one). */
-CKeyID GetKeyForDestination(const CBasicKeyStore& store, const CTxDestination& dest);
+CKeyID GetKeyForDestination(const FillableSigningProvider& store, const CTxDestination& dest);
 
 #endif // BITCOIN_KEYSTORE_H
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
@@ -73,7 +73,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
     }
 }
 
-CTxDestination AddAndGetDestinationForScript(CBasicKeyStore& keystore, const CScript& script, OutputType type)
+CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType type)
 {
     // Add script to keystore
     keystore.AddCScript(script);
diff --git a/src/outputtype.h b/src/outputtype.h
@@ -44,7 +44,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
  * This function will automatically add the script (and any other
  * necessary scripts) to the keystore.
  */
-CTxDestination AddAndGetDestinationForScript(CBasicKeyStore& keystore, const CScript& script, OutputType);
+CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType);
 
 #endif // BITCOIN_OUTPUTTYPE_H
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -122,7 +122,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)
     }
 
     // Construct using pay-to-script-hash:
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CScript inner;
     const CTxDestination dest = AddAndGetMultisigDestination(required, pubkeys, output_type, keystore, inner);
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -761,7 +761,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     }
 
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     const UniValue& keys = request.params[1].get_array();
     for (unsigned int idx = 0; idx < keys.size(); ++idx) {
         UniValue k = keys[idx];
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
@@ -148,7 +148,7 @@ static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::
     vErrorsRet.push_back(entry);
 }
 
-UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival, CBasicKeyStore* keystore, std::map<COutPoint, Coin>& coins, bool is_temp_keystore, const UniValue& hashType)
+UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival, FillableSigningProvider* keystore, std::map<COutPoint, Coin>& coins, bool is_temp_keystore, const UniValue& hashType)
 {
     // Add previous txouts given in the RPC call:
     if (!prevTxsUnival.isNull()) {
diff --git a/src/rpc/rawtransaction_util.h b/src/rpc/rawtransaction_util.h
@@ -7,7 +7,7 @@
 
 #include <map>
 
-class CBasicKeyStore;
+class FillableSigningProvider;
 class UniValue;
 struct CMutableTransaction;
 class Coin;
@@ -24,7 +24,7 @@ class COutPoint;
  * @param  hashType      The signature hash type
  * @returns JSON object with details of signed transaction
  */
-UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxs, CBasicKeyStore* keystore, std::map<COutPoint, Coin>& coins, bool tempKeystore, const UniValue& hashType);
+UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxs, FillableSigningProvider* keystore, std::map<COutPoint, Coin>& coins, bool tempKeystore, const UniValue& hashType);
 
 /** Create a transaction from univalue parameters */
 CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, const UniValue& rbf);
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
@@ -131,8 +131,8 @@ CPubKey HexToPubKey(const std::string& hex_in)
     return vchPubKey;
 }
 
-// Retrieves a public key for an address from the given CBasicKeyStore
-CPubKey AddrToPubKey(CBasicKeyStore* const keystore, const std::string& addr_in)
+// Retrieves a public key for an address from the given FillableSigningProvider
+CPubKey AddrToPubKey(FillableSigningProvider* const keystore, const std::string& addr_in)
 {
     CTxDestination dest = DecodeDestination(addr_in);
     if (!IsValidDestination(dest)) {
@@ -153,7 +153,7 @@ CPubKey AddrToPubKey(CBasicKeyStore* 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
-CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CBasicKeyStore& keystore, CScript& script_out)
+CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, FillableSigningProvider& keystore, CScript& script_out)
 {
     // Gather public keys
     if (required < 1) {
diff --git a/src/rpc/util.h b/src/rpc/util.h
@@ -19,7 +19,7 @@
 
 #include <boost/variant.hpp>
 
-class CBasicKeyStore;
+class FillableSigningProvider;
 class CPubKey;
 class CScript;
 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);
 
 CPubKey HexToPubKey(const std::string& hex_in);
-CPubKey AddrToPubKey(CBasicKeyStore* const keystore, const std::string& addr_in);
-CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, CBasicKeyStore& keystore, CScript& script_out);
+CPubKey AddrToPubKey(FillableSigningProvider* const keystore, const std::string& addr_in);
+CTxDestination AddAndGetMultisigDestination(const int required, const std::vector<CPubKey>& pubkeys, OutputType type, FillableSigningProvider& keystore, CScript& script_out);
 
 UniValue DescribeAddress(const CTxDestination& dest);
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
@@ -369,7 +369,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
 {
     CKey key;
     key.MakeNewKey(true);
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     BOOST_CHECK(keystore.AddKey(key));
 
     // 50 orphan transactions:
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(multisig_IsStandard)
 BOOST_AUTO_TEST_CASE(multisig_Sign)
 {
     // Test SignSignature() (and therefore the version of Solver() that signs transactions)
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CKey key[4];
     for (int i = 0; i < 4; i++)
     {
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(sign)
     // scriptPubKey: HASH160 <hash> EQUAL
 
     // Test SignSignature() (and therefore the version of Solver() that signs transactions)
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CKey key[4];
     for (int i = 0; i < 4; i++)
     {
@@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE(set)
 {
     LOCK(cs_main);
     // Test the CScript::Set* methods
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CKey key[4];
     std::vector<CPubKey> keys;
     for (int i = 0; i < 4; i++)
@@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     LOCK(cs_main);
     CCoinsView coinsDummy;
     CCoinsViewCache coins(&coinsDummy);
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     CKey key[6];
     std::vector<CPubKey> keys;
     for (int i = 0; i < 6; i++)
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
@@ -1199,7 +1199,7 @@ SignatureData CombineSignatures(const CTxOut& txout, const CMutableTransaction&
 BOOST_AUTO_TEST_CASE(script_combineSigs)
 {
     // Test the ProduceSignature's ability to combine signatures function
-    CBasicKeyStore keystore;
+    FillableSigningProvider keystore;
     std::vector<CKey> keys;
     std::vector<CPubKey> pubkeys;
     for (int i = 0; i < 3; i++)
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)`
`557`	`557`
`558`	`558`	`if (!registers.count("privatekeys"))`
`559`	`559`	`throw std::runtime_error("privatekeys register variable must be set.");`
`560`		`- CBasicKeyStore tempKeystore;`
	`560`	`+ FillableSigningProvider tempKeystore;`
`561`	`561`	`UniValue keysObj = registers["privatekeys"];`
`562`	`562`
`563`	`563`	`for (unsigned int kidx = 0; kidx < keysObj.size(); kidx++) {`
`@@ -631,7 +631,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`
`634`		`- const CBasicKeyStore& keystore = tempKeystore;`
	`634`	`+ const FillableSigningProvider& keystore = tempKeystore;`
`635`	`635`
`636`	`636`	`bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);`
`637`	`637`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`#include <util/system.h>`
`9`	`9`
`10`		`-void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)`
	`10`	`+void FillableSigningProvider::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)`
`11`	`11`	`{`
`12`	`12`	`AssertLockHeld(cs_KeyStore);`
`13`	`13`	`CKeyID key_id = pubkey.GetID();`
`@@ -32,7 +32,7 @@ void CBasicKeyStore::ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const`
	`35`	`+bool FillableSigningProvider::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const`
`36`	`36`	`{`
`37`	`37`	`CKey key;`
`38`	`38`	`if (!GetKey(address, key)) {`
`@@ -48,21 +48,21 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con`
`48`	`48`	`return true;`
`49`	`49`	`}`
`50`	`50`
`51`		`-bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)`
	`51`	`+bool FillableSigningProvider::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)`
`52`	`52`	`{`
`53`	`53`	`LOCK(cs_KeyStore);`
`54`	`54`	`mapKeys[pubkey.GetID()] = key;`
`55`	`55`	`ImplicitlyLearnRelatedKeyScripts(pubkey);`
`56`	`56`	`return true;`
`57`	`57`	`}`
`58`	`58`
`59`		`-bool CBasicKeyStore::HaveKey(const CKeyID &address) const`
	`59`	`+bool FillableSigningProvider::HaveKey(const CKeyID &address) const`
`60`	`60`	`{`
`61`	`61`	`LOCK(cs_KeyStore);`
`62`	`62`	`return mapKeys.count(address) > 0;`
`63`	`63`	`}`
`64`	`64`
`65`		`-std::set<CKeyID> CBasicKeyStore::GetKeys() const`
	`65`	`+std::set<CKeyID> FillableSigningProvider::GetKeys() const`
`66`	`66`	`{`
`67`	`67`	`LOCK(cs_KeyStore);`
`68`	`68`	`std::set<CKeyID> set_address;`
`@@ -72,7 +72,7 @@ std::set<CKeyID> CBasicKeyStore::GetKeys() const`
`72`	`72`	`return set_address;`
`73`	`73`	`}`
`74`	`74`
`75`		`-bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const`
	`75`	`+bool FillableSigningProvider::GetKey(const CKeyID &address, CKey &keyOut) const`
`76`	`76`	`{`
`77`	`77`	`LOCK(cs_KeyStore);`
`78`	`78`	`KeyMap::const_iterator mi = mapKeys.find(address);`
`@@ -83,23 +83,23 @@ bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const`
`83`	`83`	`return false;`
`84`	`84`	`}`
`85`	`85`
`86`		`-bool CBasicKeyStore::AddCScript(const CScript& redeemScript)`
	`86`	`+bool FillableSigningProvider::AddCScript(const CScript& redeemScript)`
`87`	`87`	`{`
`88`	`88`	`if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)`
`89`		`- return error("CBasicKeyStore::AddCScript(): redeemScripts > %i bytes are invalid", MAX_SCRIPT_ELEMENT_SIZE);`
	`89`	`+ return error("FillableSigningProvider::AddCScript(): redeemScripts > %i bytes are invalid", MAX_SCRIPT_ELEMENT_SIZE);`
`90`	`90`
`91`	`91`	`LOCK(cs_KeyStore);`
`92`	`92`	`mapScripts[CScriptID(redeemScript)] = redeemScript;`
`93`	`93`	`return true;`
`94`	`94`	`}`
`95`	`95`
`96`		`-bool CBasicKeyStore::HaveCScript(const CScriptID& hash) const`
	`96`	`+bool FillableSigningProvider::HaveCScript(const CScriptID& hash) const`
`97`	`97`	`{`
`98`	`98`	`LOCK(cs_KeyStore);`
`99`	`99`	`return mapScripts.count(hash) > 0;`
`100`	`100`	`}`
`101`	`101`
`102`		`-std::set<CScriptID> CBasicKeyStore::GetCScripts() const`
	`102`	`+std::set<CScriptID> FillableSigningProvider::GetCScripts() const`
`103`	`103`	`{`
`104`	`104`	`LOCK(cs_KeyStore);`
`105`	`105`	`std::set<CScriptID> set_script;`
`@@ -109,7 +109,7 @@ std::set<CScriptID> CBasicKeyStore::GetCScripts() const`
`109`	`109`	`return set_script;`
`110`	`110`	`}`
`111`	`111`
`112`		`-bool CBasicKeyStore::GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const`
	`112`	`+bool FillableSigningProvider::GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const`
`113`	`113`	`{`
`114`	`114`	`LOCK(cs_KeyStore);`
`115`	`115`	`ScriptMap::const_iterator mi = mapScripts.find(hash);`
`@@ -137,7 +137,7 @@ static bool ExtractPubKey(const CScript &dest, CPubKey& pubKeyOut)`
`137`	`137`	`return true;`
`138`	`138`	`}`
`139`	`139`
`140`		`-bool CBasicKeyStore::AddWatchOnly(const CScript &dest)`
	`140`	`+bool FillableSigningProvider::AddWatchOnly(const CScript &dest)`
`141`	`141`	`{`
`142`	`142`	`LOCK(cs_KeyStore);`
`143`	`143`	`setWatchOnly.insert(dest);`
`@@ -149,7 +149,7 @@ bool CBasicKeyStore::AddWatchOnly(const CScript &dest)`
`149`	`149`	`return true;`
`150`	`150`	`}`
`151`	`151`
`152`		`-bool CBasicKeyStore::RemoveWatchOnly(const CScript &dest)`
	`152`	`+bool FillableSigningProvider::RemoveWatchOnly(const CScript &dest)`
`153`	`153`	`{`
`154`	`154`	`LOCK(cs_KeyStore);`
`155`	`155`	`setWatchOnly.erase(dest);`
`@@ -162,19 +162,19 @@ bool CBasicKeyStore::RemoveWatchOnly(const CScript &dest)`
`162`	`162`	`return true;`
`163`	`163`	`}`
`164`	`164`
`165`		`-bool CBasicKeyStore::HaveWatchOnly(const CScript &dest) const`
	`165`	`+bool FillableSigningProvider::HaveWatchOnly(const CScript &dest) const`
`166`	`166`	`{`
`167`	`167`	`LOCK(cs_KeyStore);`
`168`	`168`	`return setWatchOnly.count(dest) > 0;`
`169`	`169`	`}`
`170`	`170`
`171`		`-bool CBasicKeyStore::HaveWatchOnly() const`
	`171`	`+bool FillableSigningProvider::HaveWatchOnly() const`
`172`	`172`	`{`
`173`	`173`	`LOCK(cs_KeyStore);`
`174`	`174`	`return (!setWatchOnly.empty());`
`175`	`175`	`}`
`176`	`176`
`177`		`-CKeyID GetKeyForDestination(const CBasicKeyStore& store, const CTxDestination& dest)`
	`177`	`+CKeyID GetKeyForDestination(const FillableSigningProvider& store, const CTxDestination& dest)`
`178`	`178`	`{`
`179`	`179`	`// Only supports destinations which map to single public keys, i.e. P2PKH,`
`180`	`180`	`// P2WPKH, and P2SH-P2WPKH.`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`-CTxDestination AddAndGetDestinationForScript(CBasicKeyStore& keystore, const CScript& script, OutputType type)`
	`76`	`+CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType type)`
`77`	`77`	`{`
`78`	`78`	`// Add script to keystore`
`79`	`79`	`keystore.AddCScript(script);`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// Construct using pay-to-script-hash:`
`125`		`- CBasicKeyStore keystore;`
	`125`	`+ FillableSigningProvider keystore;`
`126`	`126`	`CScript inner;`
`127`	`127`	`const CTxDestination dest = AddAndGetMultisigDestination(required, pubkeys, output_type, keystore, inner);`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)`
`761`	`761`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");`
`762`	`762`	`}`
`763`	`763`
`764`		`- CBasicKeyStore keystore;`
	`764`	`+ FillableSigningProvider keystore;`
`765`	`765`	`const UniValue& keys = request.params[1].get_array();`
`766`	`766`	`for (unsigned int idx = 0; idx < keys.size(); ++idx) {`
`767`	`767`	`UniValue k = keys[idx];`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::`
`148`	`148`	`vErrorsRet.push_back(entry);`
`149`	`149`	`}`
`150`	`150`
`151`		`-UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival, CBasicKeyStore* keystore, std::map<COutPoint, Coin>& coins, bool is_temp_keystore, const UniValue& hashType)`
	`151`	`+UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival, FillableSigningProvider* keystore, std::map<COutPoint, Coin>& coins, bool is_temp_keystore, const UniValue& hashType)`
`152`	`152`	`{`
`153`	`153`	`// Add previous txouts given in the RPC call:`
`154`	`154`	`if (!prevTxsUnival.isNull()) {`