diff --git a/common/defs/bitcoin/gamecredits.json b/common/defs/bitcoin/gamecredits.json deleted file mode 100644 index 7daa99685..000000000 --- a/common/defs/bitcoin/gamecredits.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "coin_name": "GameCredits", - "coin_shortcut": "GAME", - "coin_label": "GameCredits", - "website": "https://gamecredits.org", - "github": "https://github.com/gamecredits-project/gamecredits", - "maintainer": "Samad Sajanlal ", - "curve_name": "secp256k1", - "decimals": 8, - "address_type": 38, - "address_type_p2sh": 62, - "maxfee_kb": 53000000000, - "minfee_kb": 100000, - "signed_message_header": "GameCredits Signed Message:\n", - "hash_genesis_block": "91ec5f25ee9a0ffa1af7d4da4db9a552228dd2dc77cdb15b738be4e1f55f30ee", - "xpub_magic": 27106558, - "xprv_magic": 27108450, - "xpub_magic_segwit_p2sh": 28471030, - "xpub_magic_segwit_native": 78792518, - "xpub_magic_multisig_segwit_p2sh": 27108450, - "xpub_magic_multisig_segwit_native": 27108450, - "bech32_prefix": "game", - "cashaddr_prefix": null, - "slip44": 101, - "segwit": true, - "taproot": false, - "decred": false, - "fork_id": null, - "force_bip143": false, - "default_fee_b": { - "Normal": 1000 - }, - "dust_limit": 54600, - "blocktime_seconds": 90, - "uri_prefix": "gamecredits", - "min_address_length": 27, - "max_address_length": 34, - "negative_fee": false, - "cooldown": 100, - "consensus_branch_id": null, - "extra_data": false, - "timestamp": false, - "confidential_assets": null -} diff --git a/common/defs/bitcoin/gamecredits.png b/common/defs/bitcoin/gamecredits.png deleted file mode 100644 index df88f04ca..000000000 Binary files a/common/defs/bitcoin/gamecredits.png and /dev/null differ diff --git a/common/defs/bitcoin/nix.json b/common/defs/bitcoin/nix.json deleted file mode 100644 index e44f61e3a..000000000 --- a/common/defs/bitcoin/nix.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "coin_name": "NIX", - "coin_shortcut": "NIX", - "coin_label": "NIX", - "website": "https://nixplatform.io", - "github": "https://github.com/nixplatform/nixcore", - "maintainer": "mattt21 ", - "curve_name": "secp256k1", - "decimals": 8, - "address_type": 38, - "address_type_p2sh": 53, - "maxfee_kb": 30000000000, - "minfee_kb": 0, - "signed_message_header": "NIX Signed Message:\n", - "hash_genesis_block": "dd28ad86def767c3cfc34267a950d871fc7462bc57ea4a929fc3596d9b598e41", - "xprv_magic": 76066276, - "xpub_magic": 76067358, - "xpub_magic_segwit_p2sh": 77429938, - "xpub_magic_segwit_native": 78792518, - "xpub_magic_multisig_segwit_p2sh": 76067358, - "xpub_magic_multisig_segwit_native": 76067358, - "bech32_prefix": "nix", - "cashaddr_prefix": null, - "slip44": 400, - "segwit": true, - "taproot": false, - "decred": false, - "fork_id": null, - "force_bip143": false, - "default_fee_b": { - "Normal": 1000 - }, - "dust_limit": 54600, - "blocktime_seconds": 120, - "uri_prefix": "nix", - "min_address_length": 27, - "max_address_length": 34, - "negative_fee": false, - "cooldown": 100, - "consensus_branch_id": null, - "extra_data": false, - "timestamp": false, - "confidential_assets": null -} diff --git a/common/defs/bitcoin/nix.png b/common/defs/bitcoin/nix.png deleted file mode 100644 index 132c4062b..000000000 Binary files a/common/defs/bitcoin/nix.png and /dev/null differ diff --git a/common/defs/bitcoin/polis.json b/common/defs/bitcoin/polis.json deleted file mode 100644 index 582118c52..000000000 --- a/common/defs/bitcoin/polis.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "coin_name": "Polis", - "coin_shortcut": "POLIS", - "coin_label": "Polis", - "website": "https://www.polispay.org", - "github": "https://github.com/polispay/polis", - "maintainer": "Cronos ", - "curve_name": "secp256k1", - "decimals": 8, - "address_type": 55, - "address_type_p2sh": 56, - "maxfee_kb": 4900000000, - "minfee_kb": 1000, - "signed_message_header": "Polis Signed Message:\n", - "hash_genesis_block": "000009701eb781a8113b1af1d814e2f060f6408a2c990db291bc5108a1345c1e", - "xprv_magic": 65165637, - "xpub_magic": 65166718, - "xpub_magic_segwit_p2sh": null, - "xpub_magic_segwit_native": null, - "xpub_magic_multisig_segwit_p2sh": null, - "xpub_magic_multisig_segwit_native": null, - "bech32_prefix": null, - "cashaddr_prefix": null, - "slip44": 1997, - "segwit": false, - "taproot": false, - "decred": false, - "fork_id": null, - "force_bip143": false, - "default_fee_b": { - "Normal": 10 - }, - "dust_limit": 5460, - "blocktime_seconds": 120, - "uri_prefix": "polis", - "min_address_length": 27, - "max_address_length": 34, - "negative_fee": false, - "cooldown": 100, - "consensus_branch_id": null, - "extra_data": false, - "timestamp": false, - "confidential_assets": null -} diff --git a/common/defs/bitcoin/polis.png b/common/defs/bitcoin/polis.png deleted file mode 100644 index 56c8827c8..000000000 Binary files a/common/defs/bitcoin/polis.png and /dev/null differ diff --git a/common/defs/blockchain_link.json b/common/defs/blockchain_link.json index 86f579480..27d21ae42 100644 --- a/common/defs/blockchain_link.json +++ b/common/defs/blockchain_link.json @@ -75,12 +75,6 @@ "https://explorer.fujicoin.org" ] }, - "bitcoin:GAME": { - "type": "blockbook", - "url": [ - "https://blockbook.gamecredits.network" - ] - }, "bitcoin:GRS": { "type": "blockbook", "url": [ @@ -128,12 +122,6 @@ "https://blockbook.pivx.link" ] }, - "bitcoin:POLIS": { - "type": "blockbook", - "url": [ - "https://blockbook.polispay.org" - ] - }, "bitcoin:PPC": { "type": "blockbook", "url": [ diff --git a/common/defs/coins_details.json b/common/defs/coins_details.json index 8451bc390..52e24f066 100644 --- a/common/defs/coins_details.json +++ b/common/defs/coins_details.json @@ -362,24 +362,6 @@ } ] }, - "bitcoin:GAME": { - "links": { - "Github": "https://github.com/gamecredits-project/gamecredits", - "Homepage": "https://gamecredits.org" - }, - "marketcap_usd": 30648608, - "name": "GameCredits", - "shortcut": "GAME", - "t1_enabled": "yes", - "t2_enabled": "yes", - "type": "coin", - "wallet": [ - { - "name": "Electrum-GAME", - "url": "https://electrum-game.org" - } - ] - }, "bitcoin:GRS": { "links": { "Github": "https://github.com/Groestlcoin/groestlcoin", @@ -491,24 +473,6 @@ } ] }, - "bitcoin:NIX": { - "links": { - "Github": "https://github.com/nixplatform/nixcore", - "Homepage": "https://nixplatform.io" - }, - "marketcap_usd": 755580, - "name": "NIX", - "shortcut": "NIX", - "t1_enabled": "yes", - "t2_enabled": "yes", - "type": "coin", - "wallet": [ - { - "name": "NIX-Electrum", - "url": "https://github.com/nixplatform/electrum-nix" - } - ] - }, "bitcoin:NMC": { "links": { "Github": "https://github.com/namecoin/namecoin-core", @@ -531,24 +495,6 @@ } ] }, - "bitcoin:POLIS": { - "links": { - "Github": "https://github.com/polispay/polis", - "Homepage": "https://www.polispay.org" - }, - "marketcap_usd": 5255034, - "name": "Polis", - "shortcut": "POLIS", - "t1_enabled": "yes", - "t2_enabled": "yes", - "type": "coin", - "wallet": [ - { - "name": "PolisPay", - "url": "https://polispay.com" - } - ] - }, "bitcoin:PPC": { "links": { "Github": "https://github.com/peercoin/peercoin", diff --git a/common/defs/support.json b/common/defs/support.json index 3cf4cd9ec..2ef56f3d4 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -16,15 +16,12 @@ "bitcoin:FJC": true, "bitcoin:FLO": true, "bitcoin:FTC": true, - "bitcoin:GAME": true, "bitcoin:KMD": true, "bitcoin:KOTO": true, "bitcoin:LTC": true, "bitcoin:MONA": true, "bitcoin:MUE": true, - "bitcoin:NIX": true, "bitcoin:NMC": true, - "bitcoin:POLIS": true, "bitcoin:PPC": true, "bitcoin:REGTEST": true, "bitcoin:RITO": true, @@ -126,16 +123,13 @@ "bitcoin:FJC": "1.6.1", "bitcoin:FLO": "1.7.2", "bitcoin:FTC": "1.7.1", - "bitcoin:GAME": "1.7.1", "bitcoin:GRS": "1.6.2", "bitcoin:KMD": "1.8.0", "bitcoin:KOTO": "1.7.1", "bitcoin:LTC": "1.5.2", "bitcoin:MONA": "1.6.0", "bitcoin:MUE": "1.7.1", - "bitcoin:NIX": "1.7.2", "bitcoin:NMC": "1.5.2", - "bitcoin:POLIS": "1.8.2", "bitcoin:PPC": "1.8.4", "bitcoin:QTUM": "1.8.1", "bitcoin:REGTEST": "1.8.2", @@ -2123,6 +2117,7 @@ "eth:PIX": "1.10.5", "eth:PLS": "1.10.4", "eth:POA": "1.9.4", + "eth:POLIS": "1.10.6", "eth:POP": "1.10.4", "eth:QKC:100000": "1.10.3", "eth:QKC:100001": "1.10.3", @@ -2490,7 +2485,6 @@ "eth:GTH:486217935": "exclude testnet", "eth:KTO:8285": "exclude testnet", "eth:NEON:245022926": "duplicate key", - "eth:POLIS": "duplicate key", "eth:QKC:110000": "exclude testnet", "eth:QKC:110001": "exclude testnet", "eth:QKC:110002": "exclude testnet", @@ -2608,16 +2602,13 @@ "bitcoin:FJC": "2.0.5", "bitcoin:FLO": "2.0.11", "bitcoin:FTC": "2.0.8", - "bitcoin:GAME": "2.0.8", "bitcoin:GRS": "2.0.8", "bitcoin:KMD": "2.0.11", "bitcoin:KOTO": "2.0.8", "bitcoin:LTC": "2.0.5", "bitcoin:MONA": "2.0.5", "bitcoin:MUE": "2.0.8", - "bitcoin:NIX": "2.0.11", "bitcoin:NMC": "2.0.5", - "bitcoin:POLIS": "2.1.1", "bitcoin:PPC": "2.1.9", "bitcoin:QTUM": "2.1.1", "bitcoin:REGTEST": "2.1.1", @@ -4605,6 +4596,7 @@ "eth:PIX": "2.4.4", "eth:PLS": "2.4.3", "eth:POA": "2.3.5", + "eth:POLIS": "2.4.4", "eth:POP": "2.4.3", "eth:QKC:100000": "2.4.2", "eth:QKC:100001": "2.4.2", @@ -4980,7 +4972,6 @@ "eth:GTH:486217935": "exclude testnet", "eth:KTO:8285": "exclude testnet", "eth:NEON:245022926": "duplicate key", - "eth:POLIS": "duplicate key", "eth:QKC:110000": "exclude testnet", "eth:QKC:110001": "exclude testnet", "eth:QKC:110002": "exclude testnet", diff --git a/common/defs/wallets.json b/common/defs/wallets.json index a40679024..5c450b439 100644 --- a/common/defs/wallets.json +++ b/common/defs/wallets.json @@ -26,6 +26,9 @@ "bitcoin:CPU": { "Electrum-CPU": "https://cpuchain.org/download-page.html" }, + "bitcoin:CRW": { + "Crown-Electrum": "https://github.com/Crowndev/crown-electrum" + }, "bitcoin:DASH": { "Dash Electrum": "https://electrum.dash.org", "DMT": "https://github.com/Bertrand256/dash-masternode-tool", @@ -49,9 +52,6 @@ "bitcoin:FTC": { "Electrum-FTC": "https://github.com/Feathercoin-Foundation/electrum-ftc" }, - "bitcoin:GAME": { - "Electrum-GAME": "https://electrum-game.org" - }, "bitcoin:GRS": { "Electrum-GRS": "https://www.groestlcoin.org/groestlcoin-electrum-wallet" }, @@ -68,18 +68,12 @@ "bitcoin:MUE": { "Electrum-MUE": "https://electrum.monetaryunit.org" }, - "bitcoin:NIX": { - "NIX-Electrum": "https://github.com/nixplatform/electrum-nix" - }, "bitcoin:NMC": { "Electrum-NMC": "https://github.com/namecoin/electrum-nmc" }, "bitcoin:PART": { "Particl Core": "https://github.com/particl/particl-core/releases" }, - "bitcoin:POLIS": { - "PolisPay": "https://polispay.com" - }, "bitcoin:QTUM": { "Qtum-Electrum": "https://github.com/qtumproject/qtum-electrum" }, diff --git a/core/.changelog.d/2181.removed b/core/.changelog.d/2181.removed new file mode 100644 index 000000000..5a50859e1 --- /dev/null +++ b/core/.changelog.d/2181.removed @@ -0,0 +1 @@ +GAME, NIX and POLIS support diff --git a/core/src/apps/common/coininfo.py b/core/src/apps/common/coininfo.py index 4ced81a93..bc3ae91d7 100644 --- a/core/src/apps/common/coininfo.py +++ b/core/src/apps/common/coininfo.py @@ -816,35 +816,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - if name == "GameCredits": - return CoinInfo( - coin_name=name, - coin_shortcut="GAME", - decimals=8, - address_type=38, - address_type_p2sh=62, - maxfee_kb=53000000000, - signed_message_header="GameCredits Signed Message:\n", - xpub_magic=0x019d9cfe, - xpub_magic_segwit_p2sh=0x01b26ef6, - xpub_magic_segwit_native=0x04b24746, - xpub_magic_multisig_segwit_p2sh=0x019da462, - xpub_magic_multisig_segwit_native=0x019da462, - bech32_prefix="game", - cashaddr_prefix=None, - slip44=101, - segwit=True, - taproot=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=False, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) if name == "Groestlcoin": return CoinInfo( coin_name=name, @@ -1077,35 +1048,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - if name == "NIX": - return CoinInfo( - coin_name=name, - coin_shortcut="NIX", - decimals=8, - address_type=38, - address_type_p2sh=53, - maxfee_kb=30000000000, - signed_message_header="NIX Signed Message:\n", - xpub_magic=0x0488b21e, - xpub_magic_segwit_p2sh=0x049d7cb2, - xpub_magic_segwit_native=0x04b24746, - xpub_magic_multisig_segwit_p2sh=0x0488b21e, - xpub_magic_multisig_segwit_native=0x0488b21e, - bech32_prefix="nix", - cashaddr_prefix=None, - slip44=400, - segwit=True, - taproot=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=False, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) if name == "Namecoin": return CoinInfo( coin_name=name, @@ -1193,35 +1135,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - if name == "Polis": - return CoinInfo( - coin_name=name, - coin_shortcut="POLIS", - decimals=8, - address_type=55, - address_type_p2sh=56, - maxfee_kb=4900000000, - signed_message_header="Polis Signed Message:\n", - xpub_magic=0x03e25d7e, - xpub_magic_segwit_p2sh=None, - xpub_magic_segwit_native=None, - xpub_magic_multisig_segwit_p2sh=None, - xpub_magic_multisig_segwit_native=None, - bech32_prefix=None, - cashaddr_prefix=None, - slip44=1997, - segwit=False, - taproot=False, - fork_id=None, - force_bip143=False, - decred=False, - negative_fee=False, - curve_name='secp256k1', - extra_data=False, - timestamp=False, - overwintered=False, - confidential_assets=None, - ) if name == "Primecoin": return CoinInfo( coin_name=name, diff --git a/core/src/apps/ethereum/networks.py b/core/src/apps/ethereum/networks.py index 19df6902b..3c44f368f 100644 --- a/core/src/apps/ethereum/networks.py +++ b/core/src/apps/ethereum/networks.py @@ -1204,6 +1204,13 @@ def _networks_iterator() -> Iterator[NetworkInfo]: name="Social Smart Chain", rskip60=False, ) + yield NetworkInfo( + chain_id=333999, + slip44=60, + shortcut="POLIS", + name="Polis", + rskip60=False, + ) yield NetworkInfo( chain_id=955305, slip44=1011, diff --git a/legacy/firmware/.changelog.d/2181.removed b/legacy/firmware/.changelog.d/2181.removed new file mode 100644 index 000000000..5a50859e1 --- /dev/null +++ b/legacy/firmware/.changelog.d/2181.removed @@ -0,0 +1 @@ +GAME, NIX and POLIS support