Changeset 327 for trunk

Timestamp:

06/15/09 02:46:06 (3 years ago)

Author:

ocjhb

Message:

webwallet can now do basic actions

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (1 diff)
• oc2/testwallet.py (modified) (1 diff)
• oc2/wallet.py (modified) (4 diffs)
• webwallet/cgi/wallet.cgi (modified) (9 diffs)
• webwallet/cgiserver.py (modified) (1 diff)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -434 +434 @@
 
         if method == 1:
-            url = appuifw.query(u'address','text',u'192.168.2.105')
+            url = appuifw.query(u'address','text',u'192.168.2.105:%s' % walletport)
             if not url:
                 return                
             else:     
-                url = 'http://%s:%s' % (url,walletport)
+                url = 'http://%s' % (url)
             transport = self.getHTTPTransport(url)
             if not transport:

trunk/sandbox/jhb/oc2/testwallet.py

@@ -4 +4 @@
 >>> w = wallet.Wallet(storage.Storage().setFilename('data/test.bin'))
 >>> import transports
->>> transport = transports.HTTPTransport('http://localhost:9090/')
->>> w.buyCoins(transport,97,'foobar')
-
+>>> transport = transports.HTTPTransport('http://baach.de:9090/')
+>>> w.addCurrency(transport)
+>>> w.mintCoins(transport,13,'foobar')
+>>> transport = transports.HTTPTransport('http://localhost:9091/wallet.cgi')
+>>> w.spendCoins(transport,'BaachBuck',5,'foobar')
 
 """

trunk/sandbox/jhb/oc2/wallet.py

@@ -4 +4 @@
 import messages
 import coinsplitting
+import sys
 
 class Wallet(Entity):
@@ -30 +31 @@
     def addIncoming(self,message):
         self.storage.setdefault('incoming',{})[message.transactionId] = message
-        
+        #sys.stderr.write(str(self.storage.filename))
+
     def getIncoming(self,tid):
-        return self.storage.setdefault('incoming',{}).get(tid,None)
+        #sys.stderr.write(str(tid)) 
+        #sys.stderr.write(str(self.storage.filename)) 
+        transaction = self.storage.setdefault('incoming',{}).get(tid,None)
+        if transaction != None:
+            del(self.storage['incoming'][tid])
+        return transaction            
 
         
@@ -180 +187 @@
                 out.append((cdd,amount))
             except:
-                del(self.storage[key])
+                #del(self.storage[key]) XXX why was that?
+                pass
         return out            
 
@@ -333 +341 @@
         
         self.feedback(u'Spending coins: wating for confirmation')
-        self.announceSum(transport,tid,amount,target)
+        response = self.announceSum(transport,tid,amount,target)
         self.feedback(u'Spending coins: wating for other side')
         response = self.requestSpend(transport,tid,picked)

trunk/sandbox/jhb/webwallet/cgi/wallet.cgi

@@ -22 +22 @@
         self.wallet = wallet.Wallet(storage)
         self.output = []
+        self.mimetype = 'text/html'
 
     def out(self,text):
         if type(text) != type(''):
             text = str(text)
-        self.output.append(text+'<br/>')
+        self.output.append(text)
         
     def printout(self):
-        print """Content-type:text/html"""
-        print
-        print '\n'.join(self.output)
+        print """Content-type:%s""" % self.mimetype
+        print "\r"
+        if self.mimetype == 'text/html':
+            print '<br/>\n'.join(self.output)
+        else:
+            print '\n'.join(self.output)
 
     def getCurrency(self,currencyId):
@@ -37 +41 @@
 
     def getCurrencies(self):
-        return [(cdd.currencyId,(cdd,amount)) for cdd,amount in w.wallet.listCurrencies()]
+        return [(cdd.currencyId,(cdd,amount)) for cdd,amount in self.wallet.listCurrencies()]
 
     def dispatchRequest(self):
@@ -44 +48 @@
         self.action = action = self.form.getfirst('action','')
         self.method = method = self.env['REQUEST_METHOD'].lower()
-        
+       
+        postmapping = dict(addcurrency = self.addCurrency,
+                           mint = self.mintCoins,
+                           redeem = self.redeemCoins,
+                           delcurrency = self.delCurrency,
+                           spend = self.spendCoins)
+
+        getmapping = dict(addcurrency = self.displayAddCurrency,
+                          mint = self.displayMint,
+                          redeem = self.displayRedeem,
+                          spend = self.displaySpend,
+                          delcurrency = self.displayDelCurrency,
+                          freshenup = self.freshenUp)
 
         if method == 'post':
-            if action == 'addcurrency':
-                self.addCurrency()
-            elif action == 'mint':
-                self.mintCoins()
-            elif action == '':
-                pass 
+            if postmapping.has_key(action):
+                postmapping[action]()
+            else:
+                self.receiveCoins()
 
         elif method == 'get':
-            if action == '':
-                #basically nothing happened
+            if getmapping.has_key(action):
+                getmapping[action]()
+            else:
                 self.displayMain()
-            elif action == 'addcurrency':
-                self.displayAddCurrency()
-            elif action == 'mint':
-                self.displayMint()
-
-
-    def addCurrency(self):
-        url = self.form.getfirst('url','')
-        if url:
-            transport = transports.HTTPTransport(url)
-            w.wallet.addCurrency(transport)
-            storage.save()
-        self.displayMain()        
-
-
-    def mintCoins(self):
-        amount = int(self.form.getfirst('amount',1))
-        reference = self.form.getfirst('reference')
-        cdd,wehave = self.getCurrency(self.form.getfirst('currencyId'))
-        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
-        self.wallet.mintCoins(transport,amount,reference)
-        self.storage.save()
-        self.displayMain()
+
+
+################################ main ################################################
 
 
@@ -90 +85 @@
         for cdd,amount in currencies:
             entry = """
