Merge branch 'remrandom'

Author: benma

CHANGELOG.md

@@ -8,6 +8,7 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 
 ### [Unreleased]
 - Display granular error codes when unlock fails unexpectedly
+- Remove RandomNumber API endpoint
 
 ### 9.6.0 [released 2021-05-20]
 - Attempt to fix flaky SD behavior

CMakeLists.txt

@@ -89,9 +89,9 @@ endif()
 #
 # Versions MUST contain three parts and start with lowercase 'v'.
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
-set(FIRMWARE_VERSION "v9.6.1")
-set(FIRMWARE_BTC_ONLY_VERSION "v9.6.1")
-set(FIRMWARE_BITBOXBASE_VERSION "v9.6.1")
+set(FIRMWARE_VERSION "v9.7.0")
+set(FIRMWARE_BTC_ONLY_VERSION "v9.7.0")
+set(FIRMWARE_BITBOXBASE_VERSION "v9.7.0")
 set(BOOTLOADER_VERSION "v1.0.4")
 
 find_package(PythonInterp 3.6 REQUIRED)

messages/CMakeLists.txt

@@ -8,7 +8,6 @@ set(PROTO_FILES
   btc.proto
   eth.proto
   mnemonic.proto
-  random_number.proto
   system.proto
   perform_attestation.proto
   keystore.proto

messages/hww.proto

@@ -24,7 +24,6 @@ import "btc.proto";
 import "eth.proto";
 import "keystore.proto";
 import "mnemonic.proto";
-import "random_number.proto";
 import "system.proto";
 
 import "perform_attestation.proto";
@@ -38,8 +37,9 @@ message Success {
 }
 
 message Request {
+    reserved 1;
     oneof request {
-        RandomNumberRequest random_number = 1;
+        // removed: RandomNumberRequest random_number = 1;
         SetDeviceNameRequest device_name = 2;
         SetDeviceLanguageRequest device_language = 3;
         DeviceInfoRequest device_info = 4;
@@ -69,10 +69,11 @@ message Request {
 }
 
 message Response {
+    reserved 3;
     oneof response {
         Success success = 1;
         Error error = 2;
-        RandomNumberResponse random_number = 3;
+        // removed: RandomNumberResponse random_number = 3;
         DeviceInfoResponse device_info = 4;
         PubResponse pub = 5;
         BTCSignNextResponse btc_sign_next = 6;

messages/random_number.options

@@ -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 random_number.proto system.proto perform_attestation.proto keystore.proto antiklepto.proto
+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
 
 TARGETS=$(addprefix ${OUT_DIR}/, $(PROTO_FILES:.proto=_pb2.py))
 

messages/random_number.proto

@@ -16,7 +16,7 @@
 from __future__ import print_function
 import sys
 
-__version__ = "6.0.0"
+__version__ = "7.0.0"
 
 if sys.version_info.major != 3 or sys.version_info.minor < 6:
     print(

py/bitbox02/Makefile

@@ -39,7 +39,6 @@
     from bitbox02.communication.generated import btc_pb2 as btc
     from bitbox02.communication.generated import mnemonic_pb2 as mnemonic
     from bitbox02.communication.generated import bitbox02_system_pb2 as bitbox02_system
-    from bitbox02.communication.generated import random_number_pb2 as random_number
     from bitbox02.communication.generated import backup_commands_pb2 as backup
     from bitbox02.communication.generated import common_pb2 as common
     from bitbox02.communication.generated import keystore_pb2 as keystore
@@ -126,13 +125,6 @@ class BitBox02(BitBoxCommonAPI):
 
     # pylint: disable=too-many-public-methods
 
-    def random_number(self) -> bytes:
-        # pylint: disable=no-member
-        request = hww.Request()
-        request.random_number.CopyFrom(random_number.RandomNumberRequest())
-        response = self._msg_query(request, expected_response="random_number")
-        return response.random_number.number
-
     def device_info(self) -> Dict[str, Any]:
         # pylint: disable=no-member
         request = hww.Request()