Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-09 08:48:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(suite): change isOfficialFw to firmwareSource

Browse Source
This commit is contained in:
Jaroslav Hrách
2025-04-25 12:50:35 +02:00
committed by Jaroslav Hrách
parent bf08ce01a9
commit a888040dbb
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/device-utils/src/firmwareUtils.ts
View File

@@ -1,15 +1,24 @@
import { isDeviceInBootloaderMode } from './modeUtils';
import { FirmwareType, FirmwareVersionString, PartialDevice, VersionArray } from './types';
import {
FirmwareSource,
FirmwareType,
FirmwareVersionString,
PartialDevice,
VersionArray,
} from './types';
export const isOfficialFirmware = (device?: PartialDevice): boolean => {
export const getFirmwareSource = (device?: PartialDevice): FirmwareSource => {
if (device?.mode === 'bootloader') {
return 'NA - bootloader';
}
if (
device?.authenticityChecks?.firmwareRevision?.success &&
device?.authenticityChecks?.firmwareHash?.success
) {
return true;
return 'official';
}
return false;
return 'unknown';
};
export const getFirmwareRevision = (device?: PartialDevice) => device?.features?.revision || '';

3
packages/device-utils/src/types.ts
View File

@@ -66,6 +66,7 @@ export type PartialDevice = {
firmwareRevision: { success: boolean } | null;
firmwareHash: { success: boolean } | null;
};
mode?: 'normal' | 'bootloader' | 'initialize' | 'seedless';
features?: {
major_version: number;
@@ -82,3 +83,5 @@ export type PartialDevice = {
unit_btconly?: boolean;
};
};
export type FirmwareSource = 'official' | 'unknown' | 'NA - bootloader';

2
packages/suite-analytics/src/types/definitions.ts
View File

@@ -19,3 +19,5 @@ export type AppUpdateEvent = {
isPrerelease?: boolean;
isAutoUpdated?: boolean;
};
export type FirmwareSource = 'official' | 'unknown' | 'NA - bootloader';

6
packages/suite-analytics/src/types/events.ts
View File

@@ -1,7 +1,7 @@
import { NetworkSymbol } from '@suite-common/wallet-config';
import { EventType } from '../constants';
import type { AppUpdateEvent, OnboardingAnalytics } from './definitions';
import type { AppUpdateEvent, FirmwareSource, OnboardingAnalytics } from './definitions';
export type SuiteAnalyticsEventSuiteReady = {
type: EventType.SuiteReady;
@@ -91,7 +91,7 @@ export type SuiteAnalyticsEvent =
payload: {
mode: 'normal' | 'bootloader' | 'initialize' | 'seedless';
firmware: string;
isOfficialFw: boolean;
firmwareSource: FirmwareSource;
bootloader?: string;
pin_protection?: boolean | null;
passphrase_protection?: boolean | null;
@@ -118,7 +118,7 @@ export type SuiteAnalyticsEvent =
fromFwVersion: string;
toFwVersion?: string;
toBtcOnly?: boolean;
isOfficialFw: boolean;
firmwareSource: FirmwareSource;
error: string;
};
}

8
packages/suite/src/middlewares/suite/analyticsMiddleware.ts
View File

@@ -16,10 +16,10 @@ import {
getBootloaderHash,
getBootloaderVersion,
getFirmwareRevision,
getFirmwareSource,
getFirmwareVersion,
hasBitcoinOnlyFirmware,
isDeviceInBootloaderMode,
isOfficialFirmware,
} from '@trezor/device-utils';
import { EventType, analytics } from '@trezor/suite-analytics';
import { BigNumber } from '@trezor/utils/src/bigNumber';
@@ -74,7 +74,7 @@ const analyticsMiddleware =
error,
toBtcOnly,
toFwVersion,
isOfficialFw: isOfficialFirmware(device),
firmwareSource: getFirmwareSource(device),
},
});
}
@@ -125,7 +125,7 @@ const analyticsMiddleware =
language: features.language,
model: features.internal_model,
optiga_sec: features.optiga_sec,
isOfficialFw: isOfficialFirmware(action.payload.device),
firmwareSource: getFirmwareSource(action.payload.device),
},
});
} else {
@@ -135,7 +135,7 @@ const analyticsMiddleware =
mode: 'bootloader',
firmware: getFirmwareVersion(action.payload.device),
bootloader: getBootloaderVersion(action.payload.device),
isOfficialFw: isOfficialFirmware(action.payload.device),
firmwareSource: getFirmwareSource(action.payload.device),
},
});
}