Currently, in importmulti, it is possible to import not enough information to make a scriptPubKey solvable. It is also possible to import more information than necessary to make a scriptPubKey solvable. This PR changes this to require that an import must be either just the scriptPubKey or include everything necessary to make it solvable without any extra data.
This is built on top of #14454.
Introduce two functions, ImportScriptsToKeystore and AddScriptsToWatchOnly.
These functions move the actual script and public key importing to the
end of ProcessImport.
AllUsedKeyStore is used to track whether all of the scripts and
public keys in the keystore have been used in signing.
To avoid issues with const-ness, the usage maps are in a separate
struct which is pointed to by a pointer in AllUsedKeyStore. This
allows GetPubKey and GetCScript to properly override the CBasicKeyStore
functions.
Check that if more than just a scriptPubKey was imported, that there
was enough data to be solvable.
Check that if more than just a scriptPubKey was imported, that the
minimal data needed for solvability was imported.
804@@ -805,6 +805,111 @@ UniValue dumpwallet(const JSONRPCRequest& request)
805 return reply;
806 }
807
808+struct UsageMaps {
AllUsedKeyStore?
GetKey, GetPubKey, and GetCScript are all const functions and need to be in order to override the CBasicKeyStore versions of them. However, those functions need to modify the usage maps. If they were in AllUsedKeyStore, those functions would not be const. By having them in a separate struct that has a pointer in AllUsedKeyStore, the functions can remain const but still allow us to update the usage info.
817+
818+// Class which remembers whether every script and public key was used
819+class AllUsedKeyStore : public CBasicKeyStore
820+{
821+private:
822+ struct UsageMaps* usage = new UsageMaps();
1034- throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid redeem script");
1035- }
1036-
1037- // Process. //
1038+ CScript scriptpubkey_script = script;
1039+ CTxDestination scriptpubkey_dest = dest;
scriptpubkey_dest is unused?
820+{
821+private:
822+ struct UsageMaps* usage = new UsageMaps();
823+public:
824+ bool AllUsed() const;
825+ bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
CPubKey& vchPubKeyOut vs CPubKey &pubkey_out) :-)
822+ struct UsageMaps* usage = new UsageMaps();
823+public:
824+ bool AllUsed() const;
825+ bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
826+ bool AddCScript(const CScript& redeemScript) override;
827+ bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override;
CScript& redeemScriptOut vs CScript& script_out :-)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
832+
833+bool AllUsedKeyStore::GetPubKey(const CKeyID &address, CPubKey &pubkey_out) const
834+{
835+ LOCK(cs_KeyStore);
836+ if (CBasicKeyStore::GetPubKey(address, pubkey_out)) {
837+ usage->map_watch_key_use[address] = true;
You could invert the logic and keep track of the unused
Then AllUsed could look like (s/usage/unused):
0 return
1 unused->watch_keys.empty() &&
2 unused->scripts.empty() &&
3 unused->keys.empty();
I could be missing some detail.