From f1d4838012414f531268d3e66ef62f7aadd3d14a Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sun, 4 Nov 2012 15:47:19 +0100
Subject: [PATCH] rename history -> addr_history

---
 lib/wallet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py
index 459dc666..b85884df 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -72,7 +72,7 @@ class Wallet:
         self.receipts              = config.get('receipts',{})            # signed URIs
         self.addressbook           = config.get('contacts', [])           # outgoing addresses, for payments
         self.imported_keys         = config.get('imported_keys',{})
-        self.history               = config.get('history',{})             # address -> list(txid, height, timestamp)
+        self.history               = config.get('addr_history',{})        # address -> list(txid, height)
         self.transactions          = config.get('transactions',{})        # txid -> deserialised
 
         # not saved
@@ -848,7 +848,7 @@ class Wallet:
             'seed': self.seed,
             'addresses': self.addresses,
             'change_addresses': self.change_addresses,
-            'history': self.history, 
+            'addr_history': self.history, 
             'labels': self.labels,
             'contacts': self.addressbook,
             'imported_keys': self.imported_keys,