electrum

commit d03dc0e508459e368338566280361f22faeb312c
parent 88d95123fb0d1817804b6c8712dfbf4e7fd45254
Author: ghost43 <somber.night@protonmail.com>
Date:   Sun, 24 Jun 2018 01:01:11 +0200

Merge pull request #4458 from JeremyRand/bitcoin-bip44-coin

Move BIP44 coin type to net constants.
Diffstat:
M
lib/constants.py
 | 
2
++
M
lib/keystore.py
 | 
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/constants.py b/lib/constants.py
@@ -63,6 +63,7 @@ class BitcoinMainnet:
         'p2wpkh':      0x04b24746,  # zpub
         'p2wsh':       0x02aa7ed3,  # Zpub
     }
+    BIP44_COIN_TYPE = 0
 
 
 class BitcoinTestnet:
@@ -91,6 +92,7 @@ class BitcoinTestnet:
         'p2wpkh':      0x045f1cf6,  # vpub
         'p2wsh':       0x02575483,  # Vpub
     }
+    BIP44_COIN_TYPE = 1
 
 
 class BitcoinRegtest(BitcoinTestnet):
diff --git a/lib/keystore.py b/lib/keystore.py
@@ -716,7 +716,7 @@ is_bip32_key = lambda x: is_xprv(x) or is_xpub(x)
 
 
 def bip44_derivation(account_id, bip43_purpose=44):
-    coin = 1 if constants.net.TESTNET else 0
+    coin = constants.net.BIP44_COIN_TYPE
     return "m/%d'/%d'/%d'" % (bip43_purpose, coin, int(account_id))
 
 def from_seed(seed, passphrase, is_p2sh):