Add setup command and update device class methods with arguments

Adds a setup command

Updates the class methods for each device to have the proper arguments
This commit is contained in:
Andrew Chow 2018-12-29 00:10:44 -05:00
parent 99b0e99e09
commit 8a0d36ec07
7 changed files with 32 additions and 7 deletions

View File

@ -14,7 +14,7 @@ import getpass
from .serializations import PSBT, Base64ToHex, HexToBase64, hash160
from .base58 import xpub_to_address, xpub_to_pub_hex, get_xpub_fingerprint_as_id, get_xpub_fingerprint_hex
from os.path import dirname, basename, isfile
from .hwwclient import NoPasswordError
from .hwwclient import NoPasswordError, UnavailableActionError, DeviceAlreadyInitError
# Error codes
NO_DEVICE_PATH = -1
@ -25,6 +25,8 @@ INVALID_TX = -5
NO_PASSWORD = -6
BAD_ARGUMENT = -7
NOT_IMPLEMENTED = -8
UNAVAILABLE_ACTION = -9
DEVICE_ALREADY_INIT = -10
class UnknownDeviceError(Exception):
def __init__(self,*args,**kwargs):
@ -196,6 +198,16 @@ def displayaddress(args, client):
return {'error':'Both `--wpkh` and `--sh_wpkh` can not be selected at the same time.','code':BAD_ARGUMENT}
return client.display_address(args.path, args.sh_wpkh, args.wpkh)
def setup_device(args, client):
try:
return client.setup_device(args.label, args.backup_passphrase)
except UnavailableActionError as e:
return {'error': str(e), 'code': UNAVAILABLE_ACTION}
except DeviceAlreadyInitError as e:
return {'error': str(e), 'code': DEVICE_ALREADY_INIT}
except ValueError as e:
return {'error': str(e), 'code': BAD_ARGUMENT}
def process_commands(args):
parser = argparse.ArgumentParser(description='Access and send commands to a hardware wallet device. Responses are in JSON format')
parser.add_argument('--device-path', '-d', help='Specify the device path of the device to connect to')
@ -246,6 +258,11 @@ def process_commands(args):
displayaddr_parser.add_argument('--wpkh', action='store_true', help='Display the bech32 version of the address associated with this key path')
displayaddr_parser.set_defaults(func=displayaddress)
setupdev_parser = subparsers.add_parser('setup', help='Setup a device. Passphrase protection uses the password given by -p')
setupdev_parser.add_argument('--label', '-l', help='The name to give to the device', default='')
setupdev_parser.add_argument('--backup_passphrase', '-b', help='The passphrase to use for the backup, if applicable', default='')
setupdev_parser.set_defaults(func=setup_device)
args = parser.parse_args(args)
device_path = args.device_path

View File

@ -101,7 +101,7 @@ class ColdcardClient(HardwareWalletClient):
raise NotImplementedError('The Coldcard does not currently implement displayaddress')
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The Coldcard does not currently implement setup')
# Wipe this device

View File

@ -355,7 +355,7 @@ class DigitalbitboxClient(HardwareWalletClient):
raise NotImplementedError('The DigitalBitbox does not currently implement displayaddress')
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The DigitalBitbox does not currently implement setup')
# Wipe this device

View File

@ -180,7 +180,7 @@ class KeepkeyClient(HardwareWalletClient):
raise NotImplementedError('The KeepKey does not currently implement displayaddress')
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The KeepKey does not currently implement setup')
# Wipe this device

View File

@ -248,7 +248,7 @@ class LedgerClient(HardwareWalletClient):
self.app.getWalletPublicKey(keypath[2:], True, (p2sh_p2wpkh or bech32), bech32)
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The Ledger Nano S does not support software setup')
# Wipe this device

View File

@ -191,7 +191,7 @@ class TrezorClient(HardwareWalletClient):
)
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The Trezor does not currently implement setup')
# Wipe this device

View File

@ -32,7 +32,7 @@ class HardwareWalletClient(object):
'implement this method')
# Setup a new device
def setup_device(self):
def setup_device(self, label='', passphrase=''):
raise NotImplementedError('The HardwareWalletClient base class does not '
'implement this method')
@ -49,3 +49,11 @@ class HardwareWalletClient(object):
class NoPasswordError(Exception):
def __init__(self,*args,**kwargs):
Exception.__init__(self,*args,**kwargs)
class UnavailableActionError(Exception):
def __init__(self,*args,**kwargs):
Exception.__init__(self,*args,**kwargs)
class DeviceAlreadyInitError(Exception):
def __init__(self,*args,**kwargs):
Exception.__init__(self,*args,**kwargs)