From 0fb35e2658d99a81076a7dd3f739930c66dd382b Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:32 +0100 Subject: [PATCH 01/24] New translations app.json (Spanish) --- static/i18n/es/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json index 923863d2..ba4ef4d7 100644 --- a/static/i18n/es/app.json +++ b/static/i18n/es/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From f0ec141a3da8c97aac0ce170f8f28c872dfb880d Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:35 +0100 Subject: [PATCH 02/24] New translations app.json (Chinese Simplified) --- static/i18n/zh/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/zh/app.json b/static/i18n/zh/app.json index bcf8fb40..b10153ea 100644 --- a/static/i18n/zh/app.json +++ b/static/i18n/zh/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From c8c0a39c6de3c8994107f71fbefa9a5a9eb63bcb Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:37 +0100 Subject: [PATCH 03/24] New translations app.json (French) --- static/i18n/fr/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/fr/app.json b/static/i18n/fr/app.json index 254fddc4..87702c4d 100644 --- a/static/i18n/fr/app.json +++ b/static/i18n/fr/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From a035cf16b4d98afea82cc077a0c6e95913fc6ec1 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:40 +0100 Subject: [PATCH 04/24] New translations app.json (Japanese) --- static/i18n/ja/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/ja/app.json b/static/i18n/ja/app.json index 2333e40f..a3a3a245 100644 --- a/static/i18n/ja/app.json +++ b/static/i18n/ja/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From 9b9b3460be1f39ca3864c58f6b187889353bbfbd Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:42 +0100 Subject: [PATCH 05/24] New translations app.json (Korean) --- static/i18n/ko/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/ko/app.json b/static/i18n/ko/app.json index 2fbf6e5d..a3e8aabb 100644 --- a/static/i18n/ko/app.json +++ b/static/i18n/ko/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From deeeee2339688880dc757aebda2d0e33ee2d1b15 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 12:03:44 +0100 Subject: [PATCH 06/24] New translations app.json (Russian) --- static/i18n/ru/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/i18n/ru/app.json b/static/i18n/ru/app.json index db9bcb7a..370a9797 100644 --- a/static/i18n/ru/app.json +++ b/static/i18n/ru/app.json @@ -902,6 +902,10 @@ }, "FeeNotLoaded": { "title": "Couldn’t load fee rates, please set manual fees" + }, + "UnknownMCU": { + "title": "Unknown MCU version", + "description": "Please contact Ledger Support" } } -} \ No newline at end of file +} From e51e4bc8a6a84e725911065ec985f56e72eedab3 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:34:54 +0100 Subject: [PATCH 07/24] New translations app.json (Spanish) --- static/i18n/es/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json index ba4ef4d7..8551ff1f 100644 --- a/static/i18n/es/app.json +++ b/static/i18n/es/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "Exportar registros", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From e491c244abaecfd985be105880df6f3d0b037f12 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:34:56 +0100 Subject: [PATCH 08/24] New translations app.json (Chinese Simplified) --- static/i18n/zh/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/zh/app.json b/static/i18n/zh/app.json index b10153ea..a257757b 100644 --- a/static/i18n/zh/app.json +++ b/static/i18n/zh/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "导出记录", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From 5f83741984cb09d6463873eaee8a2ebe2e2c7185 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:34:59 +0100 Subject: [PATCH 09/24] New translations app.json (French) --- static/i18n/fr/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/fr/app.json b/static/i18n/fr/app.json index 87702c4d..9a2b6001 100644 --- a/static/i18n/fr/app.json +++ b/static/i18n/fr/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "Export logs", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From 7aa9f7ce719464e215d769b8560faee46396d34d Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:35:02 +0100 Subject: [PATCH 10/24] New translations app.json (Japanese) --- static/i18n/ja/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/ja/app.json b/static/i18n/ja/app.json index a3a3a245..aa2f544e 100644 --- a/static/i18n/ja/app.json +++ b/static/i18n/ja/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "ログのエクスポート", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From 49ac8a0ca646d2873b040262a9f8660d568a0d30 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:35:06 +0100 Subject: [PATCH 11/24] New translations app.json (Korean) --- static/i18n/ko/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/ko/app.json b/static/i18n/ko/app.json index a3e8aabb..d2fbefc5 100644 --- a/static/i18n/ko/app.json +++ b/static/i18n/ko/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "로그 내보내기", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From d7653c3a54475882931fd5881efb63d7045963db Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 15:35:09 +0100 Subject: [PATCH 12/24] New translations app.json (Russian) --- static/i18n/ru/app.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/i18n/ru/app.json b/static/i18n/ru/app.json index 370a9797..7f330cf3 100644 --- a/static/i18n/ru/app.json +++ b/static/i18n/ru/app.json @@ -451,8 +451,12 @@ }, "repairDevice": { "title": "Repair your Ledger device", - "desc": "If you encountered some issue while updating your device and cannot resume the update process, you can try this option to repair your device.", - "button": "Repair" + "descSettings": "Use this tool to restore your Ledger device if it has become stuck during a firmware update.", + "desc": "Please select the state of your Ledger device.", + "button": "Repair", + "generic": "Bootloader", + "mcuNotGenuine": "MCU not genuine", + "followDeviceRepair": "Follow device repair instructions" }, "exportLogs": { "title": "Экспортировать журналы", @@ -851,7 +855,7 @@ "description": "{{message}}" }, "UnexpectedBootloader": { - "title": "Opps, your device should not be in Bootloader mode", + "title": "Oops, your device should not be in Bootloader mode", "description": "Please restart your device or contact us" }, "UserRefusedFirmwareUpdate": { From 9e9ced6ad8a597f6b22545d641f9d9accc95276c Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:12 +0100 Subject: [PATCH 13/24] New translations app.json (Spanish) --- static/i18n/es/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json index 8551ff1f..0b8a461a 100644 --- a/static/i18n/es/app.json +++ b/static/i18n/es/app.json @@ -874,6 +874,10 @@ "title": "Se requiere la actualización de la aplicación.", "description": "Desinstala y vuelve a instalar la aplicación {{managerAppName}} en el Gestor." }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From 9797bc10c27f538db87a1324e5c6c7adffee363b Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:15 +0100 Subject: [PATCH 14/24] New translations app.json (Chinese Simplified) --- static/i18n/zh/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/zh/app.json b/static/i18n/zh/app.json index a257757b..505d2b23 100644 --- a/static/i18n/zh/app.json +++ b/static/i18n/zh/app.json @@ -874,6 +874,10 @@ "title": "需要更新应用程序", "description": "在管理器中卸载并重新安装 {{managerAppName}} 应用程序" }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From a42278683b407ca58f2f8887ffdbee84f0d5e3c6 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:18 +0100 Subject: [PATCH 15/24] New translations app.json (French) --- static/i18n/fr/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/fr/app.json b/static/i18n/fr/app.json index 9a2b6001..17eeea58 100644 --- a/static/i18n/fr/app.json +++ b/static/i18n/fr/app.json @@ -874,6 +874,10 @@ "title": "Mise à jour de l’application requise", "description": "Désinstallez et réinstallez l’application {{managerAppName}} dans le gestionnaire." }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From 64bcc1c57a800502e1192c3ca6987dee4eb67699 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:22 +0100 Subject: [PATCH 16/24] New translations app.json (Japanese) --- static/i18n/ja/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/ja/app.json b/static/i18n/ja/app.json index aa2f544e..54603407 100644 --- a/static/i18n/ja/app.json +++ b/static/i18n/ja/app.json @@ -874,6 +874,10 @@ "title": "アプリの更新が必要です", "description": "マネージャーに{{managerAppName}}アプリをアンインストールし、再インストールします" }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From e86a03632e9cee10aaca07367629f91aa8476884 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:24 +0100 Subject: [PATCH 17/24] New translations app.json (Korean) --- static/i18n/ko/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/ko/app.json b/static/i18n/ko/app.json index d2fbefc5..c7323495 100644 --- a/static/i18n/ko/app.json +++ b/static/i18n/ko/app.json @@ -874,6 +874,10 @@ "title": "앱 업데이트가 필요합니다.", "description": "Manager에서 {{managerAppName}} 앱을 제거한 후 다시 설치하십시오." }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From aafb53fc0396b1293eab863ccffb66d265d7421d Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Tue, 22 Jan 2019 16:04:26 +0100 Subject: [PATCH 18/24] New translations app.json (Russian) --- static/i18n/ru/app.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/i18n/ru/app.json b/static/i18n/ru/app.json index 7f330cf3..18f3a8fc 100644 --- a/static/i18n/ru/app.json +++ b/static/i18n/ru/app.json @@ -874,6 +874,10 @@ "title": "Требуется обновить приложение.", "description": "Удалите и повторно установите приложение {{managerAppName}} через диспетчер." }, + "DeviceOnDashboardExpected": { + "title": "Return to Dashboard", + "description": "Please navigate back to Dashboard on your device" + }, "WebsocketConnectionError": { "title": "Sorry, try again (websocket error)", "description": null From 00996e5aa930708429a9229f5f5e7ca2fb23b8b0 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Thu, 3 Jan 2019 23:36:25 +0100 Subject: [PATCH 19/24] Support for XSN and activate Sapling for Komodo --- package.json | 2 +- src/commands/libcoreSignAndBroadcast.js | 4 ++-- src/config/cryptocurrencies.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e342f101..2c9a4a14 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", - "@ledgerhq/ledger-core": "2.0.0-rc.14", + "@ledgerhq/ledger-core": "2.0.0-rc.15", "@ledgerhq/live-common": "4.13.0", "animated": "^0.2.2", "async": "^2.6.1", diff --git a/src/commands/libcoreSignAndBroadcast.js b/src/commands/libcoreSignAndBroadcast.js index b683a58b..a5847864 100644 --- a/src/commands/libcoreSignAndBroadcast.js +++ b/src/commands/libcoreSignAndBroadcast.js @@ -110,7 +110,7 @@ async function signTransaction({ const additionals = [] let expiryHeight if (currency.id === 'bitcoin_cash' || currency.id === 'bitcoin_gold') additionals.push('bip143') - if (currency.id === 'zcash') { + if (currency.id === 'zcash' || currency.id === 'komodo') { expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00]) if (blockHeight >= 419200) { additionals.push('sapling') @@ -121,7 +121,7 @@ async function signTransaction({ } const rawInputs = transaction.getInputs() - const hasExtraData = currency.id === 'zcash' + const hasExtraData = currency.id === 'zcash' || currency.id === 'komodo' const inputs = await Promise.all( rawInputs.map(async input => { diff --git a/src/config/cryptocurrencies.js b/src/config/cryptocurrencies.js index c29ccbc7..4c29f7b3 100644 --- a/src/config/cryptocurrencies.js +++ b/src/config/cryptocurrencies.js @@ -24,6 +24,7 @@ const supported: CryptoCurrencyIds[] = [ 'vertcoin', 'peercoin', 'viacoin', + 'stakenet', 'stealthcoin', 'poswallet', 'clubcoin', From df0e8f11da3207ccb503d075f87f6b7e06961ca5 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Tue, 15 Jan 2019 11:39:15 +0100 Subject: [PATCH 20/24] Bump binding which now uses 1.1.9: fix getFees --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 2c9a4a14..ec88d558 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,13 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", +<<<<<<< HEAD "@ledgerhq/ledger-core": "2.0.0-rc.15", "@ledgerhq/live-common": "4.13.0", +======= + "@ledgerhq/ledger-core": "2.0.0-rc.16", + "@ledgerhq/live-common": "4.8.0-beta.24", +>>>>>>> Bump binding which now uses 1.1.9: fix getFees "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", From 8387f9aa038e3ed8cbc1d6d163be148abd76cffd Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Tue, 15 Jan 2019 12:16:28 +0100 Subject: [PATCH 21/24] Bump hw-app-btc to 4.33.6 --- package.json | 7 +------ yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index ec88d558..82d00683 100644 --- a/package.json +++ b/package.json @@ -40,13 +40,8 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", -<<<<<<< HEAD - "@ledgerhq/ledger-core": "2.0.0-rc.15", - "@ledgerhq/live-common": "4.13.0", -======= "@ledgerhq/ledger-core": "2.0.0-rc.16", - "@ledgerhq/live-common": "4.8.0-beta.24", ->>>>>>> Bump binding which now uses 1.1.9: fix getFees + "@ledgerhq/live-common": "4.13.0", "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index 1716e7bf..8b30bb86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,10 +1722,10 @@ dependencies: events "^3.0.0" -"@ledgerhq/ledger-core@2.0.0-rc.14": - version "2.0.0-rc.14" - resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.14.tgz#538b771e9d837ce1d26aabaa1dfe58a6b882e3cd" - integrity sha512-WIq6DyOoqtPPt+pS8K6NQ8EJD9GIn/VD1HLehWvJYqZhUf1IOIEIaOqxCnayHMQ/7b4c68xANgmKggUBdQ0M+A== +"@ledgerhq/ledger-core@2.0.0-rc.16": + version "2.0.0-rc.16" + resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.16.tgz#51f141c0143edb020e38855bf2e2619e3446e74f" + integrity sha512-gmbeXRBg4NSqzH6+EajYTzaQlwN5ugaN1nH0SI6BvRqMfcorxNRE8byfh3F2u+7TNchBW72vOZnKPDShaR9/pQ== dependencies: bindings "^1.3.0" nan "^2.6.2" From c60c1506c25b03f10d8ea9a6657818b1706505c7 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Thu, 24 Jan 2019 14:50:36 +0100 Subject: [PATCH 22/24] Bump hw-app-btc to 4.34.0: fix of decred --- package.json | 2 +- yarn.lock | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 82d00683..ac7bfe6c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ } }, "dependencies": { - "@ledgerhq/hw-app-btc": "^4.32.0", + "@ledgerhq/hw-app-btc": "^4.34.0", "@ledgerhq/hw-app-eth": "^4.32.0", "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", diff --git a/yarn.lock b/yarn.lock index 8b30bb86..de3d8312 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1690,6 +1690,14 @@ "@ledgerhq/hw-transport" "^4.32.0" create-hash "^1.1.3" +"@ledgerhq/hw-app-btc@^4.34.0": + version "4.34.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.34.0.tgz#0bbc46afd29de04ac6a73582fbf9a09fcf5ed117" + integrity sha512-xR4rH8o8YRvyhnTvb8g89NAJQQqXJkApiFtCvduBamu5V+rDvhHYlFu2B+CU6g8lzLFACMDIqJqXbmwT80AGjw== + dependencies: + "@ledgerhq/hw-transport" "^4.32.0" + create-hash "^1.1.3" + "@ledgerhq/hw-app-eth@^4.32.0": version "4.32.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.32.0.tgz#7d43ca2c7952f1fb726e02c3b4485be10af481a2" From 26d564b2de6208c4b5af2080f25b502af6879181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Fri, 25 Jan 2019 10:46:44 +0100 Subject: [PATCH 23/24] ETH: also scan for metamask accounts derivation paths typically will allow to discover more than the first account of a metamask seed --- .eslintrc | 38 +++++++++++++++++++--------------- package.json | 2 +- src/bridge/EthereumJSBridge.js | 2 ++ src/bridge/RippleJSBridge.js | 2 ++ src/helpers/libcore.js | 4 +++- yarn.lock | 8 +++---- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/.eslintrc b/.eslintrc index e22c8543..8dc74d37 100644 --- a/.eslintrc +++ b/.eslintrc @@ -38,6 +38,7 @@ "jsx-a11y/label-has-for": 0, "prefer-destructuring": 0, "new-cap": 0, + "no-continue": 0, "no-await-in-loop": 0, "no-restricted-globals": 0, "no-unused-expressions": 0, @@ -48,7 +49,10 @@ "no-shadow": 0, "no-underscore-dangle": 0, "no-console": 2, - "no-unused-vars": ["error", { "argsIgnorePattern": "^_", "vars": "all", "args": "after-used", "ignoreRestSiblings": true }], + "no-unused-vars": [ + "error", + { "argsIgnorePattern": "^_", "vars": "all", "args": "after-used", "ignoreRestSiblings": true } + ], "no-use-before-define": 0, "no-restricted-syntax": 0, "no-prototype-builtins": 0, @@ -57,31 +61,31 @@ "react/jsx-curly-brace-presence": 0, "react/jsx-filename-extension": 0, "react/jsx-no-target-blank": 0, - "react/jsx-no-literals": [1, {"noStrings": false}], + "react/jsx-no-literals": [1, { "noStrings": false }], "react/prefer-stateless-function": 0, "react/require-default-props": 0, "react/no-multi-comp": 0, - "react/sort-comp": [1, { - order: [ - 'static-methods', - 'lifecycle', - 'everything-else', - 'render' - ] - }] + "react/sort-comp": [ + 1, + { + "order": ["static-methods", "lifecycle", "everything-else", "render"] + } + ] }, "settings": { "import/resolver": { - "babel-module": {}, + "babel-module": {} }, "flowtype": { - "onlyFilesWithFlowAnnotation": true, + "onlyFilesWithFlowAnnotation": true } }, - "overrides": [{ - "files": [ "*stories.js" ], - "rules": { - "react/jsx-no-literals": 0 + "overrides": [ + { + "files": ["*stories.js"], + "rules": { + "react/jsx-no-literals": 0 + } } - }] + ] } diff --git a/package.json b/package.json index ac7bfe6c..54659a1a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", "@ledgerhq/ledger-core": "2.0.0-rc.16", - "@ledgerhq/live-common": "4.13.0", + "@ledgerhq/live-common": "4.14.0", "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", diff --git a/src/bridge/EthereumJSBridge.js b/src/bridge/EthereumJSBridge.js index 1eeeca8f..3282d1b4 100644 --- a/src/bridge/EthereumJSBridge.js +++ b/src/bridge/EthereumJSBridge.js @@ -13,6 +13,7 @@ import { getDerivationScheme, runDerivationScheme, isIterableDerivationMode, + derivationModeSupportsIndex, getMandatoryEmptyAccountSkip, } from '@ledgerhq/live-common/lib/derivation' import { @@ -314,6 +315,7 @@ const EthereumBridge: WalletBridge = { const derivationScheme = getDerivationScheme({ derivationMode, currency }) const stopAt = isIterableDerivationMode(derivationMode) ? 255 : 1 for (let index = 0; index < stopAt; index++) { + if (!derivationModeSupportsIndex(derivationMode, index)) continue const freshAddressPath = runDerivationScheme(derivationScheme, currency, { account: index, }) diff --git a/src/bridge/RippleJSBridge.js b/src/bridge/RippleJSBridge.js index 88f83531..eff799e6 100644 --- a/src/bridge/RippleJSBridge.js +++ b/src/bridge/RippleJSBridge.js @@ -12,6 +12,7 @@ import { getDerivationScheme, runDerivationScheme, isIterableDerivationMode, + derivationModeSupportsIndex, } from '@ledgerhq/live-common/lib/derivation' import { getAccountPlaceholderName, @@ -314,6 +315,7 @@ const RippleJSBridge: WalletBridge = { const derivationScheme = getDerivationScheme({ derivationMode, currency }) const stopAt = isIterableDerivationMode(derivationMode) ? 255 : 1 for (let index = 0; index < stopAt; index++) { + if (!derivationModeSupportsIndex(derivationMode, index)) continue const freshAddressPath = runDerivationScheme(derivationScheme, currency, { account: index, }) diff --git a/src/helpers/libcore.js b/src/helpers/libcore.js index 6e05e7fb..29a209dd 100644 --- a/src/helpers/libcore.js +++ b/src/helpers/libcore.js @@ -13,6 +13,7 @@ import { isSegwitDerivationMode, isUnsplitDerivationMode, isIterableDerivationMode, + derivationModeSupportsIndex, } from '@ledgerhq/live-common/lib/derivation' import { getCryptoCurrencyById } from '@ledgerhq/live-common/lib/currencies' import { @@ -258,8 +259,9 @@ async function scanNextAccount(props: { if (isUnsubscribed()) return [] const isLast = ops.length === 0 || !isIterableDerivationMode(derivationMode) + const skipIndex = !derivationModeSupportsIndex(derivationMode, accountIndex) - if (!isLast || showNewAccount) { + if ((!isLast || showNewAccount) && !skipIndex) { onAccountScanned(account) accounts.push(account) } diff --git a/yarn.lock b/yarn.lock index de3d8312..5de18eda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1738,10 +1738,10 @@ bindings "^1.3.0" nan "^2.6.2" -"@ledgerhq/live-common@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.13.0.tgz#7e5eeaf8af2937cd30649b3f6e2094878980f557" - integrity sha512-DSO3CLVdZav7QC2DarbfAXW14z3omRvDFFfwF3URDwKH6nPIVJsE5WqiMpnQ1SL+a1qnevGkF5NLrvwv5bdRmQ== +"@ledgerhq/live-common@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.14.0.tgz#56ecac0a21f0d77a66a57d5ce9e2159b426e0ec7" + integrity sha512-oKvb/QZrG2XzVvq/IM+73lyw33VlyDu03hmYFCR48U2DGao/SCFOH8J0vQZK/U9VTSqpnC8mEZKQhNOQkf5hoA== dependencies: "@aeternity/ledger-app-api" "0.0.4" "@ledgerhq/errors" "^4.32.0" From d094a5cccc1b9b5d5e15f620ebceebb5e0ed9df3 Mon Sep 17 00:00:00 2001 From: "Valentin D. Pinkman" Date: Fri, 25 Jan 2019 16:03:19 +0100 Subject: [PATCH 24/24] fix wording in update and repair --- static/i18n/en/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 9b7e69c9..e19b4482 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -271,7 +271,7 @@ "identifier": "Identifier", "mcuTitle": "Updating MCU", "mcuFirst": "Disconnect the USB cable from your device", - "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the processing screen appears", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "If asked on device, please enter your pin code to finish the process", "successTitle": "Firmware updated", "successText": "You may re-install the apps on your device"