input extkey in hex

stequald · Aug 11, 2014 · 4f3ea69 · 4f3ea69
1 parent 038cfc3
commit 4f3ea69
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/kt.py b/kt.py
@@ -1410,7 +1410,12 @@ def outputExtKeysFromSeed(seed, chainStr, seedStringFormat, roundsToHash, option
         traversePreorder(keyNodeSeed, treeChains, KeyTreeUtil.MASTER_NODE_LOWERCASE_M, optionsDict)
 
 def outputExtKeysFromExtKey(extKey, chainStr, optionsDict, traverseType = DEFAULTTREETRAVERSALTYPE):
-    keyNode = KeyNode(extkey = DecodeBase58Check(extKey))
+    keyNode = None
+    try:
+        int(extKey, 16)
+        keyNode = KeyNode(extkey = extKey.decode('hex'))
+    except ValueError:
+        keyNode = KeyNode(extkey = DecodeBase58Check(extKey))
 
     treeChains = KeyTreeUtil.parseChainString(chainStr)