From: ThomasV <thomasv@gitorious>
Date: Fri, 30 Mar 2012 08:47:35 +0000 (+0400)
Subject: new spec and conversion
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=9ffe305089150cc8b236c801d6b5c15d4f98e764

new spec and conversion
---

diff --git a/modules/abe/__init__.py b/modules/abe/__init__.py
index dc7056a..445d1b2 100644
--- a/modules/abe/__init__.py
+++ b/modules/abe/__init__.py
@@ -205,13 +205,13 @@ class AbeStore(Datastore_class):
                 break
             tx_hash = self.hashout_hex(tx_hash)
             txpoint = {
-                    "nTime":    int(nTime),
+                    "timestamp":    int(nTime),
                     "height":   int(height),
-                    "is_in":    int(is_in),
-                    "blk_hash": self.hashout_hex(blk_hash),
+                    "is_input":    int(is_in),
+                    "block_hash": self.hashout_hex(blk_hash),
                     "tx_hash":  tx_hash,
                     "tx_id":    int(tx_id),
-                    "pos":      int(pos),
+                    "index":      int(pos),
                     "value":    int(value),
                     }
 
@@ -220,7 +220,7 @@ class AbeStore(Datastore_class):
 
 
         # todo: sort them really...
-        txpoints = sorted(txpoints, key=operator.itemgetter("nTime"))
+        txpoints = sorted(txpoints, key=operator.itemgetter("timestamp"))
 
         # read memory pool
         rows = []
@@ -243,13 +243,13 @@ class AbeStore(Datastore_class):
 
             #print "mempool", tx_hash
             txpoint = {
-                    "nTime":    0,
+                    "timestamp":    0,
                     "height":   0,
-                    "is_in":    int(is_in),
-                    "blk_hash": 'mempool', 
+                    "is_input":    int(is_in),
+                    "block_hash": 'mempool', 
                     "tx_hash":  tx_hash,
                     "tx_id":    int(tx_id),
-                    "pos":      int(pos),
+                    "index":      int(pos),
                     "value":    int(value),
                     }
             txpoints.append(txpoint)
@@ -274,7 +274,7 @@ class AbeStore(Datastore_class):
             txpoint['outputs'] = txoutputs
 
             # for all unspent inputs, I want their scriptpubkey. (actually I could deduce it from the address)
-            if not txpoint['is_in']:
+            if not txpoint['is_input']:
                 # detect if already redeemed...
                 for row in outrows:
                     if row[6] == dbhash: break
@@ -284,7 +284,7 @@ class AbeStore(Datastore_class):
                 # pos, script, value, o_hash, o_id, o_pos, binaddr = row
                 # if not redeemed, we add the script
                 if row:
-                    if not row[4]: txpoint['raw_scriptPubKey'] = row[1]
+                    if not row[4]: txpoint['raw_output_script'] = row[1]
 
         # cache result
         if not address_has_mempool:
@@ -300,7 +300,7 @@ class AbeStore(Datastore_class):
             status = None
         else:
             lastpoint = tx_points[-1]
-            status = lastpoint['blk_hash']
+            status = lastpoint['block_hash']
             # this is a temporary hack; move it up once old clients have disappeared
             if status == 'mempool': # and session['version'] != "old":
                 status = status + ':%d'% len(tx_points)
diff --git a/modules/abe/__init__.pyc b/modules/abe/__init__.pyc
index 344ae06..7f7341f 100644
Binary files a/modules/abe/__init__.pyc and b/modules/abe/__init__.pyc differ
diff --git a/transports/native.py b/transports/native.py
index 6eddf4b..2ed7ff9 100644
--- a/transports/native.py
+++ b/transports/native.py
@@ -10,6 +10,15 @@ def timestr():
     return time.strftime("[%d/%m/%Y-%H:%M:%S]")
 
 
+def new_to_old(s):
+    s = s.replace("'block_hash'", "'blk_hash'")
+    s = s.replace("'index'", "'pos'")
+    s = s.replace("'timestamp'", "'nTime'")
+    s = s.replace("'is_input'", "'is_in'")
+    s = s.replace("'raw_output_script'","'raw_scriptPubKey'")
+    return s
+
+
 class NativeServer(threading.Thread):
 
     def __init__(self, shared, abe, irc, banner, host, port):
@@ -156,6 +165,7 @@ class NativeServer(threading.Thread):
         elif cmd == 'h': 
             address = data
             out = repr( self.store.get_history( address ) )
+            out = new_to_old(out)
 
         elif cmd =='tx':
             out = self.store.send_tx(data)