Changeset 320 for trunk/sandbox/jhb/oc2/wallet.py

Timestamp:

05/28/09 14:30:52 (3 years ago)

Author:

ocjhb

Message:

dont remember all I did

Files:

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

trunk/sandbox/jhb/oc2/wallet.py

@@ -39 +39 @@
         self.feedback('Talking to issuer: fetching latest CDD')
         response = transport(messages.AskLatestCDD())
+        if not isinstance(response,messages.GiveLatestCDD):
+            raise Exception, 'Not a valid message'
+        if not response.cdd.masterPubKey.verifyContainerSignature(response.cdd):
+            raise Exception, 'Could not verify cdd'
         return response.cdd
 
 
-    def fetchMintKeys(self,transport,denominations=None,keyids=None):
+    def fetchMintKeys(self,transport,cdd,denominations=None,keyids=None):
         if denominations and keyids:
-            raise "you can't ask for denominations and keyids at the same time"
+            raise Exception, "you can't ask for denominations and keyids at the same time"
         if not (denominations or keyids):
-            raise "you need to ask at least for one"
+            raise Exception, "you need to ask at least for one"
         message = messages.FetchMintKeys()
-        message.denominations = [str(d) for d in denominations]
+        denominations = [str(d) for d in denominations]
+        message.denominations = denominations
         message.keyids = keyids
         self.feedback('Talking to issuer: fetching mintkeys')
         response = transport(message)
+        
         if response.header == 'MINTING_KEY_FAILURE':
             raise message
-        else:
-            return  response.keys
+        
+        if not isinstance(response,messages.GiveMintKeys):
+            raise Exception, 'Not a valid message'
+        
+        if set(denominations).difference(set([key.denomination for key in response.keys])):
+            raise Exception, 'Not all denominations met'
+
+        for key in response.keys:
+            if not cdd.masterPubKey.verifyContainerSignature(key):
+                raise Exception, 'Could not verify key'
+        return  response.keys
+            
        
 
@@ -119 +135 @@
 
 
-    def listenSpend(self,message,transport=None):
+    def listenSpend(self,transport,message):
         tid = message.transactionId
         amount = sum([int(m.denomination) for m in message.coins])
@@ -174 +190 @@
 
     def pickForSpending(self,amount,coins):
-        tmp = [(c.denomination,c) for c in coins]
+        tmp = [(int(c.denomination),c) for c in coins]
         tmp.sort()
         tmp.reverse()
-        coins = [t[1] for t in tmp]
+        mycoins = [t[1] for t in tmp]
         picked = []
-        for coin in coins:
+        for coin in mycoins:
             sumpicked = sum([int(c.denomination) for c in picked])
             if sumpicked < amount:
@@ -220 +236 @@
     def prepareBlanks(self,transport,cdd,values):        
         wanted = list(set(values)) #what mkcs do we want
-        keys = self.fetchMintKeys(transport,denominations=wanted)
+        keys = self.fetchMintKeys(transport,cdd,denominations=wanted)
         mkcs = {}
         for mkc in keys:
             if not cdd.masterPubKey.verifyContainerSignature(mkc):
-                raise 'Invalid signature on mkc'
+                raise Exception, 'Could not verify mkc'
             mkcs[mkc.denomination] = mkc