Mercurial > hg > bitcoin

changeset 1640:768b5a7944f0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make sure IsMine only returns true when we own all keys
author coderrr <coderrr.contact@gmail.com>
date Mon, 02 Jan 2012 14:27:41 +0700
parents 5831eb22f571
children 662197862332
files src/script.cpp src/test/multisig_tests.cpp
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1436,7 +1436,7 @@
         // them) enable spend-out-from-under-you attacks, especially
         // in shared-wallet situations.
         vector<valtype> keys(vSolutions.begin()+1, vSolutions.begin()+vSolutions.size()-1);
-        return HaveKeys(vSolutions, keystore);
+        return HaveKeys(keys, keystore) == keys.size();
     }
     }
     return false;
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -174,7 +174,7 @@
     // one key that would satisfy an (a|b) or 2-of-3 keys needed
     // to spend an escrow transaction.
     //
-    CBasicKeyStore keystore, emptykeystore;
+    CBasicKeyStore keystore, emptykeystore, partialkeystore;
     CKey key[3];
     CBitcoinAddress keyaddr[3];
     for (int i = 0; i < 3; i++)
@@ -183,6 +183,7 @@
         keystore.AddKey(key[i]);
         keyaddr[i].SetPubKey(key[i].GetPubKey());
     }
+    partialkeystore.AddKey(key[0]);
 
     {
         vector<valtype> solutions;
@@ -221,6 +222,7 @@
         BOOST_CHECK(!ExtractAddress(s, addr));
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
+        BOOST_CHECK(!IsMine(partialkeystore, s));
     }
     {
         vector<valtype> solutions;
@@ -237,6 +239,7 @@
         BOOST_CHECK(nRequired = 1);
         BOOST_CHECK(IsMine(keystore, s));
         BOOST_CHECK(!IsMine(emptykeystore, s));
+        BOOST_CHECK(!IsMine(partialkeystore, s));
     }
     {
         vector<valtype> solutions;