(
- UPDATE FINAL FIRMARE (TEMPLATE + ACTION WIP) {deviceInfo.final}
+ UPDATE FINAL FIRMARE (TEMPLATE + ACTION WIP) {deviceInfo.isOSU}
)}
renderMcuUpdate={(device: Device, deviceInfo: DeviceInfo) => (
diff --git a/src/components/Workflow/EnsureDashboard.js b/src/components/Workflow/EnsureDashboard.js
index e7b86416..bc762558 100644
--- a/src/components/Workflow/EnsureDashboard.js
+++ b/src/components/Workflow/EnsureDashboard.js
@@ -7,12 +7,7 @@ import type { Device } from 'types/common'
import getDeviceInfo from 'commands/getDeviceInfo'
-type DeviceInfo = {
- targetId: number | string,
- version: string,
- final: boolean,
- mcu: boolean,
-}
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
type Error = {
message: string,
diff --git a/src/components/Workflow/EnsureGenuine.js b/src/components/Workflow/EnsureGenuine.js
index a1890480..3be90a83 100644
--- a/src/components/Workflow/EnsureGenuine.js
+++ b/src/components/Workflow/EnsureGenuine.js
@@ -5,6 +5,7 @@ import isEqual from 'lodash/isEqual'
import { GENUINE_TIMEOUT } from 'config/constants'
import type { Device } from 'types/common'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
import getIsGenuine from 'commands/getIsGenuine'
@@ -13,14 +14,9 @@ type Error = {
stack: string,
}
-type DeviceInfos = {
- targetId: number | string,
- version: string,
-}
-
type Props = {
device: ?Device,
- infos: ?DeviceInfos,
+ deviceInfo: ?DeviceInfo,
children: (isGenuine: ?boolean, error: ?Error) => *,
}
@@ -56,12 +52,15 @@ class EnsureGenuine extends PureComponent {
_unmounting = false
async checkIsGenuine() {
- const { device, infos } = this.props
- if (device && infos && !this._checking) {
+ const { device, deviceInfo } = this.props
+ if (device && deviceInfo && !this._checking) {
this._checking = true
try {
const res = await getIsGenuine
- .send({ devicePath: device.path, targetId: infos.targetId, version: infos.version })
+ .send({
+ devicePath: device.path,
+ deviceInfo,
+ })
.pipe(timeout(GENUINE_TIMEOUT))
.toPromise()
if (this._unmounting) return
diff --git a/src/components/Workflow/index.js b/src/components/Workflow/index.js
index e3db974f..728ff9ec 100644
--- a/src/components/Workflow/index.js
+++ b/src/components/Workflow/index.js
@@ -1,6 +1,7 @@
// @flow
import React, { PureComponent } from 'react'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
import type { Node } from 'react'
import type { Device } from 'types/common'
@@ -9,13 +10,6 @@ import EnsureDevice from './EnsureDevice'
import EnsureDashboard from './EnsureDashboard'
import EnsureGenuine from './EnsureGenuine'
-type DeviceInfo = {
- targetId: number | string,
- version: string,
- final: boolean,
- mcu: boolean,
-}
-
type Error = {
message: string,
stack: string,
@@ -55,16 +49,16 @@ class Workflow extends PureComponent {
{(device: Device) => (
{(deviceInfo: ?DeviceInfo, dashboardError: ?Error) => {
- if (deviceInfo && deviceInfo.mcu && renderMcuUpdate) {
+ if (deviceInfo && deviceInfo.isBootloader && renderMcuUpdate) {
return renderMcuUpdate(device, deviceInfo)
}
- if (deviceInfo && deviceInfo.final && renderFinalUpdate) {
+ if (deviceInfo && deviceInfo.isOSU && renderFinalUpdate) {
return renderFinalUpdate(device, deviceInfo)
}
return (
-
+
{(isGenuine: ?boolean, genuineError: ?Error) => {
if (dashboardError || genuineError) {
return renderError
diff --git a/src/helpers/apps/listApps.js b/src/helpers/apps/listApps.js
index 2e7449fe..46333447 100644
--- a/src/helpers/apps/listApps.js
+++ b/src/helpers/apps/listApps.js
@@ -5,11 +5,14 @@ import { APPLICATIONS_BY_DEVICE } from 'helpers/urls'
import getDeviceVersion from 'helpers/devices/getDeviceVersion'
import getCurrentFirmware from 'helpers/devices/getCurrentFirmware'
-export default async (targetId: string | number, version: string) => {
+export default async (targetId: string | number, fullVersion: string, provider: number) => {
try {
- const provider = 1
- const deviceData = await getDeviceVersion(targetId)
- const firmwareData = await getCurrentFirmware({ deviceId: deviceData.id, version })
+ const deviceData = await getDeviceVersion(targetId, provider)
+ const firmwareData = await getCurrentFirmware({
+ deviceId: deviceData.id,
+ fullVersion,
+ provider,
+ })
const params = {
provider,
current_se_firmware_final_version: firmwareData.id,
diff --git a/src/helpers/common.js b/src/helpers/common.js
index 3d5a9c30..0015c91d 100644
--- a/src/helpers/common.js
+++ b/src/helpers/common.js
@@ -32,9 +32,25 @@ export async function getFirmwareInfo(transport: Transport<*>) {
const data = byteArray.slice(0, byteArray.length - 2)
const targetIdStr = Buffer.from(data.slice(0, 4))
const targetId = targetIdStr.readUIntBE(0, 4)
- const versionLength = data[4]
- const version = Buffer.from(data.slice(5, 5 + versionLength)).toString()
- return { targetId, version }
+ const seVersionLength = data[4]
+ const seVersion = Buffer.from(data.slice(5, 5 + seVersionLength)).toString()
+ const flagsLength = data[5 + seVersionLength]
+ const flags = Buffer.from(
+ data.slice(5 + seVersionLength + 1, 5 + seVersionLength + 1 + flagsLength),
+ ).toString()
+
+ const mcuVersionLength = data[5 + seVersionLength + 1 + flagsLength]
+ let mcuVersion = Buffer.from(
+ data.slice(
+ 7 + seVersionLength + flagsLength,
+ 7 + seVersionLength + flagsLength + mcuVersionLength,
+ ),
+ )
+ if (mcuVersion[mcuVersion.length - 1] === 0) {
+ mcuVersion = mcuVersion.slice(0, mcuVersion.length - 1)
+ }
+ mcuVersion = mcuVersion.toString()
+ return { targetId, seVersion, flags, mcuVersion }
} catch (err) {
const error = new Error(err.message)
error.stack = err.stack
diff --git a/src/helpers/devices/getCurrentFirmware.js b/src/helpers/devices/getCurrentFirmware.js
index d9f4c32f..1aa48a3f 100644
--- a/src/helpers/devices/getCurrentFirmware.js
+++ b/src/helpers/devices/getCurrentFirmware.js
@@ -4,21 +4,21 @@ import network from 'api/network'
import { GET_CURRENT_FIRMWARE } from 'helpers/urls'
type Input = {
- version: string,
+ fullVersion: string,
deviceId: string | number,
+ provider: number,
}
let error
export default async (input: Input): Promise<*> => {
try {
- const provider = 1
const { data } = await network({
method: 'POST',
url: GET_CURRENT_FIRMWARE,
data: {
device_version: input.deviceId,
- version_name: input.version,
- provider,
+ version_name: input.fullVersion,
+ provider: input.provider,
},
})
return data
diff --git a/src/helpers/devices/getDeviceInfo.js b/src/helpers/devices/getDeviceInfo.js
index 06a1e2be..c5d114a9 100644
--- a/src/helpers/devices/getDeviceInfo.js
+++ b/src/helpers/devices/getDeviceInfo.js
@@ -4,23 +4,65 @@ import type Transport from '@ledgerhq/hw-transport'
import { getFirmwareInfo } from 'helpers/common'
-type Result = {
+export type DeviceInfo = {
targetId: string | number,
- version: string,
- mcu: boolean,
- final: boolean,
+ seVersion: string,
+ isBootloader: boolean,
+ flags: string,
+ mcuVersion: string,
+ isOSU: boolean,
+ providerName: string,
+ providerId: number,
+ fullVersion: string,
}
-export default async (transport: Transport<*>): Promise => {
- try {
- const { targetId, version } = await getFirmwareInfo(transport)
- const finalReady = version.endsWith('-osu')
- const mcuReady = targetId === 0x01000001
+// prettier-ignore
+const DETECT_CLUBCOIN = [
+ [0xe0, 0x04, 0x00, 0x00, Buffer.from([0x31, 0x10, 0x00, 0x02])],
+ [0xe0, 0x50, 0x00, 0x00, Buffer.from([0xe4, 0x6c, 0x4c, 0x71, 0x8b, 0xc8, 0x7f, 0xb7])],
+ [0xe0, 0x51, 0x80, 0x00, Buffer.from([0x41, 0x04, 0xc9, 0x8c, 0xa0, 0x99, 0x53, 0x47, 0x2b, 0x36, 0x06, 0x1e, 0x0e, 0x40, 0xc9, 0x3d, 0x50, 0x52, 0x34, 0x09, 0x0e, 0xfd, 0x74, 0xf1, 0xd7, 0xa2, 0x93, 0xe8, 0x28, 0x15, 0x9a, 0x97, 0x71, 0x1b, 0x33, 0xd1, 0x8a, 0xfc, 0x17, 0xad, 0x15, 0x6e, 0xae, 0xd9, 0x9c, 0xf4, 0x3b, 0x20, 0xe1, 0x5d, 0x64, 0xaf, 0x39, 0xa5, 0x51, 0x3b, 0x4e, 0x3c, 0x5f, 0x43, 0x17, 0xe6, 0x42, 0x70, 0x2f, 0x05, 0x47, 0x30, 0x45, 0x02, 0x21, 0x00, 0xf1, 0xd2, 0xb8, 0x34, 0x99, 0x4a, 0x0c, 0x1f, 0x25, 0xea, 0x20, 0xcf, 0x33, 0xe3, 0x2b, 0xd0, 0x6b, 0xcf, 0x7c, 0x42, 0x4a, 0x02, 0xee, 0xe8, 0xf6, 0x96, 0x99, 0x20, 0xe1, 0xe8, 0xc2, 0xb3, 0x02, 0x20, 0x63, 0x2d, 0x19, 0xbd, 0x30, 0xab, 0x20, 0x76, 0x18, 0x78, 0x78, 0xae, 0xaa, 0x0f, 0x4d, 0x48, 0x04, 0x01, 0x32, 0x79, 0xd0, 0x16, 0xde, 0xca, 0x66, 0x93, 0xf3, 0x7b, 0x4e, 0x50, 0x7f, 0x43])],
+]
- return { targetId, version, final: finalReady, mcu: mcuReady }
- } catch (err) {
- const error = Error(err.message)
- error.stack = err.stack
- throw error
+const PROVIDERS = {
+ '': 1,
+ das: 2,
+ club: 3,
+ shitcoins: 4,
+}
+
+export default async (transport: Transport<*>): Promise => {
+ const res = await getFirmwareInfo(transport)
+ let { seVersion } = res
+ const { targetId, mcuVersion, flags } = res
+ if (seVersion === '1.2') {
+ try {
+ for (let i = 0; i < DETECT_CLUBCOIN.length; i++) {
+ const instructions = DETECT_CLUBCOIN[i]
+ await transport.send(...instructions)
+ }
+ seVersion = '1.2.0-club'
+ } catch (e) {
+ seVersion = '1.2.0'
+ }
+ }
+ const parsedVersion =
+ seVersion.match(/([0-9]+.[0-9])+(.[0-9]+)?((?!-osu)-([a-z]+))?(-osu)?/) || []
+ const isOSU = typeof parsedVersion[5] !== 'undefined'
+ const providerName = parsedVersion[4] || ''
+ const providerId = PROVIDERS[providerName]
+ const isBootloader = targetId === 0x01000001
+ const majMin = parsedVersion[1]
+ const patch = parsedVersion[2] || '.0'
+ const fullVersion = `${majMin}${patch}${providerName ? `-${providerName}` : ''}`
+ return {
+ targetId,
+ seVersion: majMin + patch,
+ isOSU,
+ mcuVersion,
+ isBootloader,
+ providerName,
+ providerId,
+ flags,
+ fullVersion,
}
}
diff --git a/src/helpers/devices/getDeviceVersion.js b/src/helpers/devices/getDeviceVersion.js
index a66a8421..698bc1fa 100644
--- a/src/helpers/devices/getDeviceVersion.js
+++ b/src/helpers/devices/getDeviceVersion.js
@@ -2,8 +2,7 @@
import { GET_DEVICE_VERSION } from 'helpers/urls'
import network from 'api/network'
-export default async (targetId: string | number): Promise<*> => {
- const provider = 1
+export default async (targetId: string | number, provider: number): Promise<*> => {
const { data } = await network({
method: 'POST',
url: GET_DEVICE_VERSION,
diff --git a/src/helpers/devices/getIsGenuine.js b/src/helpers/devices/getIsGenuine.js
index 4fa98804..9ea7c56d 100644
--- a/src/helpers/devices/getIsGenuine.js
+++ b/src/helpers/devices/getIsGenuine.js
@@ -2,21 +2,21 @@
import type Transport from '@ledgerhq/hw-transport'
import { SKIP_GENUINE } from 'config/constants'
import { WS_GENUINE } from 'helpers/urls'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
import { createDeviceSocket } from 'helpers/socket'
import getCurrentFirmware from './getCurrentFirmware'
import getDeviceVersion from './getDeviceVersion'
-export default async (
- transport: Transport<*>,
- app: { targetId: string | number, version: string },
-): Promise => {
- const { targetId, version } = app
- const device = await getDeviceVersion(app.targetId)
- const firmware = await getCurrentFirmware({ deviceId: device.id, version })
+export default async (transport: Transport<*>, deviceInfo: DeviceInfo): Promise => {
+ const deviceVersion = await getDeviceVersion(deviceInfo.targetId, deviceInfo.providerId)
+ const firmware = await getCurrentFirmware({
+ deviceId: deviceVersion.id,
+ fullVersion: deviceInfo.fullVersion,
+ provider: deviceInfo.providerId,
+ })
const params = {
- targetId,
- version,
+ targetId: deviceInfo.targetId,
perso: firmware.perso,
}
const url = WS_GENUINE(params)
diff --git a/src/helpers/devices/getLatestFirmwareForDevice.js b/src/helpers/devices/getLatestFirmwareForDevice.js
index 71fa3598..6a0a2624 100644
--- a/src/helpers/devices/getLatestFirmwareForDevice.js
+++ b/src/helpers/devices/getLatestFirmwareForDevice.js
@@ -1,24 +1,22 @@
// @flow
import network from 'api/network'
import { GET_LATEST_FIRMWARE } from 'helpers/urls'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
import getCurrentFirmware from './getCurrentFirmware'
import getDeviceVersion from './getDeviceVersion'
-type Input = {
- version: string,
- targetId: string | number,
-}
-
-export default async (input: Input) => {
+export default async (deviceInfo: DeviceInfo) => {
try {
- const provider = 1
- const { targetId, version } = input
// Get device infos from targetId
- const deviceVersion = await getDeviceVersion(targetId)
+ const deviceVersion = await getDeviceVersion(deviceInfo.targetId, deviceInfo.providerId)
// Get firmware infos with firmware name and device version
- const seFirmwareVersion = await getCurrentFirmware({ version, deviceId: deviceVersion.id })
+ const seFirmwareVersion = await getCurrentFirmware({
+ fullVersion: deviceInfo.fullVersion,
+ deviceId: deviceVersion.id,
+ provider: deviceInfo.providerId,
+ })
// Fetch next possible firmware
const { data } = await network({
@@ -27,7 +25,7 @@ export default async (input: Input) => {
data: {
current_se_firmware_final_version: seFirmwareVersion.id,
device_version: deviceVersion.id,
- provider,
+ provider: deviceInfo.providerId,
},
})
diff --git a/src/helpers/devices/getOsuFirmware.js b/src/helpers/devices/getOsuFirmware.js
index eaf8344f..4cc666de 100644
--- a/src/helpers/devices/getOsuFirmware.js
+++ b/src/helpers/devices/getOsuFirmware.js
@@ -15,7 +15,7 @@ export default async (input: Input): Promise<*> => {
url: GET_CURRENT_OSU,
data: {
device_version: input.deviceId,
- version_name: input.version,
+ version_name: `${input.version}-osu`,
provider,
},
})
diff --git a/src/helpers/devices/isDashboardOpen.js b/src/helpers/devices/isDashboardOpen.js
index 5f5cc619..e3663e5f 100644
--- a/src/helpers/devices/isDashboardOpen.js
+++ b/src/helpers/devices/isDashboardOpen.js
@@ -8,8 +8,8 @@ type Result = boolean
export default async (transport: Transport<*>): Promise => {
try {
- const { targetId, version } = await getFirmwareInfo(transport)
- if (targetId && version) {
+ const { targetId, seVersion } = await getFirmwareInfo(transport)
+ if (targetId && seVersion) {
return true
}
diff --git a/src/helpers/firmware/installFinalFirmware.js b/src/helpers/firmware/installFinalFirmware.js
index f2c3c885..e4d5269b 100644
--- a/src/helpers/firmware/installFinalFirmware.js
+++ b/src/helpers/firmware/installFinalFirmware.js
@@ -1,5 +1,6 @@
// @flow
import type Transport from '@ledgerhq/hw-transport'
+import type { DeviceInfo } from 'helpers/devices/getDeviceInfo'
import { WS_INSTALL } from 'helpers/urls'
import { createDeviceSocket } from 'helpers/socket'
@@ -7,22 +8,17 @@ import getDeviceVersion from 'helpers/devices/getDeviceVersion'
import getOsuFirmware from 'helpers/devices/getOsuFirmware'
import getFinalFirmwareById from './getFinalFirmwareById'
-type Input = {
- targetId: number | string,
- version: string,
-}
type Result = *
-export default async (transport: Transport<*>, app: Input): Result => {
+export default async (transport: Transport<*>, deviceInfo: DeviceInfo): Result => {
try {
- const { targetId, version } = app
- const device = await getDeviceVersion(targetId)
- const firmware = await getOsuFirmware({ deviceId: device.id, version })
+ const device = await getDeviceVersion(deviceInfo.targetId, deviceInfo.providerId)
+ const firmware = await getOsuFirmware({ deviceId: device.id, version: deviceInfo.fullVersion })
const { next_se_firmware_final_version } = firmware
const nextFirmware = await getFinalFirmwareById(next_se_firmware_final_version)
const params = {
- targetId,
+ targetId: deviceInfo.targetId,
...nextFirmware,
firmwareKey: nextFirmware.firmware_key,
}
diff --git a/src/helpers/urls.js b/src/helpers/urls.js
index 4cc4b313..448eb7c3 100644
--- a/src/helpers/urls.js
+++ b/src/helpers/urls.js
@@ -23,7 +23,10 @@ export const GET_LATEST_FIRMWARE: string = managerUrlbuilder('get_latest_firmwar
export const GET_NEXT_MCU: string = managerUrlbuilder('mcu_versions_bootloader')
export const WS_INSTALL: (arg: LedgerScriptParams) => string = wsURLBuilder('install')
-export const WS_GENUINE: (arg: { targetId: string | number }) => string = wsURLBuilder('genuine')
+export const WS_GENUINE: (arg: {
+ targetId: string | number,
+ perso: string,
+}) => string = wsURLBuilder('genuine')
export const WS_MCU: (arg: { targetId: string | number, version: string }) => string = wsURLBuilder(
'mcu',
)