Merge pull request #248 from keepkey/rel-v6.7.0

Rel v6.7.0
keepkey · Feb 24, 2021 · 2e5cf7e · 2e5cf7e
2 parents fb531bf + 34c1fd0
commit 2e5cf7e
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.7.2)
 
 project(KeepKeyFirmware
 
-        VERSION 6.6.0
+        VERSION 6.7.0
 
         LANGUAGES C CXX ASM)
 

diff --git a/deps/python-keepkey b/deps/python-keepkey
diff --git a/include/keepkey/firmware/ethereum_tokens.h b/include/keepkey/firmware/ethereum_tokens.h
@@ -28,6 +28,7 @@
 enum {
 #define X(CHAIN_ID, CONTRACT_ADDR, TICKER, DECIMALS) \
   CONCAT(TokenIndex, __COUNTER__),
+#include "keepkey/firmware/uniswap_tokens.def"
 #include "keepkey/firmware/ethereum_tokens.def"
   TokenIndexLast,
   TokenIndexFirst = 0

diff --git a/lib/firmware/CMakeLists.txt b/lib/firmware/CMakeLists.txt
@@ -43,9 +43,11 @@ add_library(kkfirmware ${sources})
 add_dependencies(kkfirmware kktransport.pb trezorcrypto qrcodegenerator ethereum_tokens.def)
 
 set(ETHEREUM_TOKENS ${CMAKE_BINARY_DIR}/include/keepkey/firmware/ethereum_tokens)
+set(UNISWAP_TOKENS ${CMAKE_BINARY_DIR}/include/keepkey/firmware/uniswap_tokens)
 
 add_custom_target(ethereum_tokens.def
   COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/keepkey/firmware
-  COMMAND python3 ${CMAKE_SOURCE_DIR}/deps/python-keepkey/keepkeylib/eth/ethereum_tokens.py ${ETHEREUM_TOKENS}.def)
+  COMMAND python3 ${CMAKE_SOURCE_DIR}/deps/python-keepkey/keepkeylib/eth/ethereum_tokens.py ${ETHEREUM_TOKENS}.def
+  COMMAND python3 ${CMAKE_SOURCE_DIR}/deps/python-keepkey/keepkeylib/eth/uniswap_tokens.py ${UNISWAP_TOKENS}.def)
 
 add_library(kkfirmware.keepkey variant/keepkey/resources.c)
diff --git a/lib/firmware/ethereum_tokens.c b/lib/firmware/ethereum_tokens.c
@@ -7,6 +7,7 @@
 const TokenType tokens[] = {
 #define X(CHAIN_ID, CONTRACT_ADDR, TICKER, DECIMALS) \
   {(CONTRACT_ADDR), (TICKER), (CHAIN_ID), (DECIMALS)},
+#include "keepkey/firmware/uniswap_tokens.def"
 #include "keepkey/firmware/ethereum_tokens.def"
 };
 

diff --git a/lib/firmware/pin_sm.c b/lib/firmware/pin_sm.c
@@ -271,7 +271,7 @@ bool pin_protect_cached(void) {
     if (session_isPinCached()) {
         return true;
     }
-    
+
     return pin_protect("Enter\nYour PIN");
 }
 
@@ -303,28 +303,28 @@ bool change_pin(void) {
 }
 
 bool change_wipe_code(void) {
-    PINInfo wipe_code_info_first, wipe_code_info_second;
-    
-    /* Set request types */
-    wipe_code_info_first.type =
-    PinMatrixRequestType_PinMatrixRequestType_NewFirst;
-    wipe_code_info_second.type =
-    PinMatrixRequestType_PinMatrixRequestType_NewSecond;
-    
-    if (!pin_request("Enter New Wipe Code", &wipe_code_info_first)) {
-        return false;
-    }
-    
-    if (!pin_request("Re-Enter New Wipe Code", &wipe_code_info_second)) {
-        return false;
-    }
-    
-    if (strcmp(wipe_code_info_first.pin, wipe_code_info_second.pin) != 0) {
-        return false;
-    }
-    
-    storage_setWipeCode(wipe_code_info_first.pin);
-    return true;
+  PINInfo wipe_code_info_first, wipe_code_info_second;
+
+  /* Set request types */
+  wipe_code_info_first.type =
+      PinMatrixRequestType_PinMatrixRequestType_NewFirst;
+  wipe_code_info_second.type =
+      PinMatrixRequestType_PinMatrixRequestType_NewSecond;
+
+  if (!pin_request("Enter New Wipe Code", &wipe_code_info_first)) {
+    return false;
+  }
+
+  if (!pin_request("Re-Enter New Wipe Code", &wipe_code_info_second)) {
+    return false;
+  }
+
+  if (strcmp(wipe_code_info_first.pin, wipe_code_info_second.pin) != 0) {
+    return false;
+  }
+
+  storage_setWipeCode(wipe_code_info_first.pin);
+  return true;
 }
 
 #if DEBUG_LINK

diff --git a/lib/firmware/reset.c b/lib/firmware/reset.c
@@ -154,7 +154,7 @@ void reset_entropy(const uint8_t *ext_entropy, uint32_t len)
         fsm_sendSuccess(_("Device reset"));
         goto exit;
     } else {
-        if (!confirm(ButtonRequestType_ButtonRequest_Other, _("Recovery Seed Bakcup"),
+        if (!confirm(ButtonRequestType_ButtonRequest_Other, _("Recovery Seed Backup"),
                      "This recovery seed will only be shown ONCE. "
                      "Please write it down carefully,\n"
                      "and DO NOT share it with anyone. ")) {

diff --git a/tools/bootloader/isr.s b/tools/bootloader/isr.s
@@ -473,7 +473,7 @@ svhandler_start_firmware:
     eor     r6, r6
     eor     r7, r7
     eor     r8, r8
-    eor     r8, r9
+    eor     r9, r9
 
     ldr     r11, =dummy_xpsr      // xpsr - do not use the actual one for fake "return"
     ldr     r1, =fwreset          // pc - load pc slot with the firmware reset vector

diff --git a/tools/bootloader/usb_flash.c b/tools/bootloader/usb_flash.c
@@ -200,7 +200,7 @@ bool usb_flash_firmware(void) {
   layout_debuglink_watermark();
 #endif
 
-  usbInit("keepkey.com/update");
+  usbInit("beta.shapeshift.com");
   bootloader_fsm_init();
 
   while (1) {

diff --git a/tools/emulator/main.cpp b/tools/emulator/main.cpp
@@ -81,7 +81,7 @@ int main(void) {
 
   led_func(SET_GREEN_LED);
 
-  usbInit("keepkey.com/get-started");
+  usbInit("beta.shapeshift.com");
   led_func(CLR_RED_LED);
 
   reset_idle_time();

diff --git a/tools/firmware/keepkey_main.c b/tools/firmware/keepkey_main.c
@@ -201,8 +201,8 @@ int main(void) {
 
   led_func(SET_GREEN_LED);
 
-  usbInit(storage_isInitialized() ? "keepkey.com/wallet"
-                                  : "keepkey.com/get-started");
+  usbInit("beta.shapeshift.com");
+
   u2fInit();
   led_func(CLR_RED_LED);
+4,546 −0		keepkeylib/eth/uniswap_tokens.json
+94 −0		keepkeylib/eth/uniswap_tokens.py
+1 −1		setup.py
+99 −0		tests/test_msg_ethereum_erc20_0x_signtx.py