Merge opentimestamps#36: Switch to mustache for the template & add latest transactions

petertodd · petertodd · commit 15ba15f2eb96 · 2018-03-29T15:05:29.000-04:00
7c86bc1 added fees in the last week (Vincent Cloutier) 0c0c7d5 updated formula to only use the last week for the average (Vincent Cloutier) 9985a01 added average time between transactions (Vincent Cloutier) 1509975 fix typo in version (Vincent Cloutier) 3fb2715 moved back to inline template (Vincent Cloutier) 3ef9bc5 added latest transactions (Vincent Cloutier) 89a1a24 switched to mustache for templating (Vincent Cloutier) Pull request description: This refactors the current html in rpc.py into it's own file using [mustache](https://mustache.github.io/). This should make things much simpler to get a fancy dashboard with a lot of stats. I've also added a section with the latest timestamping transactions. Using mustache for lists is so much simpler than the built-in format(). Let me know if I should change anything for style/structure/logic/typos. Tree-SHA512: 5adc99f39295b83bd139deea326fcecaed5a2b0bbace649ea2ec3af60e338a0744aebb9f21cbffc4c686a65143f41fecd01c2f58ed4be76c50553886dc71e82f
diff --git a/otsserver/rpc.py b/otsserver/rpc.py
@@ -15,14 +15,17 @@
 import socketserver
 import threading
 import time
+import pystache
+import datetime 
+from functools import reduce
 
 import bitcoin.core
 from bitcoin.core import b2lx, b2x
 
 import otsserver
 from opentimestamps.core.serialize import StreamSerializationContext
 
-
+renderer = pystache.Renderer()
 class RPCRequestHandler(http.server.BaseHTTPRequestHandler):
     MAX_DIGEST_LENGTH = 64
     """Largest digest that can be POSTed for timestamping"""
@@ -154,42 +157,62 @@ def do_GET(self):
             # need to investigate further, but this seems to work.
             str_wallet_balance = str(proxy._call("getbalance"))
 
-            welcome_page = """\
-<html>
+            transactions = proxy._call("listtransactions", "", 50)
+            # We want only the confirmed txs containing an OP_RETURN, from most to least recent
+            transactions = list(filter(lambda x: x["confirmations"] > 0 and x["amount"] == 0, transactions))
+            a_week_ago = (datetime.date.today() - datetime.timedelta(days=7)).timetuple()
+            a_week_ago_posix = time.mktime(a_week_ago)
+            transactions_in_last_week = list(filter(lambda x: x["time"] > a_week_ago_posix, transactions))
+            fees_in_last_week = reduce(lambda a,b: a-b["fee"], transactions_in_last_week, 0)
+            time_between_transactions = round(168 / len(transactions_in_last_week)) # in hours based on 168 hours in a week
+            transactions.sort(key=lambda x: x["confirmations"])
+            homepage_template = """<html>
 <head>
     <title>OpenTimestamps Calendar Server</title>
 </head>
 <body>
-<p>This is an <a href="https://opentimestamps.org">OpenTimestamps</a> <a href="https://github.com/opentimestamps/opentimestamps-server">Calendar Server</a> (v%s)</p>
-
+<p>This is an <a href="https://opentimestamps.org">OpenTimestamps</a> <a href="https://github.com/opentimestamps/opentimestamps-server">Calendar Server</a> (v{{ version }})</p>
 <p>
-Pending commitments: %d</br>
-Transactions waiting for confirmation: %d</br>
-Most recent timestamp tx: %s (%d prior versions)</br>
-Most recent merkle tree tip: %s</br>
-Best-block: %s, height %d</br>
+Pending commitments: {{ pending_commitments }}</br>
+Transactions waiting for confirmation: {{ txs_waiting_for_confirmation }}</br>
+Most recent timestamp tx: {{ most_recent_tx }} ({{ prior_versions }} prior versions)</br>
+Most recent merkle tree tip: {{ tip }}</br>
+Best-block: {{ best_block }}, height {{ block_height }}</br>
 </br>
-Wallet balance: %s BTC</br>
+Wallet balance: {{ balance }} BTC</br>
 </p>
-
 <p>
-You can donate to the wallet by sending funds to: %s</br>
+You can donate to the wallet by sending funds to: {{ address }}</br>
 This address changes after every donation.
 </p>
-
+<p>
+Average time between transactions in the last week: {{ time_between_transactions }} hour(s)</br>
+Fees used in the last week: {{ fees_in_last_week }} BTC</br>
+Latest transactions: </br>
+{{#transactions}}
+    {{txid}} </br>
+{{/transactions}}
+</p>
 </body>
-</html>
-""" % (otsserver.__version__,
-       len(self.calendar.stamper.pending_commitments),
-       len(self.calendar.stamper.txs_waiting_for_confirmation),
-       b2lx(self.calendar.stamper.unconfirmed_txs[-1].tx.GetTxid()) if self.calendar.stamper.unconfirmed_txs else 'None',
-       max(0, len(self.calendar.stamper.unconfirmed_txs) - 1),
-       b2x(self.calendar.stamper.unconfirmed_txs[-1].tip_timestamp.msg) if self.calendar.stamper.unconfirmed_txs else 'None',
-       bitcoin.core.b2lx(proxy.getbestblockhash()), proxy.getblockcount(),
-       str_wallet_balance,
-       str(proxy.getaccountaddress('')))
-
-            self.wfile.write(welcome_page.encode())
+</html>"""
+
+            stats = { 'version': otsserver.__version__,
+              'pending_commitments': len(self.calendar.stamper.pending_commitments),
+              'txs_waiting_for_confirmation':len(self.calendar.stamper.txs_waiting_for_confirmation),
+              'most_recent_tx': b2lx(self.calendar.stamper.unconfirmed_txs[-1].tx.GetTxid()) if self.calendar.stamper.unconfirmed_txs else 'None',
+              'prior_versions': max(0, len(self.calendar.stamper.unconfirmed_txs) - 1),
+              'tip': b2x(self.calendar.stamper.unconfirmed_txs[-1].tip_timestamp.msg) if self.calendar.stamper.unconfirmed_txs else 'None',
+              'best_block': bitcoin.core.b2lx(proxy.getbestblockhash()),
+              'block_height': proxy.getblockcount(),
+              'balance': str_wallet_balance,
+              'address': str(proxy.getaccountaddress('')),
+              'transactions': transactions[:5],
+              'time_between_transactions': time_between_transactions,
+              'fees_in_last_week': fees_in_last_week,
+            }
+            welcome_page = renderer.render(homepage_template, stats)
+            self.wfile.write(str.encode(welcome_page))
+
 
         elif self.path.startswith('/timestamp/'):
             self.get_timestamp()
diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,4 @@ opentimestamps>=0.2.1
 GitPython>=2.0.8
 leveldb>=0.20
 pysha3>=1.0.2
+pystache>=0.5
