Browse Source

Merge branch 'develop' into new-derivations

gre-patch-1
Gaëtan Renaudeau 7 years ago
parent
commit
384d032080
No known key found for this signature in database GPG Key ID: 7B66B85F042E5451
  1. 2
      .circleci/config.yml
  2. 1
      .gitignore
  3. 4
      package.json
  4. 17
      scripts/download-xliffs.sh
  5. 10
      scripts/release.sh
  6. 1
      src/bridge/LibcoreBridge.js
  7. 35
      src/commands/libcoreSignAndBroadcast.js
  8. 214
      src/components/DevToolsPage/AccountImporter.js
  9. 2
      src/config/urls.js
  10. 21
      src/helpers/libcore.js
  11. 1
      src/internals/index.js
  12. 6
      static/i18n/en/app.json
  13. 16
      yarn.lock

2
.circleci/config.yml

@ -9,7 +9,7 @@ jobs:
build: build:
<<: *defaults <<: *defaults
steps: steps:
- run: sudo apt-get install -y libudev-dev - run: sudo apt-get install -y libudev-dev libfuse-dev
- run: - run:
name: Install latest yarn name: Install latest yarn
command: | command: |

1
.gitignore

@ -1,3 +1,4 @@
xliffs/
/.env /.env
/dist/ /dist/
/flow-typed/ /flow-typed/

4
package.json

@ -3,7 +3,7 @@
"productName": "Ledger Live", "productName": "Ledger Live",
"description": "Ledger Live - Desktop", "description": "Ledger Live - Desktop",
"repository": "https://github.com/LedgerHQ/ledger-live-desktop", "repository": "https://github.com/LedgerHQ/ledger-live-desktop",
"version": "1.2.1", "version": "1.2.3",
"author": "Ledger", "author": "Ledger",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
@ -35,7 +35,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@ledgerhq/hw-app-btc": "4.24.0", "@ledgerhq/hw-app-btc": "^4.27.0",
"@ledgerhq/hw-app-eth": "^4.24.0", "@ledgerhq/hw-app-eth": "^4.24.0",
"@ledgerhq/hw-app-xrp": "^4.25.0", "@ledgerhq/hw-app-xrp": "^4.25.0",
"@ledgerhq/hw-transport": "^4.24.0", "@ledgerhq/hw-transport": "^4.24.0",

17
scripts/download-xliffs.sh

@ -0,0 +1,17 @@
#!/bin/sh
if [ -z "$CROWDIN_TOKEN" ]; then
echo "CROWDIN_TOKEN env required" >&2
exit 1
fi
rm -rf xliffs
mkdir xliffs
cd xliffs
for lang in fr es-ES zh-CN ja ko ru; do
curl "https://api.crowdin.com/api/project/ledger-wallet/export-file?file=develop/static/i18n/en/app.json&language=$lang&format=xliff&key=$CROWDIN_TOKEN" > en-$lang.xliff
done
zip -r ledger-live-langs.zip *.xliff

10
scripts/release.sh

@ -69,6 +69,7 @@ fi
runJob "yarn compile" "compiling..." "compiled" "failed to compile" "verbose" runJob "yarn compile" "compiling..." "compiled" "failed to compile" "verbose"
if [[ $(uname) == 'Linux' ]]; then
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Linux: Internal process error (null) # Linux: Internal process error (null)
# #
@ -114,3 +115,12 @@ scripts/upload-github-release-asset.sh \
repo=ledger-live-desktop \ repo=ledger-live-desktop \
tag="$GH_TAG" \ tag="$GH_TAG" \
filename="dist/latest-linux.yml" filename="dist/latest-linux.yml"
else
runJob \
"DEBUG=electron-builder electron-builder build --publish always" \
"building and packaging app..." \
"app built and packaged successfully" \
"failed to build app" \
"verbose"
fi

1
src/bridge/LibcoreBridge.js

