Bianminyan patch 1

CHANGELOG-ZH.md

@@ -1,3 +1,17 @@
+## 1.7.4(2024-10-23)
+
+### 新增
+
+1. 支持 Keplr 钱包通过 USB 连接及管理 COSMOS 资产
+2. 支持 UniSat 钱包通过 USB 连接及管理 BTC 资产
+
+### 优化
+
+1. 优化了在 ERC20 代币签名界面文案
+2. ERC20 代币交易解析支持 TGT
+
+
+
 ## 1.7.2(2024-10-12)
 
 ### 新增

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.7.4(2024-10-23)
+
+### What's New
+
+1. Supported Keplr wallet to manage COSMOS assets via USB connection
+2. Supported UniSat wallet to manage BTC assets via USB connection
+
+### Improvements
+
+1. Optimized the text on the ERC20 token signing interface
+2. Added support for TGT token transaction parsing in ERC20
+
+
 ## 1.7.2(2024-10-12)
 
 ### What's new

Dockerfile

@@ -15,11 +15,13 @@ RUN apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
 ENV PATH=/root/.cargo/bin:$PATH
-RUN cargo install cbindgen bindgen-cli
-RUN rustup install nightly-2023-12-01
+
 RUN rustup default nightly-2023-12-01
 RUN rustup target add thumbv7em-none-eabihf --toolchain nightly-2023-12-01
+RUN cargo install cbindgen bindgen-cli
+
 RUN pip3 install PyYaml
+RUN pip3 install pillow
 
 FROM base as pillar
 RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -O  gcc-arm-none-eabi.tar.bz2

rust/rust_c/src/lib.rs

@@ -56,6 +56,5 @@ use tron_rust_c;
 use xrp_rust_c;
 
 #[cfg(any(feature = "simulator", feature = "simulator_btc_only"))]
-#[cfg(target_os = "macos")]
 #[allow(unused)]
 use simulator_rust_c;

rust/sim_qr_reader/Cargo.toml

@@ -10,4 +10,13 @@ screenshots = "0.8.5"
 image = "0.24.7"
 quircs = "0.10.0"
 anyhow = "1.0.75"
-cocoa = "0.24.1"
+
+[target.'cfg(target_os = "macos")'.dependencies]
+cocoa = "0.24.1"
+
+[target.'cfg(target_os = "windows")'.dependencies]
+windows = { version = "0.58.0", features = [
+    "Win32_Foundation",
+    "Win32_Graphics_Gdi",
+    "Win32_UI_HiDpi",
+]}

rust/sim_qr_reader/src/lib.rs

@@ -5,23 +5,37 @@ use screenshots::Screen;
 use std::thread;
 use std::time::{Duration, Instant};
 
-use cocoa::appkit::NSScreen;
-use cocoa::base::nil;
-use cocoa::foundation::NSArray;
-
 #[cfg(target_os = "macos")]
+use cocoa::{appkit::NSScreen, base::nil, foundation::NSArray};
+
+#[cfg(target_os = "windows")]
+use windows::{
+    Win32::Foundation::HWND,
+    Win32::Graphics::Gdi::{GetDC, GetDeviceCaps, LOGPIXELSX},
+    Win32::UI::HiDpi::{SetProcessDpiAwareness, PROCESS_SYSTEM_DPI_AWARE},
+};
+
 fn get_screen_scaling_factor() -> f64 {
+    #[cfg(target_os = "macos")]
     unsafe {
         let screens = NSScreen::screens(nil);
         let screen = NSArray::objectAtIndex(screens, 0);
         let scale_factor = NSScreen::backingScaleFactor(screen);
         scale_factor as f64
     }
-}
 
-#[cfg(not(target_os = "macos"))]
-fn get_screen_scaling_factor() -> f64 {
-    1.0 // Default value for non-macOS systems
+    #[cfg(target_os = "windows")]
+    unsafe {
+        let hdc = GetDC(HWND::default());
+        let dpi = GetDeviceCaps(hdc, LOGPIXELSX) as f64;
+        // 96.0 default dpi
+        dpi / 96.0 as f64
+    }
+
+    #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+    {
+        1.0
+    }
 }
 
 pub fn continuously_read_qr_code_from_screen<G>(on_qr_code_detected: G, max_loop_count: u32) -> Result<()>

src/config/version.h

@@ -5,9 +5,9 @@
 #define SD_CARD_OTA_BIN_PATH                "0:/keystone3.bin"
 
 #define SOFTWARE_VERSION_MAX_LEN            (32)
-#define SOFTWARE_VERSION_MAJOR              1
-#define SOFTWARE_VERSION_MINOR              7
-#define SOFTWARE_VERSION_BUILD              2
+#define SOFTWARE_VERSION_MAJOR              9
+#define SOFTWARE_VERSION_MINOR              9
+#define SOFTWARE_VERSION_BUILD              9
 #define SOFTWARE_VERSION_BETA               0
 #define SOFTWARE_VERSION                    (SOFTWARE_VERSION_MAJOR * 10000 + SOFTWARE_VERSION_MINOR * 100 + SOFTWARE_VERSION_BUILD)
 

src/crypto/account_public_info.c

@@ -1573,12 +1573,18 @@ void SetAccountIndex(const char* chainName, uint32_t index)
 
 uint32_t GetConnectWalletPathIndex(const char* walletName)
 {
-    return GetTemplateWalletValue(walletName, "derivePath");
+    char name[BUFFER_SIZE_32];
+    strncpy_s(name, BUFFER_SIZE_32, walletName, BUFFER_SIZE_32);
+    RemoveFormatChar(name);
+    return GetTemplateWalletValue(name, "derivePath");
 }
 
 void SetConnectWalletPathIndex(const char* walletName, uint32_t index)
 {
-    SetTemplateWalletValue(walletName, "derivePath", index);
+    char name[BUFFER_SIZE_32];
+    strncpy_s(name, BUFFER_SIZE_32, walletName, BUFFER_SIZE_32);
+    RemoveFormatChar(name);
+    SetTemplateWalletValue(name, "derivePath", index);
 }
 
 uint32_t GetConnectWalletAccountIndex(const char* walletName)
@@ -1588,7 +1594,6 @@ uint32_t GetConnectWalletAccountIndex(const char* walletName)
     strncpy_s(name, BUFFER_SIZE_32, walletName, BUFFER_SIZE_32);
     RemoveFormatChar(name);
     cJSON *rootJson = ReadAndParseAccountJson(NULL, NULL);
-
     cJSON *item = cJSON_GetObjectItem(rootJson, name);
     if (item == NULL) {
         printf("GetConnectWalletAccountIndex get %s not exist\r\n", name);
@@ -1677,7 +1682,6 @@ static uint32_t GetTemplateWalletValue(const char* walletName, const char* key)
 {
     uint32_t value = 0;
     cJSON* rootJson = ReadAndParseAccountJson(NULL, NULL);
-
     cJSON* item = cJSON_GetObjectItem(rootJson, walletName);
     if (item == NULL) {
         printf("GetTemplateWalletValue get %s not exist\r\n", walletName);

src/ui/gui_analyze/gui_analyze.c

@@ -306,6 +306,9 @@ uint8_t g_tableDataAmount = 0;
 
 void GuiAnalyzeFreeTable(uint8_t row, uint8_t col, void *param)
 {
+    if (param == NULL) {
+        return;
+    }
     int i = 0, j = 0;
     char ***indata = (char ***)param;
     for (i = 0; i < col; i++) {