From 0f6e06e1e52fb29ef524cd26c8c45beae705e50d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 21 Aug 2019 11:05:19 +0200 Subject: [PATCH] common/tools: reorder coins in coin_info.py so Regtest appears at the beginning --- common/tools/coin_info.py | 2 +- core/src/apps/common/coininfo.py | 46 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/common/tools/coin_info.py b/common/tools/coin_info.py index 4103256ea..13fea7954 100755 --- a/common/tools/coin_info.py +++ b/common/tools/coin_info.py @@ -491,7 +491,7 @@ def deduplicate_keys(all_coins): def _btc_sort_key(coin): - if coin["name"] in ("Bitcoin", "Testnet"): + if coin["name"] in ("Bitcoin", "Testnet", "Regtest"): return "000000" + coin["name"] else: return coin["name"] diff --git a/core/src/apps/common/coininfo.py b/core/src/apps/common/coininfo.py index 5394ff8d5..833e580b0 100644 --- a/core/src/apps/common/coininfo.py +++ b/core/src/apps/common/coininfo.py @@ -100,6 +100,29 @@ def by_name(name: str) -> CoinInfo: curve_name='secp256k1', confidential_assets=None, ) + elif name == "Regtest": + return CoinInfo( + coin_name=name, + coin_shortcut="REGTEST", + address_type=111, + address_type_p2sh=196, + maxfee_kb=10000000, + signed_message_header="Bitcoin Signed Message:\n", + xpub_magic=0x043587cf, + xpub_magic_segwit_p2sh=0x044a5262, + xpub_magic_segwit_native=0x045f1cf6, + bech32_prefix="bcrt", + cashaddr_prefix=None, + slip44=1, + segwit=True, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + negative_fee=False, + curve_name='secp256k1', + confidential_assets=None, + ) elif name == "Testnet": return CoinInfo( coin_name=name, @@ -1411,29 +1434,6 @@ def by_name(name: str) -> CoinInfo: curve_name='secp256k1', confidential_assets=None, ) - elif name == "Regtest": - return CoinInfo( - coin_name=name, - coin_shortcut="REGTEST", - address_type=111, - address_type_p2sh=196, - maxfee_kb=10000000, - signed_message_header="Bitcoin Signed Message:\n", - xpub_magic=0x043587cf, - xpub_magic_segwit_p2sh=0x044a5262, - xpub_magic_segwit_native=0x045f1cf6, - bech32_prefix="bcrt", - cashaddr_prefix=None, - slip44=1, - segwit=True, - fork_id=None, - force_bip143=False, - bip115=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - confidential_assets=None, - ) elif name == "Ritocoin": return CoinInfo( coin_name=name,