@ -220,6 +220,7 @@ const LibcoreBridge: WalletBridge<Transaction> = {
.send({ .send({
accountId: account.id, accountId: account.id,
currencyId: account.currency.id, currencyId: account.currency.id,
blockHeight: account.blockHeight,
xpub: account.xpub || '', // FIXME only reason is to build the op id. we need to consider another id for making op id. xpub: account.xpub || '', // FIXME only reason is to build the op id. we need to consider another id for making op id.
derivationMode: account.derivationMode, derivationMode: account.derivationMode,
seedIdentifier: account.seedIdentifier, seedIdentifier: account.seedIdentifier,

35
src/commands/libcoreSignAndBroadcast.js

@ -2,6 +2,7 @@
import logger from 'logger' import logger from 'logger'
import { BigNumber } from 'bignumber.js' import { BigNumber } from 'bignumber.js'
import { StatusCodes } from '@ledgerhq/hw-transport'
import Btc from '@ledgerhq/hw-app-btc' import Btc from '@ledgerhq/hw-app-btc'
import { Observable } from 'rxjs' import { Observable } from 'rxjs'
import { isSegwitDerivationMode } from '@ledgerhq/live-common/lib/derivation' import { isSegwitDerivationMode } from '@ledgerhq/live-common/lib/derivation'
@ -13,6 +14,7 @@ import {
bigNumberToLibcoreAmount, bigNumberToLibcoreAmount,
getOrCreateWallet, getOrCreateWallet,
} from 'helpers/libcore' } from 'helpers/libcore'
import { UpdateYourApp } from 'config/errors'
import withLibcore from 'helpers/withLibcore' import withLibcore from 'helpers/withLibcore'
import { createCommand, Command } from 'helpers/ipc' import { createCommand, Command } from 'helpers/ipc'
@ -26,6 +28,7 @@ type BitcoinLikeTransaction = {
type Input = { type Input = {
accountId: string, accountId: string,
blockHeight: number,
currencyId: string, currencyId: string,
derivationMode: DerivationMode, derivationMode: DerivationMode,
seedIdentifier: string, seedIdentifier: string,
@ -41,7 +44,17 @@ type Result = { type: 'signed' } | { type: 'broadcasted', operation: OperationRa
const cmd: Command<Input, Result> = createCommand( const cmd: Command<Input, Result> = createCommand(
'libcoreSignAndBroadcast', 'libcoreSignAndBroadcast',
({ accountId, currencyId, derivationMode, seedIdentifier, xpub, index, transaction, deviceId }) => ({
accountId,
blockHeight,
currencyId,
derivationMode,
seedIdentifier,
xpub,
index,
transaction,
deviceId,
}) =>
Observable.create(o => { Observable.create(o => {
let unsubscribed = false let unsubscribed = false
const currency = getCryptoCurrencyById(currencyId) const currency = getCryptoCurrencyById(currencyId)
@ -50,6 +63,7 @@ const cmd: Command<Input, Result> = createCommand(
doSignAndBroadcast({ doSignAndBroadcast({
accountId, accountId,
currency, currency,
blockHeight,
derivationMode, derivationMode,
seedIdentifier, seedIdentifier,
xpub, xpub,
@ -79,6 +93,7 @@ const cmd: Command<Input, Result> = createCommand(
async function signTransaction({ async function signTransaction({
hwApp, hwApp,
currency, currency,
blockHeight,
transaction, transaction,
derivationMode, derivationMode,
sigHashType, sigHashType,
@ -86,6 +101,7 @@ async function signTransaction({
}: { }: {
hwApp: Btc, hwApp: Btc,
currency: CryptoCurrency, currency: CryptoCurrency,
blockHeight: number,
transaction: *, transaction: *,
derivationMode: DerivationMode, derivationMode: DerivationMode,
sigHashType: number, sigHashType: number,
@ -94,7 +110,12 @@ async function signTransaction({
const additionals = [] const additionals = []
let expiryHeight let expiryHeight
if (currency.id === 'bitcoin_cash' || currency.id === 'bitcoin_gold') additionals.push('bip143') if (currency.id === 'bitcoin_cash' || currency.id === 'bitcoin_gold') additionals.push('bip143')
if (currency.id === 'zcash') expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00]) if (currency.id === 'zcash') {
expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00])
if (blockHeight >= 419200) {
additionals.push('sapling')
}
}
const rawInputs = transaction.getInputs() const rawInputs = transaction.getInputs()
const hasExtraData = currency.id === 'zcash' const hasExtraData = currency.id === 'zcash'
@ -166,6 +187,7 @@ async function signTransaction({
export async function doSignAndBroadcast({ export async function doSignAndBroadcast({
accountId, accountId,
derivationMode, derivationMode,
blockHeight,
seedIdentifier, seedIdentifier,
currency, currency,
xpub, xpub,
@ -180,6 +202,7 @@ export async function doSignAndBroadcast({
accountId: string, accountId: string,
derivationMode: DerivationMode, derivationMode: DerivationMode,
seedIdentifier: string, seedIdentifier: string,
blockHeight: number,
currency: CryptoCurrency, currency: CryptoCurrency,
xpub: string, xpub: string,
index: number, index: number,
@ -222,12 +245,18 @@ export async function doSignAndBroadcast({
signTransaction({ signTransaction({
hwApp: new Btc(transport), hwApp: new Btc(transport),
currency, currency,
blockHeight,
transaction: builded, transaction: builded,
sigHashType: parseInt(sigHashType, 16), sigHashType: parseInt(sigHashType, 16),
hasTimestamp, hasTimestamp,
derivationMode, derivationMode,
}), }),
) ).catch(e => {
if (e && e.statusCode === StatusCodes.INCORRECT_P1_P2) {
throw new UpdateYourApp(`UpdateYourApp ${currency.id}`, currency)
}
throw e
})
if (!signedTransaction || isCancelled() || !njsAccount) return if (!signedTransaction || isCancelled() || !njsAccount) return
onSigned() onSigned()

214
src/components/DevToolsPage/AccountImporter.js

@ -1,5 +1,7 @@
// @flow // @flow
/* eslint-disable react/no-multi-comp */
import React, { PureComponent, Fragment } from 'react' import React, { PureComponent, Fragment } from 'react'
import invariant from 'invariant' import invariant from 'invariant'
import { connect } from 'react-redux' import { connect } from 'react-redux'
@ -9,7 +11,8 @@ import type { Currency, Account } from '@ledgerhq/live-common/lib/types'
import { decodeAccount } from 'reducers/accounts' import { decodeAccount } from 'reducers/accounts'
import { addAccount } from 'actions/accounts' import { addAccount } from 'actions/accounts'
import FormattedVal from 'components/base/FormattedVal' import FakeLink from 'components/base/FakeLink'
import Ellipsis from 'components/base/Ellipsis'
import Switch from 'components/base/Switch' import Switch from 'components/base/Switch'
import Spinner from 'components/base/Spinner' import Spinner from 'components/base/Spinner'
import Box, { Card } from 'components/base/Box' import Box, { Card } from 'components/base/Box'
@ -32,26 +35,40 @@ type Props = {
addAccount: Account => void, addAccount: Account => void,
} }
const INITIAL_STATE = { type ImportableAccountType = {
status: 'idle', name: string,
currency: null, currency: Currency,
xpub: '', derivationMode: string,
account: null, xpub: string,
isSegwit: true,
isUnsplit: false,
error: null,
} }
type State = { type State = {
status: string, status: string,
importableAccounts: ImportableAccountType[],
currency: ?Currency, currency: ?Currency,
xpub: string, xpub: string,
account: ?Account, name: string,
isSegwit: boolean, isSegwit: boolean,
isUnsplit: boolean, isUnsplit: boolean,
error: ?Error, error: ?Error,
} }
const INITIAL_STATE = {
status: 'idle',
currency: null,
xpub: '',
name: 'dev',
isSegwit: true,
isUnsplit: false,
error: null,
importableAccounts: [],
}
class AccountImporter extends PureComponent<Props, State> { class AccountImporter extends PureComponent<Props, State> {
state = INITIAL_STATE state = INITIAL_STATE
@ -67,18 +84,41 @@ class AccountImporter extends PureComponent<Props, State> {
onChangeXPUB = xpub => this.setState({ xpub }) onChangeXPUB = xpub => this.setState({ xpub })
onChangeSegwit = isSegwit => this.setState({ isSegwit }) onChangeSegwit = isSegwit => this.setState({ isSegwit })
onChangeUnsplit = isUnsplit => this.setState({ isUnsplit }) onChangeUnsplit = isUnsplit => this.setState({ isUnsplit })
onChangeName = name => this.setState({ name })
isValid = () => { isValid = () => {
const { currency, xpub } = this.state const { currency, xpub, status } = this.state
return !!currency && !!xpub return !!currency && !!xpub && status !== 'scanning'
} }
scan = async () => { scan = async () => {
if (!this.isValid()) return
this.setState({ status: 'scanning' }) this.setState({ status: 'scanning' })
const { importableAccounts } = this.state
try { try {
const { currency, xpub, isSegwit, isUnsplit } = this.state for (let i = 0; i < importableAccounts.length; i++) {
invariant(currency, 'no currency') const a = importableAccounts[i]
const scanPayload = {
seedIdentifier: `dev_${a.xpub}`,
currencyId: a.currency.id,
xpub: a.xpub,
derivationMode: a.derivationMode,
}
const rawAccount = await scanFromXPUB.send(scanPayload).toPromise()
const account = decodeAccount(rawAccount)
await this.import({
...account,
name: a.name,
})
this.removeImportableAccount(a)
}
this.reset()
} catch (error) {
this.setState({ status: 'error', error })
}
}
addToScan = () => {
const { xpub, currency, isSegwit, isUnsplit, name } = this.state
const derivationMode = isSegwit const derivationMode = isSegwit
? isUnsplit ? isUnsplit
? 'segwit_unsplit' ? 'segwit_unsplit'
@ -86,37 +126,47 @@ class AccountImporter extends PureComponent<Props, State> {
: isUnsplit : isUnsplit
? 'unsplit' ? 'unsplit'
: '' : ''
const rawAccount = await scanFromXPUB const importableAccount = { xpub, currency, derivationMode, name }
.send({ this.setState(({ importableAccounts }) => ({
seedIdentifier: 'dev_tool', importableAccounts: [...importableAccounts, importableAccount],
currencyId: currency.id, currency: null,
xpub, xpub: '',
derivationMode, name: 'dev',
}) isSegwit: true,
.toPromise() isUnsplit: false,
const account = decodeAccount(rawAccount) }))
this.setState({ status: 'finish', account })
} catch (error) {
this.setState({ status: 'error', error })
} }
removeImportableAccount = importableAccount => {
this.setState(({ importableAccounts }) => ({
importableAccounts: importableAccounts.filter(i => i.xpub !== importableAccount.xpub),
}))
} }
import = async () => { import = async account => {
const { account } = this.state
invariant(account, 'no account') invariant(account, 'no account')
await idleCallback() await idleCallback()
this.props.addAccount(account) this.props.addAccount(account)
this.reset()
} }
reset = () => this.setState(INITIAL_STATE) reset = () => this.setState(INITIAL_STATE)
render() { render() {
const { currency, xpub, isSegwit, isUnsplit, status, account, error } = this.state const {
currency,
xpub,
name,
isSegwit,
isUnsplit,
status,
error,
importableAccounts,
} = this.state
const supportsSplit = !!currency && !!currency.forkedFrom const supportsSplit = !!currency && !!currency.forkedFrom
return ( return (
<Fragment>
<Card title="Import from xpub" flow={3}> <Card title="Import from xpub" flow={3}>
{status === 'idle' ? ( {status === 'idle' || status === 'scanning' ? (
<Fragment> <Fragment>
<Box flow={1}> <Box flow={1}>
<Label>{'currency'}</Label> <Label>{'currency'}</Label>
@ -148,50 +198,24 @@ class AccountImporter extends PureComponent<Props, State> {
placeholder="xpub" placeholder="xpub"
value={xpub} value={xpub}
onChange={this.onChangeXPUB} onChange={this.onChangeXPUB}
onEnter={this.scan} onEnter={this.addToScan}
/> />
</Box> </Box>
<Box align="flex-end"> <Box flow={1}>
<Button primary small disabled={!this.isValid()} onClick={this.scan}> <Label>{'name'}</Label>
{'scan'} <Input
</Button> placeholder="name"
</Box> value={name}
</Fragment> onChange={this.onChangeName}
) : status === 'scanning' ? ( onEnter={this.addToScan}
<Box align="center" justify="center" p={5}>
<Spinner size={16} />
</Box>
) : status === 'finish' ? (
account ? (
<Box p={8} align="center" justify="center" flow={5} horizontal>
<Box horizontal flow={4} color="graphite" align="center">
{currency && <CurrencyCircleIcon size={64} currency={currency} />}
<Box>
<Box ff="Museo Sans|Bold">{account.name}</Box>
<FormattedVal
fontSize={2}
alwaysShowSign={false}
color="graphite"
unit={account.unit}
showCode
val={account.balance || 0}
/> />
<Box fontSize={2}>{`${account.operations.length} operation(s)`}</Box>
</Box>
</Box> </Box>
<Box align="flex-end">
<Button outline small disabled={!account} onClick={this.import}> <Button primary small disabled={!this.isValid()} onClick={this.addToScan}>
{'import'} {'add to scan'}
</Button>
</Box>
) : (
<Box align="center" justify="center" p={5} flow={4}>
<Box>{'No accounts found or wrong xpub'}</Box>
<Button primary onClick={this.reset} small autoFocus>
{'Reset'}
</Button> </Button>
</Box> </Box>
) </Fragment>
) : status === 'error' ? ( ) : status === 'error' ? (
<Box align="center" justify="center" p={5} flow={4}> <Box align="center" justify="center" p={5} flow={4}>
<Box> <Box>
@ -203,6 +227,56 @@ class AccountImporter extends PureComponent<Props, State> {
</Box> </Box>
) : null} ) : null}
</Card> </Card>
{!!importableAccounts.length && (
<Card flow={2}>
{importableAccounts.map((acc, i) => (
<ImportableAccount
key={acc.xpub}
importableAccount={acc}
onRemove={this.removeImportableAccount}
isLoading={status === 'scanning' && i === 0}
>
{acc.xpub}
</ImportableAccount>
))}
{status !== 'scanning' && (
<Box mt={4} align="flex-start">
<Button primary onClick={this.scan}>
{'Launch scan'}
</Button>
</Box>
)}
</Card>
)}
</Fragment>
)
}
}
class ImportableAccount extends PureComponent<{
importableAccount: ImportableAccountType,
onRemove: ImportableAccountType => void,
isLoading: boolean,
}> {
remove = () => {
this.props.onRemove(this.props.importableAccount)
}
render() {
const { importableAccount, isLoading } = this.props
return (
<Box horizontal flow={2} align="center">
{isLoading && <Spinner size={16} color="rgba(0, 0, 0, 0.3)" />}
<CurrencyCircleIcon currency={importableAccount.currency} size={24} />
<Box grow ff="Rubik" fontSize={3}>
<Ellipsis>{`[${importableAccount.name}] ${importableAccount.derivationMode ||
'default'} ${importableAccount.xpub}`}</Ellipsis>
</Box>
{!isLoading && (
<FakeLink onClick={this.remove} fontSize={3}>
{'Remove'}
</FakeLink>
)}
</Box>
) )
} }
} }

2
src/config/urls.js

@ -8,7 +8,7 @@ export const urls = {
// Ledger support // Ledger support
faq: 'https://support.ledgerwallet.com/hc/en-us', faq: 'https://support.ledgerwallet.com/hc/en-us',
terms: 'https://www.ledgerwallet.com/terms', terms: 'https://www.ledger.com/pages/terms-of-use-and-disclaimer',
noDeviceBuyNew: 'https://www.ledgerwallet.com/', noDeviceBuyNew: 'https://www.ledgerwallet.com/',
noDeviceTrackOrder: 'http://order.ledgerwallet.com/', noDeviceTrackOrder: 'http://order.ledgerwallet.com/',
noDeviceLearnMore: 'https://www.ledgerwallet.com/', noDeviceLearnMore: 'https://www.ledgerwallet.com/',

21
src/helpers/libcore.js

@ -113,7 +113,6 @@ async function scanAccountsOnDeviceBySegwit({
// retrieve or create the wallet // retrieve or create the wallet
const wallet = await getOrCreateWallet(core, walletName, { currency, derivationMode }) const wallet = await getOrCreateWallet(core, walletName, { currency, derivationMode })
const accountsCount = await wallet.getAccountCount()
// recursively scan all accounts on device on the given app // recursively scan all accounts on device on the given app
// new accounts will be created in sqlite, existing ones will be updated // new accounts will be created in sqlite, existing ones will be updated
@ -123,7 +122,6 @@ async function scanAccountsOnDeviceBySegwit({
walletName, walletName,
devicePath, devicePath,
currency, currency,
accountsCount,
accountIndex: 0, accountIndex: 0,
accounts: [], accounts: [],
onAccountScanned, onAccountScanned,
@ -204,7 +202,6 @@ async function scanNextAccount(props: {
currency: CryptoCurrency, currency: CryptoCurrency,
seedIdentifier: string, seedIdentifier: string,
derivationMode: DerivationMode, derivationMode: DerivationMode,
accountsCount: number,
accountIndex: number, accountIndex: number,
accounts: AccountRaw[], accounts: AccountRaw[],
onAccountScanned: AccountRaw => void, onAccountScanned: AccountRaw => void,
@ -217,7 +214,6 @@ async function scanNextAccount(props: {
walletName, walletName,
devicePath, devicePath,
currency, currency,
accountsCount,
accountIndex, accountIndex,
accounts, accounts,
onAccountScanned, onAccountScanned,
@ -227,13 +223,12 @@ async function scanNextAccount(props: {
isUnsubscribed, isUnsubscribed,
} = props } = props
// create account only if account has not been scanned yet let njsAccount
// if it has already been created, we just need to get it, and sync it try {
const hasBeenScanned = accountIndex < accountsCount njsAccount = await wallet.getAccount(accountIndex)
} catch (err) {
const njsAccount = hasBeenScanned njsAccount = await createAccount(wallet, devicePath)
? await wallet.getAccount(accountIndex) }
: await createAccount(wallet, devicePath)
if (isUnsubscribed()) return [] if (isUnsubscribed()) return []
@ -559,14 +554,12 @@ export async function scanAccountsFromXPUB({
const currency = getCryptoCurrencyById(currencyId) const currency = getCryptoCurrencyById(currencyId)
const walletName = getWalletName({ const walletName = getWalletName({
currency, currency,
seedIdentifier: 'debug', seedIdentifier,
derivationMode, derivationMode,
}) })
const wallet = await getOrCreateWallet(core, walletName, { currency, derivationMode }) const wallet = await getOrCreateWallet(core, walletName, { currency, derivationMode })
await wallet.eraseDataSince(new Date(0))
const index = 0 const index = 0
const isSegwit = isSegwitDerivationMode(derivationMode) const isSegwit = isSegwitDerivationMode(derivationMode)

1
src/internals/index.js

@ -1,4 +1,5 @@
// @flow // @flow
import '@babel/polyfill'
import commands from 'commands' import commands from 'commands'
import logger from 'logger' import logger from 'logger'
import uuid from 'uuid/v4' import uuid from 'uuid/v4'

6
static/i18n/en/app.json

@ -170,7 +170,7 @@
"luno": "Luno makes it safe and easy to buy, store and learn about cryptocurrencies like Bitcoin and Ethereum", "luno": "Luno makes it safe and easy to buy, store and learn about cryptocurrencies like Bitcoin and Ethereum",
"shapeshift": "ShapeShift is an online marketplace where users can buy and sell digital assets. It is a fast and secure way for the world to buy and sell digital assets, with no lengthy signup process, no counterparty risk, and no friction.", "shapeshift": "ShapeShift is an online marketplace where users can buy and sell digital assets. It is a fast and secure way for the world to buy and sell digital assets, with no lengthy signup process, no counterparty risk, and no friction.",
"genesis": "Genesis is an institutional trading firm offering liquidity and borrow for digital currencies, including bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin, and XRP.", "genesis": "Genesis is an institutional trading firm offering liquidity and borrow for digital currencies, including bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin, and XRP.",
"kyber": "KYBER, his a trading platform for exchange and conversion of ERC-20 tokens" "kyber": "Kyber is a trading platform for exchange and conversion of ERC-20 tokens"
}, },
"genuinecheck": { "genuinecheck": {
"modal": { "modal": {
@ -826,8 +826,8 @@
"description": "Please try again or contact Ledger Support" "description": "Please try again or contact Ledger Support"
}, },
"UpdateYourApp": { "UpdateYourApp": {
"title": "App update required. Uninstall and reinstall the {{managerAppName}} app in the Manager", "title": "App update required",
"description": null "description": "Uninstall and reinstall the {{managerAppName}} app in the Manager"
}, },
"WebsocketConnectionError": { "WebsocketConnectionError": {
"title": "Sorry, try again (websocket error).", "title": "Sorry, try again (websocket error).",

16
yarn.lock

@ -1670,10 +1670,10 @@
camelcase "^5.0.0" camelcase "^5.0.0"
prettier "^1.13.7" prettier "^1.13.7"
"@ledgerhq/hw-app-btc@4.24.0", "@ledgerhq/hw-app-btc@^4.24.0": "@ledgerhq/hw-app-btc@^4.27.0":
version "4.24.0" version "4.27.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.24.0.tgz#8889b2bc9b9583209ed24f832c96ea8d23e1dc74" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.27.0.tgz#11fc822bd34a47a39b1a7ae03ced69cf1d432796"
integrity sha512-OEc8UCcdAWp10PPM9Keoh8imuusmNVe2o/89ujMT5UIWOGCu7duezpsnCY11jGNxf2hyos6lezUMlUAOHBuISQ== integrity sha512-7Ck48wCBb6nd9UXarNeGOsOqbOTi2cs4AxFhbDNrVLvPiBSH0yEiNQEF95J6u5BxKkAdM1GV9LoRumR4KhZGqQ==
dependencies: dependencies:
"@ledgerhq/hw-transport" "^4.24.0" "@ledgerhq/hw-transport" "^4.24.0"
create-hash "^1.1.3" create-hash "^1.1.3"
@ -1741,10 +1741,10 @@
dependencies: dependencies:
events "^3.0.0" events "^3.0.0"
"@ledgerhq/ledger-core@2.0.0-rc.8": "@ledgerhq/ledger-core@2.0.0-rc.10":
version "2.0.0-rc.8" version "2.0.0-rc.10"
resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.8.tgz#618ff2ca091464c71890678d3912921ee46f98af" resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.10.tgz#55b7261924df8ed5a33fcc51fdfafc8d6a323fc4"
integrity sha512-UYEwlw7+JfRCPw1z2kw9EGs88wsk5XBGxMPpNPF1cdpE7extEL63Gr+4h4ibU6kXEeEIpfI0lZ2l/6HwzMw6EQ== integrity sha512-PbT6y8lwpVfbD5DZIH8CsOZoipNSGHY7BVHNTS+55QsQ6wAPf7sztZjZ8fk6TM0SfdbdIr7Cc5bFQ6cgljTNIA==
dependencies: dependencies:
"@ledgerhq/hw-app-btc" "^4.7.3" "@ledgerhq/hw-app-btc" "^4.7.3"
"@ledgerhq/hw-transport-node-hid" "^4.7.6" "@ledgerhq/hw-transport-node-hid" "^4.7.6"

Loading…
Cancel
Save