diff --git a/electrum/exchange_rate.py b/electrum/exchange_rate.py index 7b892f473..b17458c52 100644 --- a/electrum/exchange_rate.py +++ b/electrum/exchange_rate.py @@ -291,7 +291,7 @@ class CoinMarketCap(ExchangeBase): async def get_rates(self, ccy): json = await self.get_json('api.coinmarketcap.com', '/v2/ticker/1298/?convert=%s' % ccy) - result[ccy] = Decimal(json['data']['quotes'][ccy]['price']) + result = {ccy: Decimal(json['data']['quotes'][ccy]['price'])} return result class Foxbit(ExchangeBase): diff --git a/electrum/mnemonic.py b/electrum/mnemonic.py index 6de217509..a3baca9ed 100644 --- a/electrum/mnemonic.py +++ b/electrum/mnemonic.py @@ -131,7 +131,7 @@ class Mnemonic(object): mnemonic = normalize_text(mnemonic) passphrase = passphrase or '' passphrase = normalize_text(passphrase) - return hashlib.pbkdf2_hmac('sha512', mnemonic.encode('utf-8'), b'electrum' + passphrase.encode('utf-8'), iterations = PBKDF2_ROUNDS) + return hashlib.pbkdf2_hmac('sha512', mnemonic.encode('utf-8'), b'lbryum' + passphrase.encode('utf-8'), iterations = PBKDF2_ROUNDS) def mnemonic_encode(self, i): n = len(self.wordlist) diff --git a/electrum/simple_config.py b/electrum/simple_config.py index b5b0083db..0458b67c7 100644 --- a/electrum/simple_config.py +++ b/electrum/simple_config.py @@ -22,7 +22,7 @@ FEERATE_MAX_DYNAMIC = 50000 FEERATE_WARNING_HIGH_FEE = 600000 FEERATE_FALLBACK_STATIC_FEE = 50000 FEERATE_DEFAULT_RELAY = 50000 -FEERATE_STATIC_VALUES = [50000] +FEERATE_STATIC_VALUES = [50000,100000] config = None