Changeset 294

Timestamp:

04/30/09 21:15:23 (3 years ago)

Author:

ocjhb

Message:

first redeem, needs error handling and coin picking

Location:

trunk/sandbox/jhb/oc2

Files:

• coinsplitting.py (modified) (1 diff)
• testissuer.py (modified) (3 diffs)
• wallet.py (modified) (3 diffs)

trunk/sandbox/jhb/oc2/coinsplitting.py

@@ -28 +28 @@
         if rest > 0 and token <= rest:
             picked.append(token)
-    return picked            
+    return picked         
+
 if __name__ == '__main__':
     dl = [[1,2,5,10,20,50,100],[1,3,9,27],[1,3,5,7,11,13,17,19,23],[1,17,33]]

trunk/sandbox/jhb/oc2/testissuer.py

@@ -23 +23 @@
 
     print 'issuer: setup currency discription'
-    denominations=[0,1,2,5,10,20]
+    denominations=[1,2,5,10,20]
     cdd = issuer.makeCDD('TestCent','tc',[str(d) for d in denominations],'http://192.168.2.101:%s/' % port,'')
     mint.setCDD(cdd)
@@ -47 +47 @@
     authorizerstorage.save()
 
+
+def address_string(self):
+    host, port = self.client_address[:2]
+    return host
+
 print 'Starting up server'
 Handler.issuer = issuer
@@ -52 +57 @@
 Handler.authorizer = authorizer
 httpd = BaseHTTPServer.HTTPServer(("", port), Handler)
+httpd.address_string = address_string
 httpd.serve_forever()

trunk/sandbox/jhb/oc2/wallet.py

@@ -170 +170 @@
         return coinsplitting.tokenizer([int(d) for d in denominations],amount)                   
 
-        
+    def pickForSpending(self,amount,coins):
+        tmp = [(c.denomination,c) for c in coins]
+        tmp.sort()
+        tmp.reverse()
+        coins = [t[1] for t in tmp]
+        picked = []
+        for coin in coins:
+            sumpicked = sum([int(c.denomination) for c in picked])
+            if sumpicked < amount:
+                if int(coin.denomination) <= (amount - sumpicked):
+                    picked.append(coin)
+            else:
+                break
+        return picked                
+
 
 #################################higher level#############################
@@ -181 +195 @@
             currency['cdds'].append(cdd)
 
-    def buyCoins(self,transport,amount,target):
+    def mintCoins(self,transport,amount,target):
         cdd = self.askLatestCDD(transport)
         currency = self.getCurrency(cdd.currencyId)
@@ -217 +231 @@
             i += 1
         self.storage.save()
+
+    def getAllCoins(self,currencyId):
+        currency = self.getCurrency(currencyId)
+        return currency['coins']
+
+
+
+    def redeemCoins(self,transport,amount,target):
+        cdd = self.askLatestCDD(transport)
+        currency = self.getCurrency(cdd.currencyId)
+        coins = currency['coins']
+        picked = self.pickForSpending(amount,coins)
+        tid = self.makeSerial()
+        response = self.requestTransfer(transport,tid,target,[],picked)
+        newcoins = [c for c in coins if c not in picked]
+        currency['coins'] = newcoins
+
+