revert the revert of cli and remove goerli

LedgerHQ · Apr 21, 2022 · 976dd73 · 976dd73
1 parent 430afc5
commit 976dd73
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -34,7 +34,7 @@
     "@ledgerhq/hw-transport-mocker": "6.24.1",
     "@ledgerhq/hw-transport-node-hid": "6.24.1",
     "@ledgerhq/hw-transport-node-speculos": "6.24.1",
-    "@ledgerhq/live-common": "21.34.0",
+    "@ledgerhq/live-common": "22.0.0",
     "@ledgerhq/logs": "6.10.0",
     "@walletconnect/client": "^1.7.1",
     "asciichart": "^1.5.25",

diff --git a/cli/yarn.lock b/cli/yarn.lock
@@ -827,7 +827,14 @@
   dependencies:
     invariant "2"
 
-"@ledgerhq/cryptoassets@6.27.0", "@ledgerhq/cryptoassets@^6.27.0":
+"@ledgerhq/cryptoassets@6.28.0":
+  version "6.28.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-6.28.0.tgz#218a41c5184a176ceb3ec16dc21b37589f673c08"
+  integrity sha512-j3fBnjsOi2qijWO7p/PNoiEHdzjxP849pO02Q4YWW4Ms4lByv7ysmNLMwrset91We2yyVrdHsjdWY8X5JE97qQ==
+  dependencies:
+    invariant "2"
+
+"@ledgerhq/cryptoassets@^6.27.0":
   version "6.27.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-6.27.0.tgz#1a4efdef07858e8cb1b2dd4c1b9e110f1ed60f3f"
   integrity sha512-fM1tm+xJSkbgEB73RtWeTeogcWRkpAcgZX+hBGbvq7anhbRwF2jD4EL897SRNwDuvCKFfpSMxpSUaSvEmj9Lcw==
@@ -1087,19 +1094,24 @@
   dependencies:
     bignumber.js "^9.0.1"
     json-rpc-2.0 "^0.2.16"
-
-"@ledgerhq/live-common@https://github.com/LedgerHQ/ledger-live-common.git#31177aae3a559e17f8452ed8dc6e010cd1d6f41e":
-  version "21.32.4"
-  resolved "https://github.com/LedgerHQ/ledger-live-common.git#31177aae3a559e17f8452ed8dc6e010cd1d6f41e"
-  dependencies:
-    "@celo/contractkit" "^1.5.1"
-    "@celo/wallet-base" "^1.5.1"
-    "@celo/wallet-ledger" "^1.5.1"
+
+"@ledgerhq/live-common@22.0.0":
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-22.0.0.tgz#2717701fc8ba63b4befdd3cb1400527c2922335f"
+  integrity sha512-BUMgPMWmavlFip0LwMVzr+TABG1o77nLZepGSmxZWIcyLUvsmRRDtCEasVJCW60g0Cd0BhvbtUOo8l0NdDZ+/A==
+  dependencies:
+    "@celo/contractkit" "^1.5.2"
+    "@celo/wallet-base" "^1.5.2"
+    "@celo/wallet-ledger" "^1.5.2"
+    "@cosmjs/crypto" "^0.26.5"
+    "@cosmjs/ledger-amino" "^0.26.5"
+    "@cosmjs/proto-signing" "^0.26.5"
+    "@cosmjs/stargate" "^0.26.5"
     "@crypto-com/chain-jslib" "0.0.19"
     "@ethereumjs/common" "^2.6.2"
     "@ethereumjs/tx" "^3.5.0"
     "@ledgerhq/compressjs" "1.3.2"
-    "@ledgerhq/cryptoassets" "6.27.0"
+    "@ledgerhq/cryptoassets" "6.28.0"
     "@ledgerhq/devices" "6.24.1"
     "@ledgerhq/errors" "6.10.0"
     "@ledgerhq/hw-app-algorand" "6.24.1"
@@ -1178,6 +1190,7 @@
     semver "^7.3.5"
     sha.js "^2.4.11"
     stellar-sdk "^10.0.1"
+    superstruct "^0.14.2"
     triple-beam "^1.3.0"
     winston "^3.4.0"
     xstate "^4.28.1"

diff --git a/tools/package.json b/tools/package.json
@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ledgerhq/cryptoassets": "6.8.1",
     "@ledgerhq/hw-transport": "^6.7.0",
     "@ledgerhq/hw-transport-http": "^6.7.0",
     "@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
@@ -37,7 +36,7 @@
     "webpack": "4.42"
   },
   "scripts": {
-    "start": "HTTS=true react-app-rewired start",
+    "start": "react-app-rewired start",
     "build": "react-app-rewired build && cp build/index.html build/200.html && cp build/index.html build/404.html",
     "test": "react-app-rewired test --env=jsdom",
     "eject": "react-app-rewired eject"

diff --git a/tools/src/live-common-setup.js b/tools/src/live-common-setup.js
@@ -48,7 +48,6 @@ setSupportedCurrencies([
   "decred",
   "bitcoin_testnet",
   "ethereum_ropsten",
-  "ethereum_goerli",
   "tron",
   "stellar",
   "filecoin",