Add ETH goerli (#1841)

* add ETH goerli * add goerli test
LedgerHQ · Apr 5, 2022 · ada45f5 · ada45f5
1 parent 459d928
commit ada45f5
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 3 deletions.
diff --git a/cli/src/live-common-setup-base.ts b/cli/src/live-common-setup-base.ts
@@ -40,6 +40,7 @@ setSupportedCurrencies([
   "stakenet",
   "bitcoin_testnet",
   "ethereum_ropsten",
+  "ethereum_goerli",
   "cosmos_testnet",
   "crypto_org",
   "crypto_org_croeseid",

diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "@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",

diff --git a/src/__tests__/test-helpers/setup.ts b/src/__tests__/test-helpers/setup.ts
@@ -51,6 +51,7 @@ setSupportedCurrencies([
   "polkadot",
   "bitcoin_testnet",
   "ethereum_ropsten",
+  "ethereum_goerli",
   "cosmos_testnet",
   "crypto_org_croeseid",
   "crypto_org",

diff --git a/src/api/explorerConfig/index.ts b/src/api/explorerConfig/index.ts
@@ -189,6 +189,14 @@ const initialExplorerConfig: FullConfig = {
       version: "v3",
     },
   },
+  ethereum_goerli: {
+    id: "eth_goerli",
+    stable: {
+      base: "EXPLORER_STAGING",
+      version: "v3",
+    },
+  },
+
   ethereum_classic: {
     id: "etc",
     stable: {

diff --git a/src/appSupportsQuitApp.ts b/src/appSupportsQuitApp.ts
@@ -43,6 +43,7 @@ export const minAppVersion = {
   Eos: "1.3.1",
   "Eth Recovery": "0.0.0",
   "Eth Ropsten": "1.6.0",
+  "Eth Goerli": "1.9.11",
   "Ether-1": "1.4.0",
   EtherGem: "1.4.0",
   Ethereum: "1.4.0",

diff --git a/src/env.ts b/src/env.ts
@@ -280,6 +280,11 @@ const envDefinitions = {
     parser: stringParser,
     desc: "Ledger generic explorer API",
   },
+  EXPLORER_STAGING: {
+    def: "https://explorers.api-01.live.ledger-stg.com",
+    parser: stringParser,
+    desc: "Ledger staging explorer API",
+  },
   EXPLORER_BETA: {
     def: "https://explorers.api.live.ledger.com",
     parser: stringParser,

diff --git a/src/mock/account.ts b/src/mock/account.ts
@@ -397,7 +397,13 @@ export function genAccount(
   };
 
   if (
-    ["ethereum", "ethereum_ropsten", "tron", "algorand"].includes(currency.id)
+    [
+      "ethereum",
+      "ethereum_ropsten",
+      "ethereum_goerli",
+      "tron",
+      "algorand",
+    ].includes(currency.id)
   ) {
     const tokenCount =
       typeof opts.subAccountsCount === "number"

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

diff --git a/yarn.lock b/yarn.lock
@@ -1343,7 +1343,14 @@
   dependencies:
     commander "^2.20.0"
 
-"@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==