Changeset 298 for trunk

Timestamp:

05/01/09 15:30:42 (3 years ago)

Author:

ocjhb

Message:

freshenup only when needed, automatic after redeem

Files:

• trunk/sandbox/jhb/oc2/wallet.py (modified) (3 diffs)

trunk/sandbox/jhb/oc2/wallet.py

@@ -255 +255 @@
         response = self.requestTransfer(transport,tid,target,[],picked)
         newcoins = [c for c in coins if c not in picked]
-        currency['coins'] = newcoins
+        currency['coins'] = newcoins        
         self.storage.save()
-
+        self.freshenUp(transport,cdd)
 
 
@@ -263 +263 @@
         currency = self.getCurrency(cdd.currencyId)
         paycoins,secrets,data = self.prepare4exchange(transport,cdd,currency['coins'],[])
-        tid = self.makeSerial()
-        response = self.requestTransfer(transport,tid,None,data,paycoins)
-        coins = currency['coins']
-        for coin in paycoins:
-            coins.pop(coins.index(coin))
-        coins.extend(self.unblindWithSignatures(secrets,response.signatures)) 
-        self.storage.save()
+        if secrets:
+            tid = self.makeSerial()
+            response = self.requestTransfer(transport,tid,None,data,paycoins)
+            coins = currency['coins']
+            for coin in paycoins:
+                coins.pop(coins.index(coin))
+            coins.extend(self.unblindWithSignatures(secrets,response.signatures)) 
+            self.storage.save()
 
     def prepare4exchange(self,transport,cdd,oldcoins,newcoins):
@@ -280 +281 @@
         keep,pay,blank = coinsplitting.prepare_for_exchange(denominations,oldvalues,newvalues)
         
-        paycoins = []
-        for value in pay:
-            for coin in oldcoins:
-                if int(coin.denomination) == value:
-                    paycoins.append(oldcoins.pop(oldcoins.index(coin)))
-                    break
-        
-        secrets,data = self.prepareBlanks(transport,cdd,blank)
-        return paycoins,secrets,data
+        if blank:
+            paycoins = []
+            for value in pay:
+                for coin in oldcoins:
+                    if int(coin.denomination) == value:
+                        paycoins.append(oldcoins.pop(oldcoins.index(coin)))
+                        break
+        
+            secrets,data = self.prepareBlanks(transport,cdd,blank)
+            return paycoins,secrets,data
+        else:
+            return [],[],[]