Changeset 272

Timestamp:

04/23/09 15:14:19 (3 years ago)

Author:

ocjhb

Message:

first traces of working exchange

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (modified) (3 diffs)
• messages.py (modified) (1 diff)
• mint.py (modified) (2 diffs)
• protocols.py (modified) (2 diffs)
• rsa.py (modified) (1 diff)
• testclient.py (modified) (3 diffs)
• wallet.py (modified) (2 diffs)

trunk/sandbox/jhb/oc2/documentation.py

@@ -607 +607 @@
 >>> bobport = 9091
 >>> bobwallet = Wallet({})
-
+>>> import test
 >>> alicetid = wallet.makeSerial()
 >>> bob = protocols.SumAnnounceListen(bobwallet)
@@ -650 +650 @@
 
 >>> bob = protocols.SpendListen(bobwallet)
->>> transport = transports.YieldTransport(bob.run,[])
+>>> #transport = transports.YieldTransport(bob.run,[])
 >>> alice = protocols.SpendRequest(bob.run, wallet, 'foobar', [coin]) 
 >>> alice.run()
@@ -667 +667 @@
 True
 
+Now, lets first pretend we are on Bobs side. Fix that later, but assume we 
+received the coins, we know what cdd and mkc to use. We need to exchange now
+
+>>> coins = [coin]
+>>> key = mkc.publicKey
+>>> bobblank = bobwallet._makeBlank(cdd,mkc)
+>>> bobsecret, bobblind = key.blindBlank(bobblank)
+>>> blinds = [[mkc.keyId,bobblind]]
+>>> bobtid = wallet.makeSerial()
+
+>>> clientside = protocols.TransferRequest(transport,tid,blinds = blinds, coins = coins)
+>>> testserver.run_once(port,issuer=issuer,mint=mint)
+>>> text,value = clientside.run()
+>>> bobblank.signature = key.unblind(bobsecret,value[0])
+>>> bobcoin = bobblank
+>>> key.verifyContainerSignature(bobcoin)
+True
+
+
+
+
 ###############################################################################
 

trunk/sandbox/jhb/oc2/messages.py

@@ -65 +65 @@
 
 class TransferReject(Message):
-    pass
+    fields = Message.fields + [
+        Field('transactionId'),
+        Field('reason'),
+    ]
 
 class TransferDelay(Message):

trunk/sandbox/jhb/oc2/mint.py

@@ -61 +61 @@
         message = authorizedMessage.message
         blinds = message.blinds
+        return self._mintBlinds(message)
+    
+    def handleExchangeRequest(self,message):
+        #import pdb; pdb.set_trace()
+        coins = message.coins
+        blinds = message.blinds
+        payed = sum([int(coin.denomination) for coin in coins])
+        
+        amount = 0
+        for keyid,blind in blinds:
+            priv,pub,denomination,version = self.getMintKeyById(keyid)
+            amount += int(denomination)
+        
+        if payed != amount:
+            reject = messages.TransferReject()
+            reject.reason = 'mismatch'
+            return reject
+
+        return self._mintBlinds(message)
+            
+    def _mintBlinds(self,message):
+        
+        blinds = message.blinds
         result = []
         for keyid,blind in blinds:
@@ -77 +100 @@
         
         return answer
-    
-    def handleExchangeRequest(self,message):
-        coins = message.coins
-        blinds = message.blinds
-
-
 
     def addToTransactions(self,transactionId,result):

trunk/sandbox/jhb/oc2/protocols.py

@@ -123 +123 @@
             if type(authorizedMessage) == messages.Error:
                 return messages.TransferReject()
-            return self.mint.handleMintingRequest(authorizedMessage)
+            else:
+                return self.mint.handleMintingRequest(authorizedMessage)
         
         elif requesttype == 'exchange':
             return self.mint.handleExchangeRequest(message)
-            
+        
+        else:
+            return messages.TransferReject()
 
 
@@ -228 +231 @@
 class SpendListen(Protocol):
     
-    def __init__(self,wallet):
-        self.wallet = wallet
+    def __init__(self,wallet,client=None):
+        self.wallet = wallet
+        self.client = client
     
     def run(self,message=None):

trunk/sandbox/jhb/oc2/rsa.py

@@ -162 +162 @@
 
 def generate(bits):  #needed
-    return (dummypub,dummypriv)
+    #return (dummypub,dummypriv)
     p = getRandomPrime(bits/2, False)
     q = getRandomPrime(bits/2, False)

trunk/sandbox/jhb/oc2/testclient.py

@@ -1 +1 @@
 import BaseHTTPServer, threading
-import protocols, issuer, mint, transports, urllib
-
+import protocols, transports, urllib
 
 class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
 
     def do_POST(self):
-        #print self.server
+        
+        wallet = self.server.wallet
+        client = self.server.walletclient
+        
         if self.path == '/stop':
             raise 'foobar'
@@ -13 +15 @@
         data = urllib.unquote(data)
         message = transports.createMessage(data)
-        if message.header == 'AskLatestCDD':
-            protocol = protocols.GiveLatestCDD(self.issuer)
-        elif message.header == 'FetchMintKeys':
-            protocol = protocols.GiveMintKeys(self.issuer)
-        elif message.header == 'TransferRequest':
-            protocol = protocols.TransferHandling(self.mint,self.authorizer)
-        elif message.header == 'TransferResume':
-            protocol = protocols.TransferResumeHandling(self.issuer)
+        
+        if message.header == 'SpendRequest':
+            protocol = protocols.SpendListen(wallet,client)
  
         answer = protocol.run(message)
@@ -29 +26 @@
 
 
+class Client(object):
 
-def run_once(port,issuer=None,mint=None,authorizer=None):
-    import time
-    time.sleep(0.001)
-    Handler.issuer = issuer
-    Handler.mint = mint
-    Handler.authorizer = authorizer
-    httpd = BaseHTTPServer.HTTPServer(("", port), Handler)
-    import threading
-    t = threading.Thread(target=httpd.handle_request)     
-    t.start()
+    def __init__(self,port,wallet=None):
+        self.wallet = wallet
+        self.port = port
 
+    def http_run_once(self):
+        import time
+        time.sleep(0.001)
+        httpd = BaseHTTPServer.HTTPServer(("", self.port), Handler)
+        httpd.wallet = self.wallet
+        httpd.walletclient = self
+        import threading
+        t = threading.Thread(target=httpd.handle_request)     
+        t.start()
+

trunk/sandbox/jhb/oc2/wallet.py

@@ -14 +14 @@
         blank.setNewSerial()
         return blank
+
+    def blanksFromCoins(self,coins):
+        pass
 
     def makeSerial(self):
@@ -38 +41 @@
         return approval
         
-
+