From c6e78e525a2b6d34b321891f88f29fd2b0372381 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 20 Nov 2020 12:12:42 +0100 Subject: [PATCH] fix: remove PIVX (#1359) --- common/defs/bitcoin/pivx.json | 45 ----------------------- common/defs/bitcoin/pivx_testnet.json | 45 ----------------------- common/defs/coins_details.json | 22 ------------ common/defs/support.json | 6 ---- common/defs/wallets.json | 4 --- core/CHANGELOG.md | 1 + core/src/apps/common/coininfo.py | 52 --------------------------- legacy/firmware/CHANGELOG.md | 1 + 8 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 common/defs/bitcoin/pivx.json delete mode 100644 common/defs/bitcoin/pivx_testnet.json diff --git a/common/defs/bitcoin/pivx.json b/common/defs/bitcoin/pivx.json deleted file mode 100644 index 0a24e0677..000000000 --- a/common/defs/bitcoin/pivx.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "coin_name": "PIVX", - "coin_shortcut": "PIVX", - "coin_label": "PIVX", - "website": "https://pivx.org", - "github": "https://github.com/PIVX-Project/PIVX", - "maintainer": "Random Zebra ", - "curve_name": "secp256k1", - "decimals": 8, - "address_type": 30, - "address_type_p2sh": 13, - "maxfee_kb": 8100000000, - "minfee_kb": 100, - "signed_message_header": "DarkNet Signed Message:\n", - "hash_genesis_block": "0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818", - "xprv_magic": 35729707, - "xpub_magic": 36513075, - "xpub_magic_segwit_p2sh": null, - "xpub_magic_segwit_native": null, - "bech32_prefix": null, - "cashaddr_prefix": null, - "slip44": 119, - "segwit": false, - "decred": false, - "fork_id": null, - "force_bip143": false, - "default_fee_b": { - "Normal": 10 - }, - "dust_limit": 546, - "blocktime_seconds": 60, - "uri_prefix": "pivx", - "min_address_length": 27, - "max_address_length": 34, - "bitcore": [], - "blockbook": [ - "https://blockbook.pivx.link" - ], - "negative_fee": false, - "cooldown": 100, - "consensus_branch_id": null, - "extra_data": false, - "timestamp": false, - "confidential_assets": null -} diff --git a/common/defs/bitcoin/pivx_testnet.json b/common/defs/bitcoin/pivx_testnet.json deleted file mode 100644 index 697051cbc..000000000 --- a/common/defs/bitcoin/pivx_testnet.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "coin_name": "PIVX Testnet", - "coin_shortcut": "tPIVX", - "coin_label": "PIVX Testnet", - "website": "https://pivx.org", - "github": "https://github.com/PIVX-Project/PIVX", - "maintainer": "Random Zebra ", - "curve_name": "secp256k1", - "decimals": 8, - "address_type": 139, - "address_type_p2sh": 19, - "maxfee_kb": 100000, - "minfee_kb": 100, - "signed_message_header": "DarkNet Signed Message:\n", - "hash_genesis_block": "0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818", - "xprv_magic": 981489719, - "xpub_magic": 981492128, - "xpub_magic_segwit_p2sh": null, - "xpub_magic_segwit_native": null, - "bech32_prefix": null, - "cashaddr_prefix": null, - "slip44": 1, - "segwit": false, - "decred": false, - "fork_id": null, - "force_bip143": false, - "default_fee_b": { - "Normal": 10 - }, - "dust_limit": 54600, - "blocktime_seconds": 60, - "uri_prefix": "pivx", - "min_address_length": 27, - "max_address_length": 34, - "bitcore": [], - "blockbook": [ - "https://blockbook-testnet.pivx.link" - ], - "negative_fee": false, - "cooldown": 100, - "consensus_branch_id": null, - "extra_data": false, - "timestamp": false, - "confidential_assets": null -} diff --git a/common/defs/coins_details.json b/common/defs/coins_details.json index bee35e895..188e48574 100644 --- a/common/defs/coins_details.json +++ b/common/defs/coins_details.json @@ -584,28 +584,6 @@ } ] }, - "bitcoin:PIVX": { - "links": { - "Github": "https://github.com/PIVX-Project/PIVX", - "Homepage": "https://pivx.org" - }, - "marketcap_usd": 21756795, - "name": "PIVX", - "shortcut": "PIVX", - "t1_enabled": "yes", - "t2_enabled": "yes", - "type": "coin", - "wallet": [ - { - "name": "SPMT", - "url": "https://github.com/PIVX-Project/PIVX-SPMT/" - }, - { - "name": "Zephyr", - "url": "https://github.com/mrcarlanthony/Zephyr-wallet" - } - ] - }, "bitcoin:POLIS": { "links": { "Github": "https://github.com/polispay/polis", diff --git a/common/defs/support.json b/common/defs/support.json index dd3c951de..291fed722 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -22,7 +22,6 @@ "bitcoin:MUE": true, "bitcoin:NIX": true, "bitcoin:NMC": true, - "bitcoin:PIVX": true, "bitcoin:POLIS": true, "bitcoin:PPC": true, "bitcoin:RITO": true, @@ -44,7 +43,6 @@ "bitcoin:ZNY": true, "bitcoin:tDASH": true, "bitcoin:tLTC": true, - "bitcoin:tPIVX": true, "bitcoin:tPPC": true, "bitcoin:tXZC": true, "eth:AKA": true, @@ -121,7 +119,6 @@ "bitcoin:NIX": "1.7.2", "bitcoin:NMC": "1.5.2", "bitcoin:PART": "1.8.3", - "bitcoin:PIVX": "1.8.0", "bitcoin:POLIS": "1.8.2", "bitcoin:PPC": "1.8.4", "bitcoin:QTUM": "1.8.1", @@ -152,7 +149,6 @@ "bitcoin:tHATCH": "1.8.4", "bitcoin:tLTC": "1.6.2", "bitcoin:tPART": "1.8.3", - "bitcoin:tPIVX": "1.8.0", "bitcoin:tPPC": "1.8.4", "bitcoin:tQTUM": "1.8.1", "bitcoin:tSMART": "1.7.1", @@ -2188,7 +2184,6 @@ "bitcoin:NIX": "2.0.11", "bitcoin:NMC": "2.0.5", "bitcoin:PART": "2.1.4", - "bitcoin:PIVX": "2.0.11", "bitcoin:POLIS": "2.1.1", "bitcoin:PPC": "2.1.9", "bitcoin:QTUM": "2.1.1", @@ -2219,7 +2214,6 @@ "bitcoin:tHATCH": "2.1.6", "bitcoin:tLTC": "2.0.7", "bitcoin:tPART": "2.1.4", - "bitcoin:tPIVX": "2.0.11", "bitcoin:tPPC": "2.1.9", "bitcoin:tQTUM": "2.1.1", "bitcoin:tSMART": "2.0.8", diff --git a/common/defs/wallets.json b/common/defs/wallets.json index 66f7f2576..5bbd405c5 100644 --- a/common/defs/wallets.json +++ b/common/defs/wallets.json @@ -90,10 +90,6 @@ "bitcoin:PART": { "Particl Core": "https://github.com/particl/particl-core/releases" }, - "bitcoin:PIVX": { - "SPMT": "https://github.com/PIVX-Project/PIVX-SPMT/", - "Zephyr": "https://github.com/mrcarlanthony/Zephyr-wallet" - }, "bitcoin:POLIS": { "PolisPay": "https://polispay.com" }, diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 5c9e2e57e..cf58acb27 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Deprecated ### Removed +- PIVX support ### Fixed diff --git a/core/src/apps/common/coininfo.py b/core/src/apps/common/coininfo.py index aa9e36f8e..3013b8816 100644 --- a/core/src/apps/common/coininfo.py +++ b/core/src/apps/common/coininfo.py @@ -1104,58 +1104,6 @@ def by_name(name: str) -> CoinInfo: overwintered=False, confidential_assets=None, ) - elif name == "PIVX": - return CoinInfo( - coin_name=name, - coin_shortcut="PIVX", - decimals=8, - address_type=30, - address_type_p2sh=13, - maxfee_kb=8100000000, - signed_message_header="DarkNet Signed Message:\n", - xpub_magic=0x022d2533, - xpub_magic_segwit_p2sh=None, - xpub_magic_segwit_native=None, - bech32_prefix=None, - cashaddr_prefix=None, - slip44=119, - segwit=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, - ) - elif name == "PIVX Testnet": - return CoinInfo( - coin_name=name, - coin_shortcut="tPIVX", - decimals=8, - address_type=139, - address_type_p2sh=19, - maxfee_kb=100000, - signed_message_header="DarkNet Signed Message:\n", - xpub_magic=0x3a8061a0, - xpub_magic_segwit_p2sh=None, - xpub_magic_segwit_native=None, - bech32_prefix=None, - cashaddr_prefix=None, - slip44=1, - segwit=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, - ) elif name == "Particl": return CoinInfo( coin_name=name, diff --git a/legacy/firmware/CHANGELOG.md b/legacy/firmware/CHANGELOG.md index a19d500aa..0331a1d55 100644 --- a/legacy/firmware/CHANGELOG.md +++ b/legacy/firmware/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Deprecated ### Removed +- PIVX support ### Fixed