From 62d603074bbd5c113a23b2c798c09759d632727c Mon Sep 17 00:00:00 2001 From: huiqi Date: Tue, 29 Mar 2022 15:30:00 +0200 Subject: [PATCH 1/2] add ETH goerli --- cli/src/live-common-setup-base.ts | 1 + src/api/explorerConfig/index.ts | 8 ++++++++ src/appSupportsQuitApp.ts | 1 + src/env.ts | 5 +++++ tools/src/live-common-setup.js | 1 + 5 files changed, 16 insertions(+) diff --git a/cli/src/live-common-setup-base.ts b/cli/src/live-common-setup-base.ts index 9e005bf009..3762925086 100644 --- a/cli/src/live-common-setup-base.ts +++ b/cli/src/live-common-setup-base.ts @@ -41,6 +41,7 @@ setSupportedCurrencies([ "stakenet", "bitcoin_testnet", "ethereum_ropsten", + "ethereum_goerli", "cosmos_testnet", "crypto_org", "crypto_org_croeseid", diff --git a/src/api/explorerConfig/index.ts b/src/api/explorerConfig/index.ts index 5616c797b2..103218b7ff 100644 --- 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 index b000f24e06..f101de34cb 100644 --- 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 index 78dc63ebaa..9b0d1f04a5 100644 --- a/src/env.ts +++ b/src/env.ts @@ -290,6 +290,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/tools/src/live-common-setup.js b/tools/src/live-common-setup.js index 8df84c2837..5f81cb614b 100644 --- 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", From e98ea1e444ef942b1e2a3f180de154451ac270ca Mon Sep 17 00:00:00 2001 From: huiqi Date: Wed, 30 Mar 2022 16:17:23 +0200 Subject: [PATCH 2/2] add goerli test --- package.json | 2 +- src/__tests__/test-helpers/setup.ts | 1 + src/mock/account.ts | 8 +++++++- yarn.lock | 9 ++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 539c5908dc..57bcc45307 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,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 index 5cb63b60fb..ab9c4cb828 100644 --- 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/mock/account.ts b/src/mock/account.ts index f5085d5f5e..c138ed2aef 100644 --- 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/yarn.lock b/yarn.lock index 6aa728edf2..77c3bcf3f8 100644 --- 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==