Merge remote-tracking branch 'benma/rembase-proto'

Author: benma

messages/CMakeLists.txt

@@ -4,7 +4,6 @@ set(PROTO_FILES
   common.proto
   backup_commands.proto
   bitbox02_system.proto
-  bitboxbase.proto
   btc.proto
   eth.proto
   mnemonic.proto

messages/bitboxbase.options

@@ -19,7 +19,6 @@ import "common.proto";
 
 import "backup_commands.proto";
 import "bitbox02_system.proto";
-import "bitboxbase.proto";
 import "btc.proto";
 import "eth.proto";
 import "keystore.proto";
@@ -37,7 +36,7 @@ message Success {
 }
 
 message Request {
-    reserved 1;
+    reserved 1, 23;
     oneof request {
         // removed: RandomNumberRequest random_number = 1;
         SetDeviceNameRequest device_name = 2;
@@ -61,7 +60,7 @@ message Request {
         ETHRequest eth = 20;
         ResetRequest reset = 21;
         RestoreFromMnemonicRequest restore_from_mnemonic = 22;
-        BitBoxBaseRequest bitboxbase = 23;
+        // removed: BitBoxBaseRequest bitboxbase = 23;
         RootFingerprintRequest fingerprint = 24;
         BTCRequest btc = 25;
         ElectrumEncryptionKeyRequest electrum_encryption_key = 26;

messages/bitboxbase.proto

@@ -15,7 +15,7 @@
 
 OUT_DIR=bitbox02/communication/generated
 
-PROTO_FILES=hww.proto common.proto backup_commands.proto bitbox02_system.proto bitboxbase.proto btc.proto eth.proto mnemonic.proto system.proto perform_attestation.proto keystore.proto antiklepto.proto
+PROTO_FILES=hww.proto common.proto backup_commands.proto bitbox02_system.proto btc.proto eth.proto mnemonic.proto system.proto perform_attestation.proto keystore.proto antiklepto.proto
 
 TARGETS=$(addprefix ${OUT_DIR}/, $(PROTO_FILES:.proto=_pb2.py))
 

messages/hww.proto

@@ -168,7 +168,6 @@ class Platform(enum.Enum):
     """ Available hardware platforms """
 
     BITBOX02 = "bitbox02"
-    BITBOXBASE = "bitboxbase"
 
 
 class BitBox02Edition(enum.Enum):
@@ -178,12 +177,6 @@ class BitBox02Edition(enum.Enum):
     BTCONLY = "btconly"
 
 
-class BitBoxBaseEdition(enum.Enum):
-    """ Editions for the BitBoxBase platform """
-
-    STANDARD = "standard"
-
-
 class Bitbox02Exception(Exception):
     def __init__(self, code: int, message: str):
         self.code = code
@@ -549,7 +542,7 @@ def __init__(
             self.version.major, self.version.minor, self.version.patch, build=self.version.build
         )
 
-        # raises exceptions if the library is out of date, does not check BitBoxBase
+        # raises exceptions if the library is out of date
         self._check_max_version()
 
         self._bitbox_protocol: BitBoxProtocol
@@ -668,13 +661,11 @@ def reboot(
         return True
 
     @staticmethod
-    def get_info(
-        transport: TransportLayer
-    ) -> Tuple[str, Platform, Union[BitBox02Edition, BitBoxBaseEdition], bool]:
+    def get_info(transport: TransportLayer) -> Tuple[str, Platform, Union[BitBox02Edition], bool]:
         """
         Returns (version, platform, edition, unlocked).
         This is useful to get the version of the firmware when a usb descriptor is not available
-        (BitBoxBase, via BitBoxBridge, etc.).
+        (via BitBoxBridge, etc.).
         This call does not use a versioned BitBoxProtocol for communication, as the version is not
         available (this call is used to get the version), so it must work for all firmware versions.
         """
@@ -688,11 +679,11 @@ def get_info(
         platform = {0x00: Platform.BITBOX02}[platform_byte]
 
         edition_byte, response = response[0], response[1:]
-        edition: Union[BitBox02Edition, BitBoxBaseEdition]
+        edition: Union[BitBox02Edition]
         if platform == Platform.BITBOX02:
             edition = {0x00: BitBox02Edition.MULTI, 0x01: BitBox02Edition.BTCONLY}[edition_byte]
         else:
-            edition = {0x00: BitBoxBaseEdition.STANDARD}[edition_byte]
+            raise Exception("Unknown platform: {}".format(platform))
 
         unlocked_byte = response[0]
         unlocked = {0x00: False, 0x01: True}[unlocked_byte]
@@ -701,7 +692,7 @@ def get_info(
     def check_min_version(self) -> None:
         """
         Raises FirmwareVersionOutdatedException if the device has an older firmware version than
-        required and the minimum required version. A check for the BitBoxBase is not implemented.
+        required and the minimum required version.
         """
         if self.edition == BitBox02Edition.MULTI:
             if self.version < MIN_SUPPORTED_BITBOX02_MULTI_FIRMWARE_VERSION:
@@ -721,7 +712,6 @@ def _check_max_version(self) -> None:
         """
         Raises LibraryVersionOutdatedException if the device has an firmware which is too new
         (major version increased).
-        A check for the BitBoxBase is not implemented.
         """
         if self.edition == BitBox02Edition.MULTI:
             if self.version >= MIN_UNSUPPORTED_BITBOX02_MULTI_FIRMWARE_VERSION: