Merge remote-tracking branch 'remotes/upstream/master'

etotheipi · Jun 15, 2014 · 2800636 · 2800636
2 parents 9514a43 + 99c8cd1
commit 2800636
Show file tree

Hide file tree

Showing 297 changed files with 99,087 additions and 58,899 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,8 +30,13 @@ osxbuild/env
 
 /CompilerArgs.nsi
 /build/bdist.win32/winexe/temp
-cppForSwig
 /*.dll
 /qrc_img_resources.py
 /.project
 /.pydevproject
+/.settings
+/*.wallet
+
+/findpass.py
+/*.txt
+/sandbox.py
diff --git a/ArmoryDB.py b/ArmoryDB.py
@@ -15,14 +15,17 @@
 #
 #######################################################################################################
 
-import leveldb
-from armoryengine import *
-import struct
 import os
+import struct
+
+from armoryengine.ArmoryUtils import ARMORY_HOME_DIR, unpackVarInt
+from armoryengine.Block import PyBlockHeader
+from armoryengine.Transaction import PyTx
+import leveldb
+
 
 #dbheaders_path = '/home/goat/.armory/databases/leveldb_headers'
 #dbblkdata_path = '/home/goat/.armory/databases/leveldb_blkdata'
-
 dbheaders_path = os.path.join(ARMORY_HOME_DIR, 'databases', 'leveldb_headers')
 dbblkdata_path = os.path.join(ARMORY_HOME_DIR, 'databases', 'leveldb_blkdata')
 
@@ -245,7 +248,7 @@ def blkdataDBHasBlockHash(self, Hash):
       if(len(val)==84):
          key = '\x03' + val[80:84]
          try:
-            val = dArmoryDB.bblkdata.Get(key)
+            val = ArmoryDB.bblkdata.Get(key)
             return True
          except:
             return False