Merge pull request #5 from joemarct/master

Generating addresses for DASH testnet

pywallet/utils/bip32.py

@@ -131,7 +131,7 @@ class Wallet(object):
             else:
                 raise ValueError("parameter must be an int or long")
 
-        self.network = network
+        self.network = Wallet.get_network(network)
         self.depth = l(depth)
         if (isinstance(parent_fingerprint, six.string_types) or
                 isinstance(parent_fingerprint, six.binary_type)):
@@ -657,6 +657,8 @@ class Wallet(object):
             response = BitcoinGoldMainNet
         elif network == "dash" or network == "DASH":
             response = DashMainNet
+        elif network == 'dash_testnet' or network == 'DASHTEST':
+            response = DashTestNet
         else:
             response = network
         return response

pywallet/wallet.py

@@ -80,6 +80,8 @@ def get_network(network='btctest'):
         return BitcoinGoldMainNet
     elif network == "dash" or network == "dash":
         return DashMainNet
+    elif network == "dash_testnet" or network == 'dashtest':
+        return DashTestNet
 
     return BitcoinTestNet