tfix xtype of ypub keys in plugins and bip39 seeds - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit a10e6b6436c10c35bdd3aa46418d0c94409837c5
 (DIR) parent 0af700bda04afaffd48143d44664226328df53dc
 (HTM) Author: ThomasV <thomasv@electrum.org>
       Date:   Thu, 26 Oct 2017 17:24:50 +0200
       
       fix xtype of ypub keys in plugins and bip39 seeds
       
       Diffstat:
         M lib/keystore.py                     |       2 +-
         M plugins/ledger/ledger.py            |       2 +-
         M plugins/trezor/clientbase.py        |       2 +-
       
       3 files changed, 3 insertions(+), 3 deletions(-)
       ---
 (DIR) diff --git a/lib/keystore.py b/lib/keystore.py
       t@@ -576,7 +576,7 @@ def bip39_is_checksum_valid(mnemonic):
        def from_bip39_seed(seed, passphrase, derivation):
            k = BIP32_KeyStore({})
            bip32_seed = bip39_to_seed(seed, passphrase)
       -    t = 'segwit_p2sh' if derivation.startswith("m/49'") else 'standard'  # bip43
       +    t = 'p2wpkh-p2sh' if derivation.startswith("m/49'") else 'standard'  # bip43
            k.add_xprv_from_seed(bip32_seed, t, derivation)
            return k
        
 (DIR) diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
       t@@ -65,7 +65,7 @@ class Ledger_Client():
                    elif bip32_path.startswith("m/49'/"):
                        if not self.supports_segwit():
                            raise Exception("Firmware version too old for Segwit support. Please update at https://www.ledgerwallet.com")
       -                xtype = 'segwit_p2sh'
       +                xtype = 'p2wpkh-p2sh'
                    else:
                        xtype = 'standard'
                    splitPath = bip32_path.split('/')
 (DIR) diff --git a/plugins/trezor/clientbase.py b/plugins/trezor/clientbase.py
       t@@ -151,7 +151,7 @@ class TrezorClientBase(GuiMixin, PrintError):
                address_n = self.expand_path(bip32_path)
                creating = False #self.next_account_number() == 0
                node = self.get_public_node(address_n, creating).node
       -        xtype = 'segwit_p2sh' if bip32_path.startswith("m/49'/") else 'standard'
       +        xtype = 'p2wpkh-p2sh' if bip32_path.startswith("m/49'/") else 'standard'
                return serialize_xpub(xtype, node.chain_code, node.public_key, node.depth, self.i4b(node.fingerprint), self.i4b(node.child_num))
        
            #def address_from_derivation(self, derivation):