use the ca list that ships with requests. update test.

[electrum-nvc.git] / lib / paymentrequest.py

diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
index 0dae7f6..8f96966 100644 (file)
--- a/lib/paymentrequest.py
+++ b/lib/paymentrequest.py
@@ -49,22 +49,14 @@ import x509
 REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'}
 ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'}
 
-# status can be:
-PR_UNPAID  = 0
-PR_EXPIRED = 1
-PR_SENT    = 2     # sent but not propagated
-PR_PAID    = 3     # send and propagated
-PR_ERROR   = 4     # could not parse
-
 
 ca_list = {}
-ca_path = os.path.expanduser("~/.electrum/ca/ca-bundle.crt")
+ca_path = requests.certs.where()
 
 
 
 
 def load_certificates():
-
     try:
         ca_f = open(ca_path, 'r')
     except Exception:
@@ -84,7 +76,7 @@ def load_certificates():
             try:
                 x.parse(c)
             except Exception as e:
-                print "cannot parse cert:", e
+                util.print_error("cannot parse cert:", e)
             ca_list[x.getFingerprint()] = x
     ca_f.close()
     util.print_error("%d certificates"%len(ca_list))
@@ -141,6 +133,8 @@ class PaymentRequest:
         with open(filename,'r') as f:
             r = f.read()
 
+        assert key == bitcoin.sha256(r)[0:16].encode('hex')
+        self.id = key
         self.parse(r)
 
 
@@ -257,15 +251,14 @@ class PaymentRequest:
 
         self.payment_url = self.details.payment_url
 
-        #if self.has_expired():
-        #    self.error = "ERROR: Payment Request has Expired."
-        #    return False
-
         return True
 
     def has_expired(self):
         return self.details.expires and self.details.expires < int(time.time())
 
+    def get_expiration_date(self):
+        return self.details.expires
+
     def get_amount(self):
         return sum(map(lambda x:x[1], self.outputs))
 
@@ -327,12 +320,17 @@ if __name__ == "__main__":
         uri = sys.argv[1]
     except:
         print "usage: %s url"%sys.argv[0]
-        print "example url: \"bitcoin:mpu3yTLdqA1BgGtFUwkVJmhnU3q5afaFkf?r=https%3A%2F%2Fbitcoincore.org%2F%7Egavin%2Ff.php%3Fh%3D2a828c05b8b80dc440c80a5d58890298&amount=1\""
+        print "example url: \"bitcoin:17KjQgnXC96jakzJe9yo8zxqerhqNptmhq?amount=0.0018&r=https%3A%2F%2Fbitpay.com%2Fi%2FMXc7qTM5f87EC62SWiS94z\""
         sys.exit(1)
 
-    address, amount, label, message, request_url, url = util.parse_url(uri)
-    pr = PaymentRequest(request_url)
+    address, amount, label, message, request_url = util.parse_URI(uri)
+    from simple_config import SimpleConfig
+    config = SimpleConfig()
+    pr = PaymentRequest(config)
+    pr.read(request_url)
     if not pr.verify():
+        print 'verify failed'
+        print pr.error
         sys.exit(1)
 
     print 'Payment Request Verified Domain: ', pr.domain