aboutsummaryrefslogtreecommitdiff
path: root/src/walletdb.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-06-09 21:11:59 +0200
committerJaSK <temp@temp.temp>2014-07-02 15:48:39 +0200
commitd5087d1ba08142bdf135333a0da08ef0f5fc7ef0 (patch)
tree42c945e1a21db1c7b9bfe9a91f8ee47f9eb7b49a /src/walletdb.cpp
parent0fa2f8899adf8f9f0ead29ba5d708ead6c5d4eaf (diff)
Use script matching rather than destination matching for watch-only.
This changes the keystore data format, wallet format and IsMine logic to detect watch-only outputs based on direct script matching rather than first trying to convert outputs to destinations (addresses). The reason is that we don't know how the software that has the spending keys works. It may support the same types of scripts as us, but that is not guaranteed. Furthermore, it removes the ambiguity between addresses used as identifiers for output scripts or identifiers for public keys. One practical implication is that adding a normal pay-to-pubkey-hash address via importaddress will not cause payments to the corresponding full public key to be detected as IsMine. If that is wanted, add those scripts directly (importaddress now also accepts any hex-encoded script). Conflicts: src/wallet.cpp
Diffstat (limited to 'src/walletdb.cpp')
-rw-r--r--src/walletdb.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index 9338d57097..a95baf83d0 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -112,10 +112,10 @@ bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false);
}
-bool CWalletDB::WriteWatchOnly(const CTxDestination &dest)
+bool CWalletDB::WriteWatchOnly(const CScript &dest)
{
nWalletDBUpdated++;
- return Write(std::make_pair(std::string("watch"), CBitcoinAddress(dest).ToString()), '1');
+ return Write(std::make_pair(std::string("watchs"), dest), '1');
}
bool CWalletDB::WriteBestBlock(const CBlockLocator& locator)
@@ -410,14 +410,14 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
wss.fAnyUnordered = true;
}
}
- else if (strType == "watch")
+ else if (strType == "watchs")
{
- std::string strAddress;
- ssKey >> strAddress;
+ CScript script;
+ ssKey >> script;
char fYes;
ssValue >> fYes;
if (fYes == '1')
- pwallet->LoadWatchOnly(CBitcoinAddress(strAddress).Get());
+ pwallet->LoadWatchOnly(script);
// Watch-only addresses have no birthday information for now,
// so set the wallet birthday to the beginning of time.