From ad2a3017cc661d76c9a255c0e0daa5b05c4b38b6 Mon Sep 17 00:00:00 2001 From: highlander Date: Wed, 12 Feb 2025 15:05:21 -0600 Subject: [PATCH] debug beta firmware --- .../src/helpers/kk-state-controller/firmwareUtils.ts | 2 +- packages/keepkey-desktop/src/ipcListeners.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/keepkey-desktop/src/helpers/kk-state-controller/firmwareUtils.ts b/packages/keepkey-desktop/src/helpers/kk-state-controller/firmwareUtils.ts index 1b7cfe4da..a263f9a31 100644 --- a/packages/keepkey-desktop/src/helpers/kk-state-controller/firmwareUtils.ts +++ b/packages/keepkey-desktop/src/helpers/kk-state-controller/firmwareUtils.ts @@ -10,7 +10,7 @@ const FIRMWARE_BASE_URL = 'https://raw.githubusercontent.com/keepkey/keepkey-desktop/master/firmware/' const FIRMWARE_BASE_URL_BETA = - 'https://raw.githubusercontent.com/keepkey/keepkey-desktop/develop/firmware/' + 'https://raw.githubusercontent.com/keepkey/keepkey-desktop/master/firmware/' export const getFirmwareBaseUrl = async () => { return (await settings.allowBetaFirmware) ? FIRMWARE_BASE_URL_BETA : FIRMWARE_BASE_URL diff --git a/packages/keepkey-desktop/src/ipcListeners.ts b/packages/keepkey-desktop/src/ipcListeners.ts index 328e63166..c32e25fed 100644 --- a/packages/keepkey-desktop/src/ipcListeners.ts +++ b/packages/keepkey-desktop/src/ipcListeners.ts @@ -227,7 +227,15 @@ export const ipcListeners: IpcListeners = { async keepkeyUpdateFirmware() { const baseUrl = await getFirmwareBaseUrl() const firmwareData = await getAllFirmwareData(baseUrl) - const url = (await getLatestFirmwareData(firmwareData)).firmware.url + const latestFirmwareData = await getLatestFirmwareData(firmwareData) + const url = latestFirmwareData.firmware.url + + // Verify we're getting the expected version + const expectedVersion = (await settings.allowBetaFirmware) ? firmwareData.beta.firmware.version : firmwareData.latest.firmware.version + if (latestFirmwareData.firmware.version !== expectedVersion) { + throw new Error(`Firmware version mismatch. Expected ${expectedVersion} but got ${latestFirmwareData.firmware.version}`) + } + const firmware = await downloadFirmware(baseUrl, url) if (!firmware) throw new Error(`Failed to load firmware from url '${url}'`) const wallet = kkStateController.wallet