fix: combined cleanup (PRs keepkey#173, keepkey#175, keepkey#170, keepkey#165)

- Add WETH to uniswap token database (PR keepkey#173)
- Guard Ethereum tests with requires_fullFeature for BTC-only firmware (PR keepkey#175)
- Fix shebang lines: /bin/env -> /usr/bin/env (PR keepkey#170)
- Add ripple_get_address command to keepkeyctl (PR keepkey#165)

Author: BitHighlander

keepkeyctl

@@ -173,6 +173,10 @@ class Commands(object):
         script_type = typemap[args.script_type];
         return self.client.get_public_node(n=address_n, show_display=args.show_display, coin_name=args.coin, script_type=script_type).xpub
 
+    def ripple_get_address(self, args):
+        address_n = self.client.expand_path(args.n)
+        return self.client.ripple_get_address(address_n, args.show_display)
+
     def ethereum_get_address(self, args):
         address_n = self.client.expand_path(args.n)
         address = self.client.ethereum_get_address(address_n, args.show_display)
@@ -546,6 +550,7 @@ class Commands(object):
     ping.help = 'Send ping message'
     get_address.help = 'Get bitcoin address in base58 encoding'
     get_xpub.help = 'Get xpub'
+    ripple_get_address.help = 'Get Ripple address'
     ethereum_get_address.help = 'Get Ethereum address in hex encoding'
     ethereum_sign_msg.help = 'Sign Ethereum message'
     ethereum_sign_tx.help = 'Sign (and optionally publish) Ethereum transaction'
@@ -591,6 +596,11 @@ class Commands(object):
         (('-d', '--show-display'), {'action': 'store_true', 'default': False}),
     )
 
+    ripple_get_address.arguments = (
+        (('-n', '-address'), {'type': str}),
+        (('-d', '--show-display'), {'action': 'store_true', 'default': False}),
+    )
+
     ethereum_get_address.arguments = (
         (('-n', '-address'), {'type': str}),
         (('-d', '--show-display'), {'action': 'store_true', 'default': False}),

keepkeylib/eth/ethereum_tokens.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import json

keepkeylib/eth/uniswap_tokens.json

@@ -4542,5 +4542,13 @@
     "contractAddress": "0x0Ae055097C6d159879521C384F1D2123D1f195e6",
     "precision": 18,
     "network": "ETH"
+  },
+  {
+    "symbol": "WETH",
+    "identifier": "weth",
+    "displayName": "Wrapped Ether",
+    "contractAddress": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    "precision": 18,
+    "network": "ETH"
   }
 ]

keepkeylib/eth/uniswap_tokens.py

@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import json

tests/test_msg_ethereum_erc20_uniswap_liquidity.py

@@ -29,7 +29,7 @@ class TestMsgEthereumUniswaptxERC20(common.KeepKeyTest):
 
     def test_sign_uni_approve_liquidity_ETH(self):
         self.requires_fullFeature()
-        self.requires_firmware("7.1.0")
+        self.requires_firmware("7.13.0")
         self.setup_mnemonic_nopin_nopassphrase()
 
         # Approval tx for the ETH/FOX pool

tests/test_msg_mayachain_signtx.py

@@ -70,6 +70,7 @@ def test_sign_btc_eth_swap(self):
 
     def test_sign_eth_btc_swap(self):
         self.requires_firmware("7.1.0")
+        self.requires_fullFeature()
         self.setup_mnemonic_nopin_nopassphrase()
         sig_v, sig_r, sig_s = self.client.ethereum_sign_tx(
             n=[2147483692,2147483708,2147483648,0,0],
@@ -116,6 +117,7 @@ def test_sign_btc_add_liquidity(self):
 
     def test_sign_eth_add_liquidity(self):
         self.requires_firmware("7.9.1")
+        self.requires_fullFeature()
         self.setup_mnemonic_nopin_nopassphrase()
         sig_v, sig_r, sig_s = self.client.ethereum_sign_tx(
                         n=[2147483692,2147483708,2147483648,0,0],