more elegant per address unlock

support in PyBtcWallet.lock() for partially unlocked address map

armoryengine/PyBtcAddress.py

@@ -503,7 +503,7 @@ def lock(self, secureKdfOutput=None, generateIVIfNecessary=False):
             # Addr should be encrypted, and we already have encrypted priv key
             self.binPrivKey32_Plain.destroy()
             self.isLocked = True
-         else:
+         elif self.binPrivKey32_Plain.getSize()==32:
             # Addr should be encrypted, but haven't computed encrypted value yet
             if secureKdfOutput!=None:
                # We have an encryption key, use it

armoryengine/PyBtcWallet.py

@@ -2574,15 +2574,6 @@ def signTxDistProposal(self, txdp, hashcode=1):
                if self.hasAddr(addr) and self.addrMap[addr].hasPrivKey():
                   wltAddr.append( (self.addrMap[addr], index, addrIdx) )
                   break
-
-      for entry in wltAddr:
-         addr = entry[0]
-         if not isinstance(addr.binPrivKey32_Plain, SecureBinaryData) or addr.binPrivKey32_Plain.getSize() != 32:
-            #if the private key was not craeted, just unlock the whole wallet
-            if addr.createPrivKeyNextUnlock:
-               self.unlock(secureKdfOutput=self.kdfKey)
-            else:
-               addr.unlock(self.kdfKey)
 
       # WltAddr now contains a list of every input we can sign for, and the
       # PyBtcAddress object that can be used to sign it.  Let's do it.
@@ -2597,7 +2588,10 @@ def signTxDistProposal(self, txdp, hashcode=1):
          maxChainIndex = max(maxChainIndex, addrObj.chainIndex)
          if addrObj.isLocked:
             if self.kdfKey:
-               addrObj.unlock(self.kdfKey)
+               if addrObj.createPrivKeyNextUnlock:
+                  self.unlock(self.kdfKey)
+               else:
+                  addrObj.unlock(self.kdfKey)
             else:
                self.lock()
                raise WalletLockError('Cannot sign tx without unlocking wallet')