AaronFiore/electrum
1
0
Fork 0
Code Activity

Move BIP44 coin type to net constants.

Browse Source
This commit is contained in:
JeremyRand
2018-06-23 14:46:44 +00:00
parent 88d95123fb
commit d1d92e8704
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constants.py
View File

@@ -63,6 +63,7 @@ class BitcoinMainnet:
'p2wpkh': 0x04b24746, # zpub 'p2wpkh': 0x04b24746, # zpub
'p2wsh': 0x02aa7ed3, # Zpub 'p2wsh': 0x02aa7ed3, # Zpub
} }
BIP44_COIN_TYPE = 0
class BitcoinTestnet: class BitcoinTestnet:
@@ -91,6 +92,7 @@ class BitcoinTestnet:
'p2wpkh': 0x045f1cf6, # vpub 'p2wpkh': 0x045f1cf6, # vpub
'p2wsh': 0x02575483, # Vpub 'p2wsh': 0x02575483, # Vpub
} }
BIP44_COIN_TYPE = 1
class BitcoinRegtest(BitcoinTestnet): class BitcoinRegtest(BitcoinTestnet):

2
lib/keystore.py
View File

@@ -716,7 +716,7 @@ is_bip32_key = lambda x: is_xprv(x) or is_xpub(x)
def bip44_derivation(account_id, bip43_purpose=44): 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)) return "m/%d'/%d'/%d'" % (bip43_purpose, coin, int(account_id))
def from_seed(seed, passphrase, is_p2sh): def from_seed(seed, passphrase, is_p2sh):