diff --git a/contrib/requirements/requirements-hw.txt b/contrib/requirements/requirements-hw.txt index a311fb5d..34994550 100644 --- a/contrib/requirements/requirements-hw.txt +++ b/contrib/requirements/requirements-hw.txt @@ -1,5 +1,5 @@ Cython>=0.27 -trezor[hidapi]>=0.11.0 +trezor[hidapi]>=0.11.1 safet[hidapi]>=0.1.0 keepkey btchip-python>=0.1.26 diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt index a13b918e..88fd203d 100644 --- a/contrib/requirements/requirements.txt +++ b/contrib/requirements/requirements.txt @@ -9,4 +9,4 @@ aiorpcx>=0.9,<0.11 aiohttp>=3.3.0 aiohttp_socks certifi -pylibscrypt=1.7.1 +pylibscrypt==1.7.1 diff --git a/electrum/constants.py b/electrum/constants.py index f46f862e..1b4d6b43 100644 --- a/electrum/constants.py +++ b/electrum/constants.py @@ -49,8 +49,8 @@ class BitcoinMainnet(AbstractNet): TESTNET = False WIF_PREFIX = 0xa3 ADDRTYPE_P2PKH = 35 - ADDRTYPE_P2SH = 8 - SEGWIT_HRP = "ltc" + ADDRTYPE_P2SH = 94 + SEGWIT_HRP = "flo" GENESIS = "09c7781c9df90708e278c35d38ea5c9041d7ecfcdd1c56ba67274b7cff3e1cea" DEFAULT_PORTS = {'t': '50001', 's': '50002'} DEFAULT_SERVERS = read_json('servers.json', {}) @@ -70,7 +70,7 @@ class BitcoinMainnet(AbstractNet): 'p2wpkh': 0x04b24746, # zpub 'p2wsh': 0x02aa7ed3, # Zpub } - BIP44_COIN_TYPE = 2 + BIP44_COIN_TYPE = 216 # FLO Network constants fPowAllowMinDifficultyBlocks = False fPowNoRetargeting = False @@ -103,8 +103,8 @@ class BitcoinTestnet(AbstractNet): TESTNET = True WIF_PREFIX = 0xef ADDRTYPE_P2PKH = 115 - ADDRTYPE_P2SH = 198 - SEGWIT_HRP = "tltc" + ADDRTYPE_P2SH = 58 + SEGWIT_HRP = "tflo" GENESIS = "9b7bc86236c34b5e3a39367c036b7fe8807a966c22a7a1f0da2a198a27e03731" DEFAULT_PORTS = {'t': '51001', 's': '51002'} DEFAULT_SERVERS = read_json('servers_testnet.json', {}) diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py index d88ca07c..fe8c7de4 100644 --- a/electrum/plugins/keepkey/keepkey.py +++ b/electrum/plugins/keepkey/keepkey.py @@ -154,7 +154,7 @@ class KeepKeyPlugin(HW_PluginBase): return client def get_coin_name(self): - return "Testnet" if constants.net.TESTNET else "Bitcoin" + return "Testnet" if constants.net.TESTNET else "Florincoin" def initialize_device(self, device_id, wizard, handler): # Initialization method diff --git a/electrum/plugins/ledger/ledger.py b/electrum/plugins/ledger/ledger.py index 7d2d14f0..2cb10e0a 100644 --- a/electrum/plugins/ledger/ledger.py +++ b/electrum/plugins/ledger/ledger.py @@ -30,7 +30,7 @@ except ImportError: MSG_NEEDS_FW_UPDATE_GENERIC = _('Firmware version too old. Please update at') + \ ' https://www.ledgerwallet.com' -MSG_NEEDS_FW_UPDATE_SEGWIT = _('Firmware version (or "Bitcoin" app) too old for Segwit support. Please update at') + \ +MSG_NEEDS_FW_UPDATE_SEGWIT = _('Firmware version (or "Florincoin" app) too old for Segwit support. Please update at') + \ ' https://www.ledgerwallet.com' MULTI_OUTPUT_SUPPORT = '1.1.4' SEGWIT_SUPPORT = '1.1.10' diff --git a/electrum/plugins/safe_t/safe_t.py b/electrum/plugins/safe_t/safe_t.py index 24604f0f..9845fa39 100644 --- a/electrum/plugins/safe_t/safe_t.py +++ b/electrum/plugins/safe_t/safe_t.py @@ -159,7 +159,7 @@ class SafeTPlugin(HW_PluginBase): return client def get_coin_name(self): - return "Testnet" if constants.net.TESTNET else "Bitcoin" + return "Testnet" if constants.net.TESTNET else "Florincoin" def initialize_device(self, device_id, wizard, handler): # Initialization method diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py index 26a6af19..0fd3face 100644 --- a/electrum/plugins/trezor/trezor.py +++ b/electrum/plugins/trezor/trezor.py @@ -160,7 +160,7 @@ class TrezorPlugin(HW_PluginBase): return client def get_coin_name(self): - return "Testnet" if constants.net.TESTNET else "Bitcoin" + return "Testnet" if constants.net.TESTNET else "Florincoin" def initialize_device(self, device_id, wizard, handler): # Initialization method