-            <p>%s <b href='%s'>%ss</b><br/>
-                <a href='%s?action=mint&currencyId=%s'>Withdraw</a>
+            <p>%(amount)s <b href='%(isl)s'>%(cid)ss</b><br/>
+                <a href='%(baseurl)s?action=spend&currencyId=%(cid)s'>Pay</a>
+                <a href='%(baseurl)s?action=freshenup&currencyId=%(cid)s'>Refresh</a>
+                <a href='%(baseurl)s?action=mint&currencyId=%(cid)s'>Withdraw</a>
+                <a href='%(baseurl)s?action=redeem&currencyId=%(cid)s'>Redeem</a>
+                <a href='%(baseurl)s?action=delcurrency&currencyId=%(cid)s'>Remove</a>
             </p>
-            """ % (amount,cdd.issuerServiceLocation,cdd.currencyId,baseurl,cdd.currencyId)
+            """ % dict(amount=amount,
+                       isl=cdd.issuerServiceLocation,
+                       cid=cdd.currencyId,
+                       baseurl=baseurl)
             items.append(entry)
         items = '\n'.join(items)
@@ -106 +108 @@
         self.out(html)
 
+############################### add a currency ####################################
+
+
+    def addCurrency(self):
+        url = self.form.getfirst('url','')
+        if url:
+            transport = transports.HTTPTransport(url)
+            self.wallet.addCurrency(transport)
+            self.storage.save()
+        self.displayMain()        
+
     def displayAddCurrency(self):
         html="""
@@ -120 +133 @@
         self.out(html)
 
+
+
+############################### delete a currency ####################################
+
+    def displayDelCurrency(self):
+        currencyId = self.form.getfirst('currencyId','')
+        cdd,amount = self.getCurrency(currencyId)
+        html="""
+        <html><body>
+        <h2>Remove  %s</h2>
+        <form action='%s' method='post'>
+            <p>Really really delete %s with %s coins - there is no way to recover</p>
+            <p><input type='submit' value='Remove %ss'/>
+            or
+            
+            <a href='%s'>go back to main screen</a>
+            </p>
+            <input type='hidden' name='action' value='delcurrency'/>
+            <input type='hidden' name='currencyId' value='%s'/>
+        </form>
+        </body></html>
+        """ % (currencyId,baseurl,currencyId,amount,currencyId,baseurl,currencyId)
+        self.out(html)
+
+    def delCurrency(self):
+        id = self.form.getfirst('currencyId','')
+        self.wallet.deleteCurrency(id)
+        self.storage.save()
+        self.displayMain()
+
+
+############################### minting ####################################
+
+    def mintCoins(self):
+        amount = int(self.form.getfirst('amount',1))
+        reference = self.form.getfirst('reference')
+        cdd,wehave = self.getCurrency(self.form.getfirst('currencyId'))
+        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+        self.wallet.mintCoins(transport,amount,reference)
+        self.storage.save()
+        self.displayMain()
+
+
     def displayMint(self):
         currencyId = self.form.getfirst('currencyId','coin')
@@ -127 +183 @@
         <form action='%s' method='post'>
             How many <b>%ss</b><br>
-            <input type='text' name='amount' value='1' /><br>
-            Reference<br>
+            <input type='number' name='amount' value='1' /><br>
+            Optional message<br>
             <input type='text' name='reference' value='secret' /><br>
             <input type='submit' />
@@ -139 +195 @@
         self.out(html)
 
-        
+############################### redeem ####################################
+
+    def redeemCoins(self):
+        amount = int(self.form.getfirst('amount',1))
+        reference = self.form.getfirst('reference')
+        cdd,wehave = self.getCurrency(self.form.getfirst('currencyId'))
+        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+        self.wallet.redeemCoins(transport,amount,reference)
+        self.storage.save()
+        self.displayMain()
+
+
+    def displayRedeem(self):
+        currencyId = self.form.getfirst('currencyId','coin')
+        html="""
+        <html><body>
+        <h2>Redeem coins</h2>
+        <form action='%s' method='post'>
+            How many <b>%ss</b><br>
+            <input type='number' name='amount' value='1' /><br>
+            Optional message<br>
+            <input type='text' name='reference' value='secret' /><br>
+            <input type='submit' />
+            <input type='hidden' name='action' value='redeem'/>
+            <input type='hidden' name='currencyId' value='%s'/>
+        </form>
+        </body></html>
+
+        """ % (baseurl,currencyId,currencyId)
+        self.out(html)
+
+############################### spend ####################################
+
+    def spendCoins(self):
+        amount = int(self.form.getfirst('amount',1))
+        reference = self.form.getfirst('reference')
+        url = self.form.getfirst('url')
+        url = 'http://%s:9091' % url
+        cid = self.form.getfirst('currencyId')
+        transport = transports.HTTPTransport(url)
+        self.wallet.spendCoins(transport,cid,amount,reference)
+        self.storage.save()
+        self.displayMain()
+
+
+    def displaySpend(self):
+        currencyId = self.form.getfirst('currencyId','coin')
+        html="""
+        <html><body>
+        <h2>Pay someone</h2>
+        <form action='%s' method='post'>
+            Recipient<br/>
+            <input type='text' name='url' value='192.168.1.66' /><br>
+            How many <b>%ss</b><br>
+            <input type='number' name='amount' value='1' /><br>
+            Optional message<br>
+            <input type='text' name='reference' value='secret' /><br>
+            Please make sure the other side is ready to accept!<br>
+            <input type='submit' />
+            <input type='hidden' name='action' value='spend'/>
+            <input type='hidden' name='currencyId' value='%s'/>
+        </form>
+        </body></html>
+
+        """ % (baseurl,currencyId,currencyId)
+        self.out(html)
+
+############################### freshenUp ####################################
+
+    def freshenUp(self):
+        cdd,wehave = self.getCurrency(self.form.getfirst('currencyId'))
+        transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+        self.wallet.freshenUp(transport,cdd)
+        self.storage.save()
+        self.displayMain()
+
+
+############################### freshenUp ####################################
+
+    def receiveCoins(self):
+        message = transports.createMessage(self.form.list[0].name)
+
+        if message.header == 'SumAnnounce':
+            answer = self.wallet.listenSum(message)
+        if message.header == 'SpendRequest':
+            cdd,wehave = self.getCurrency(message.coins[0].currencyId)
+            transport = transports.HTTPTransport(cdd.issuerServiceLocation)
+            answer = self.wallet.listenSpend(transport,message)
+        self.storage.save()
+        self.mimetype='text/plain'
+        self.out(answer.toString(True))
+
 baseserver = "http://%s:%s" % (os.environ['SERVER_NAME'],os.environ['SERVER_PORT'])
 baseurl = os.environ['SCRIPT_NAME']
-
-
 
 storage = oc2storage.Storage()
@@ -150 +295 @@
 w = CGIWallet(storage)
 w.dispatchRequest()
-
-#out('=' * 80)
-#for key,value in sorted(env.items()):
-#    #out("%50s: %s" % (key,value))
-#    pass
-#out(form.list)
 w.printout()

trunk/sandbox/jhb/webwallet/cgiserver.py

@@ -14 +14 @@
 Handler.address_string = address_string
 
-PORT = 8000
+PORT = 9091