Changeset 297

Timestamp:

05/01/09 15:25:21 (3 years ago)

Author:

ocjhb

Message:

freshenUp works

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (3 diffs)
• oc2/wallet.py (modified) (5 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -14 +14 @@
         self.actions=[(u'Send',u'Send coins to someone',self.getDetails),
                       (u'Receive',u'Receive coins',self.getReceiveDetails),
-                      (u'Freshen up',u'Freshen up the coins',self.getFreshenUpDetails),
+                      (u'Freshen up',u'Freshen up the coins',self.freshenUp),
                       (u'Buy',u'Buy new coins',self.mintCoins),
                       (u'Sell',u'Sell coins',self.redeemCoins),
@@ -100 +100 @@
         self.execute()
 
-    def getFreshenUpDetails(self):
-        self.getMethod()
-        self.execute()
+
 
     def getMethod(self):
@@ -195 +193 @@
 
 
+    def freshenUp(self):
+        cdd,alreadythere = self.getCurrentCurrency()
+        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+        self.wallet.freshenUp(transport,cdd)
+        self.makeWalletMenu()
+        self.displayWalletMenu()
+
+
     def execute(self):
         #print 'execute'

trunk/sandbox/jhb/oc2/wallet.py

@@ -199 +199 @@
         currency = self.getCurrency(cdd.currencyId)
         tokenized =  self.tokenizeForBuying(amount,cdd.denominations) #what coins do we need
-        wanted = list(set(tokenized)) #what mkcs do we want
-        
+        tid = self.makeSerial()
+        secrets,data = self.prepareBlanks(transport,cdd,tokenized)
+        response = self.requestTransfer(transport,tid,target,data,[])                         
+        signatures = response.signatures
+        currency['coins'].extend(self.unblindWithSignatures(secrets,signatures))
+        self.storage.save()
+
+    def prepareBlanks(self,transport,cdd,values):        
+        wanted = list(set(values)) #what mkcs do we want
         keys = self.fetchMintKeys(transport,denominations=wanted)
         mkcs = {}
@@ -210 +217 @@
         secrets = []
         data = []
-        for denomination in tokenized:
+        for denomination in values:
             mkc = mkcs[str(denomination)]
             blank = self._makeBlank(cdd,mkc)
@@ -216 +223 @@
             secrets.append((blank,blind,mkc,secret))
             data.append((mkc.keyId,blind))
-
-        tid = self.makeSerial() 
-        response = self.requestTransfer(transport,tid,target,data,[])                 
+        return secrets,data
+
+
+       
+    def unblindWithSignatures(self,secrets,signatures):        
         i = 0
-        signatures = response.signatures
+        coins = []
         for signature in signatures:
             blank,blind,mkc,secret = secrets[i]
@@ -228 +237 @@
             if not key.verifyContainerSignature(coin):
                 raise 'Invalid signature' 
-            currency['coins'].append(coin)
+            coins.append(coin)
             i += 1
-        self.storage.save()
+        return coins            
 
     def getAllCoins(self,currencyId):
@@ -247 +256 @@
         newcoins = [c for c in coins if c not in picked]
         currency['coins'] = newcoins
-
-
+        self.storage.save()
+
+
+
+    def freshenUp(self,transport,cdd):        
+        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()
+
+    def prepare4exchange(self,transport,cdd,oldcoins,newcoins):
+        oldcoins = [c for c in oldcoins]
+        newcoins = [c for c in newcoins]
+        
+        oldvalues = [int(c.denomination) for c in oldcoins]
+        newvalues = [int(c.denomination) for c in newcoins]
+        denominations = [int(d) for d in cdd.denominations]
+        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