Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4931 from LedgerHQ/hotfix/2.40.3
Browse files Browse the repository at this point in the history
hotfix bump live-common to solve disconnect issue
  • Loading branch information
lambertkevin authored Apr 20, 2022
2 parents 279955f + 3884f0c commit 369f03b
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "MIT",
"private": true,
"main": "./.webpack/main.bundle.js",
"version": "2.40.2",
"version": "2.40.4",
"scripts": {
"start:prod": "electron ./.webpack/main.bundle.js",
"start": "cross-env NODE_ENV=development node ./tools/main.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@ledgerhq/hw-transport-http": "6.26.0",
"@ledgerhq/hw-transport-node-hid-singleton": "6.26.0",
"@ledgerhq/ledger-core": "6.14.5",
"@ledgerhq/live-common": "21.35.0",
"@ledgerhq/live-common": "21.35.1",
"@ledgerhq/logs": "6.10.0",
"@ledgerhq/react-ui": "^0.7.4",
"@open-wc/webpack-import-meta-loader": "^0.4.7",
Expand Down
46 changes: 36 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2739,13 +2739,20 @@
dependencies:
commander "^2.20.0"

"@ledgerhq/[email protected]", "@ledgerhq/cryptoassets@^6.26.1":
"@ledgerhq/[email protected]":
version "6.26.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-6.26.1.tgz#de810a62199913aeaf36e52b0f826cc0d7289e1e"
integrity sha512-p8DG+E7KO32O0gZc1Q9bBMzKc8c0jMwAO3X7Xn7DV8DvYwMd2WjjrPreBsQdEvm9ku4iz6AUXbLRWI/xwxE5sA==
dependencies:
invariant "2"

"@ledgerhq/cryptoassets@^6.26.1":
version "6.27.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-6.27.1.tgz#870d665013c3ba36db4272888f427590f441ec31"
integrity sha512-kUsCATnxurYuAQ4dGBgaw+eUOGlX9IZvDPQlElrvb8/Kd2p6U5scpl5RX/YFnjkjGNmE4BhQioUslQGpNa3sZQ==
dependencies:
invariant "2"

"@ledgerhq/[email protected]", "@ledgerhq/devices@^6.24.1":
version "6.24.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-6.24.1.tgz#9696d7831aa1a1a8204cdfa55df13f892b7da162"
Expand All @@ -2766,6 +2773,16 @@
rxjs "6"
semver "^7.3.5"

"@ledgerhq/devices@^6.27.1":
version "6.27.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-6.27.1.tgz#3b13ab1d1ba8201e9e74a08f390560483978c962"
integrity sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==
dependencies:
"@ledgerhq/errors" "^6.10.0"
"@ledgerhq/logs" "^6.10.0"
rxjs "6"
semver "^7.3.5"

"@ledgerhq/electron-updater@^4.2.2":
version "4.2.2"
resolved "https://registry.npmjs.org/@ledgerhq/electron-updater/-/electron-updater-4.2.2.tgz"
Expand Down Expand Up @@ -2860,12 +2877,12 @@
bip32-path "^0.4.2"

"@ledgerhq/hw-app-solana@^6.26.0":
version "6.26.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-solana/-/hw-app-solana-6.26.0.tgz#0233066abc6c3a6345ae97696e22ac40c1d29a2f"
integrity sha512-Hdm9hJFb1lcwBW4ocygJ1SjcNKMRRQ7+YQ0hkIUintcMT4ayKRSOzCLSCjqr3VQJ+A4xTHYoXC33bD+qCYG5kA==
version "6.27.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-solana/-/hw-app-solana-6.27.1.tgz#9df40918f4175b597bf7f144732615da076f6375"
integrity sha512-mibdrbqW8cnu+cWBpdsfbVM0GOn5sundzlVyQ9Aydddkr45NtnjHsz7Yf+/S3idLxXRE64Kat1Jkb0XYnXPHwA==
dependencies:
"@ledgerhq/errors" "^6.10.0"
"@ledgerhq/hw-transport" "^6.24.1"
"@ledgerhq/hw-transport" "^6.27.1"
"@ledgerhq/logs" "^6.10.0"
bip32-path "^0.4.2"

Expand Down Expand Up @@ -2977,6 +2994,15 @@
"@ledgerhq/errors" "^5.50.0"
events "^3.3.0"

"@ledgerhq/hw-transport@^6.27.1":
version "6.27.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.27.1.tgz#88072278f69c279cb6569352acd4ae2fec33ace3"
integrity sha512-hnE4/Fq1YzQI4PA1W0H8tCkI99R3UWDb3pJeZd6/Xs4Qw/q1uiQO+vNLC6KIPPhK0IajUfuI/P2jk0qWcMsuAQ==
dependencies:
"@ledgerhq/devices" "^6.27.1"
"@ledgerhq/errors" "^6.10.0"
events "^3.3.0"

"@ledgerhq/hw-transport@~5.11.0":
version "5.11.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.11.0.tgz#f5c45a34d9b68d81fd2f6641b49815527720364b"
Expand Down Expand Up @@ -3020,10 +3046,10 @@
bignumber.js "^9.0.1"
json-rpc-2.0 "^0.2.16"

"@ledgerhq/[email protected].0":
version "21.35.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-21.35.0.tgz#e724b342472779737e93cc052420159c0771250b"
integrity sha512-GUiOZXDN7K4OhNyCo4IgJAM0UNLj5eZEEteiDoxls0WpuHWV5/YtNJH183ra4nB8MYhyKvHXEGCjFvVPvIUoyA==
"@ledgerhq/[email protected].1":
version "21.35.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-21.35.1.tgz#71c5ed4dc7c1ef1a396364a2f8f7a64e98169ca1"
integrity sha512-6ZB3mMPg2C/mZA9RjnCR44J2ix1BJEDBApoEpfCW6CDLfzxbT/kOkBAokzig0uKnoXsQ5NLdYviAlgp7wwI8Kw==
dependencies:
"@celo/contractkit" "^1.5.2"
"@celo/wallet-base" "^1.5.2"
Expand Down Expand Up @@ -12627,7 +12653,7 @@ inherits@2, [email protected], inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, i

[email protected], inherits@=2.0.1:
version "2.0.1"
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=

[email protected]:
Expand Down

1 comment on commit 369f03b

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint outputs ✅

Tests outputs ✅

Browserslist: caniuse-lite is outdated. Please run:
npx browserslist@latest --update-db
Why you should do it regularly: https://github.com/browserslist/browserslist#browsers-data-updating
PASS src/generate-cryptoassets-md.test.js

Test Suites: 1 skipped, 1 passed, 1 of 2 total
Tests: 5 skipped, 1 passed, 6 total
Snapshots: 0 total
Time: 3.299 s
Test results written to: report.json

Diff output ❌

windows

Actual Diff Expected

| confirm-exchange-actual | confirm-exchange-diff | confirm-exchange-expected |
| confirm-exchange-actual | confirm-exchange-diff | confirm-exchange-expected |

Please sign in to comment.