Merge branch 'development' of github.com:CityOfZion/neo-python into d…

…evelopment
CityOfZion · Jan 12, 2018 · f42599c · f42599c
2 parents 16946a8 + b542a8c
commit f42599c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/neo/Implementations/Wallets/peewee/UserWallet.py b/neo/Implementations/Wallets/peewee/UserWallet.py
@@ -28,7 +28,6 @@
 
 
 class UserWallet(Wallet):
-
     Version = None
 
     __dbaccount = None
@@ -292,7 +291,6 @@ def LoadContracts(self):
         ctr = {}
 
         for ct in Contract.select():
-
             data = binascii.unhexlify(ct.RawData)
             contract = Helper.AsSerializableWithType(data, 'neo.SmartContract.Contract.Contract')
             ctr[contract.ScriptHash.ToBytes()] = contract
@@ -498,7 +496,6 @@ def DeleteAddress(self, script_hash):
 
             address = c.Address
             if address.ScriptHash == todelete:
-
                 c.delete_instance()
                 address.delete_instance()
 
@@ -540,7 +537,8 @@ def ToJson(self, verbose=False):
                     has_watch_addr = True
             else:
                 token_balances = self.TokenBalancesForAddress(addr_str)
-                json = {'script_hash': addr_str, 'tokens': token_balances}
+                script_hash = binascii.hexlify(addr.ScriptHash)
+                json = {'address': addr_str, 'script_hash': script_hash.decode('utf8'), 'tokens': token_balances}
                 addresses.append(json)
 
         balances = []