LedgerHQ · hedi-edelbloute · Sep 18, 2023 · Sep 5, 2023 · Sep 18, 2023 · Sep 18, 2023
diff --git a/.changeset/lemon-taxis-applaud.md b/.changeset/lemon-taxis-applaud.md
@@ -0,0 +1,11 @@
+---
+"@ledgerhq/types-cryptoassets": minor
+"@ledgerhq/cryptoassets": minor
+"@ledgerhq/types-live": minor
+"ledger-live-desktop": minor
+"live-mobile": minor
+"@ledgerhq/live-common": minor
+"@ledgerhq/live-cli": minor
+---
+
+Integrate injective + gas rework
@@ -87,6 +87,7 @@ setSupportedCurrencies([
   "stacks",
   "telos_evm",
   "coreum",
+  "injective",
 ]);
 
 for (const k in process.env) setEnvUnsafe(k as EnvName, process.env[k]);

@@ -1,6 +1,6 @@
 <!-- this file is generated by generate-cryptoassets-md.test.ts -->
 # Supported crypto assets
-## Crypto currencies (135)
+## Crypto currencies (136)
 | name | ticker | supported on Ledger Live? | ledger id |
 |--|--|--|--|
 | Algorand | ALGO | YES | algorand |
@@ -35,6 +35,7 @@
 | Flare | FLR | YES | flare |
 | Hedera | HBAR | YES | hedera |
 | Horizen | ZEN | YES | zencash |
+| Injective | INJ | YES | injective |
 | Internet Computer | ICP | YES | internet_computer |
 | Kava EVM | KAVA | YES | kava_evm |
 | Klaytn | KLAY | YES | klaytn |

@@ -81,4 +81,5 @@ setSupportedCurrencies([
   "stacks",
   "telos_evm",
   "coreum",
+  "injective",
 ]);
@@ -67,6 +67,7 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => {
   const baseGoerli = useFeature("currencyBaseGoerli");
   const klaytn = useFeature("currencyKlaytn");
   const mock = useEnv("MOCK");
+  const injective = useFeature("currencyInjective");
 
   const featureFlaggedCurrencies = useMemo(
     (): Partial<Record<CryptoCurrencyId, Feature<unknown> | null>> => ({
@@ -103,6 +104,7 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => {
       base,
       base_goerli: baseGoerli,
       klaytn,
+      injective,
     }),
     [
       axelar,
@@ -138,6 +140,7 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => {
       base,
       baseGoerli,
       klaytn,
+      injective,
     ],
   );
 

@@ -2,7 +2,7 @@ import React, { useCallback, memo } from "react";
 import { useHistory } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 import { accountsSelector } from "~/renderer/reducers/accounts";
-import styled, { CSSProperties } from "styled-components";
+import styled from "styled-components";
 import { Flex, Text, Icon } from "@ledgerhq/react-ui";
 import FormattedVal from "~/renderer/components/FormattedVal";
 import { setTrackingSource } from "~/renderer/analytics/TrackPage";
@@ -42,7 +42,7 @@ const EllipsisText = styled(Text)`
 type Props = {
   currency?: CurrencyData | null;
   counterCurrency?: string;
-  style: CSSProperties;
+  style: React.CSSProperties;
   loading: boolean;
   locale: string;
   isStarred: boolean;

diff --git a/apps/ledger-live-desktop/static/i18n/en/app.json b/apps/ledger-live-desktop/static/i18n/en/app.json
@@ -5338,6 +5338,10 @@
       "title": "Action rejected",
       "description": "User rejected the operation on the device"
     },
+    "ExpertModeRequired": {
+      "title": "Expert mode required",
+      "description": "Expert mode needs to be enabled."
+    },
     "TransactionRefusedOnDevice": {
       "title": "Operation denied on device",
       "description": "Please retry or contact Ledger Support if in doubt"

@@ -109,6 +109,7 @@ setSupportedCurrencies([
   "stacks",
   "telos_evm",
   "coreum",
+  "injective",
 ]);
 
 if (Config.VERBOSE) {

diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json
@@ -597,6 +597,10 @@
       "title": "Operation canceled on device",
       "description": "You rejected the operation on the device."
     },
+    "ExpertModeRequired": {
+      "title": "Expert mode required",
+      "description": "Expert mode needs to be enabled."
+    },
     "WebsocketConnectionError": {
       "title": "Sorry, connection failed",
       "description": "Please try again with a better network connection (websocket error)."

@@ -88,6 +88,7 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) {
   const baseGoerli = useFeature("currencyBaseGoerli");
   const klaytn = useFeature("currencyKlaytn");
   const mock = useEnv("MOCK");
+  const injective = useFeature("currencyInjective");
   const featureFlaggedCurrencies = useMemo(
     (): Partial<Record<CryptoCurrencyId, Feature<unknown> | null>> => ({
       axelar,
@@ -123,6 +124,7 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) {
       base,
       base_goerli: baseGoerli,
       klaytn,
+      injective,
     }),
     [
       axelar,
@@ -158,6 +160,7 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) {
       base,
       baseGoerli,
       klaytn,
+      injective,
     ],
   );
 

@@ -98,6 +98,8 @@
     "rxjs": "^6.6.7"
   },
   "devDependencies": {
+    "@ledgerhq/hw-transport-node-speculos": "workspace:^",
+    "@ledgerhq/hw-transport-node-speculos-http": "workspace:^",
     "@types/invariant": "^2.2.2",
     "@types/jest": "^29.2.4",
     "@types/lodash": "^4.14.191",

@@ -13,6 +13,10 @@ import {
 import { BigNumber } from "bignumber.js";
 import { SpeculosButton } from "./specs";
 
+import type SpeculosTransportHttp from "@ledgerhq/hw-transport-node-speculos-http";
+import type SpeculosTransportWebsocket from "@ledgerhq/hw-transport-node-speculos";
+export type SpeculosTransport = SpeculosTransportHttp | SpeculosTransportWebsocket;
+
 // Type coming from live-common/src/load/speculos.ts
 export type AppCandidate = {
   path: string;
@@ -147,6 +151,12 @@ export type AppSpec<T extends TransactionCommon> = {
   allowEmptyAccounts?: boolean;
   // do not keep operations in accounts (Cosmos family case)
   skipOperationHistory?: boolean;
+  // executed when speculos device is created, used for example to enable expert mode on cosmos nano app
+  onSpeculosDeviceCreated?: (device: {
+    transport: SpeculosTransport;
+    id: string;
+    appPath: string;
+  }) => Promise<void>;
 };
 export type SpecReport<T extends TransactionCommon> = {
   spec: AppSpec<T>;

@@ -78,7 +78,7 @@ const envDefinitions = {
     desc: "Node endpoint for celo",
   },
   COSMOS_GAS_AMPLIFIER: {
-    def: 1.2,
+    def: 1.5,
     parser: intParser,
     desc: "Cosmos gas estimate multiplier",
   },

diff --git a/libs/ledger-live-common/package.json b/libs/ledger-live-common/package.json
@@ -116,12 +116,9 @@
     "@celo/utils": "^3.0.1",
     "@celo/wallet-base": "^3.0.1",
     "@celo/wallet-ledger": "^3.0.1",
-    "@cosmjs/amino": "^0.28.4",
-    "@cosmjs/crypto": "^0.26.5",
-    "@cosmjs/launchpad": "^0.26.5",
-    "@cosmjs/ledger-amino": "^0.26.5",
-    "@cosmjs/proto-signing": "^0.26.5",
+    "@cosmjs/crypto": "^0.31.0",
     "@cosmjs/stargate": "^0.26.5",
+    "@cosmjs/amino": "^0.31.1",
     "@crypto-org-chain/chain-jslib": "1.1.2",
     "@dfinity/agent": "^0.15.6",
     "@dfinity/candid": "^0.15.6",
@@ -188,6 +185,7 @@
     "@xstate/react": "^1.6.3",
     "@zondax/cbor": "v8.1.0-zondax-no-bigint",
     "@zondax/izari-filecoin": "^1.2.0",
+    "@zondax/ledger-cosmos-js": "^3.0.3",
     "@zondax/ledger-filecoin": "^0.11.2",
     "@zondax/ledger-icp": "^0.7.0",
     "@zondax/ledger-stacks": "^1.0.2",

@@ -88,6 +88,7 @@ setSupportedCurrencies([
   "stacks",
   "telos_evm",
   "coreum",
+  "injective",
 ]);
 
 for (const k in process.env) setEnvUnsafe(k as EnvName, process.env[k]);

@@ -137,6 +137,9 @@ export async function runWithAppSpec<T extends Transaction>(
   try {
     device = await createSpeculosDevice(deviceParams);
     appReport.appPath = device.appPath;
+    if (spec.onSpeculosDeviceCreated) {
+      await spec.onSpeculosDeviceCreated(device);
+    }
     const bridge = getCurrencyBridge(currency);
     const syncConfig = {
       paginationConfig: {},
@@ -300,6 +303,9 @@ export async function runWithAppSpec<T extends Transaction>(
           );
           await releaseSpeculosDevice(device.id);
           device = await createSpeculosDevice(deviceParams);
+          if (spec.onSpeculosDeviceCreated) {
+            await spec.onSpeculosDeviceCreated(device);
+          }
         }
       }
       mutationsCount = {};

@@ -57,6 +57,10 @@ const defaultConfig = {
         lcd: "https://full-node.mainnet-1.coreum.dev:1317",
         minGasPrice: 0.1,
       },
+      injective: {
+        lcd: "https://injective-api.polkachu.com",
+        minGasPrice: 900000000,
+      },
     } as { [currency: string]: CosmosCurrencyConfig },
   },
 };

@@ -1404,6 +1404,7 @@ Array [
   "stride",
   "umee",
   "internet_computer",
+  "injective",
   "arbitrum",
   "cronos",
   "flare",

@@ -1,7 +1,9 @@
 import network from "@ledgerhq/live-network/network";
+import { AxiosResponse } from "axios";
 import BigNumber from "bignumber.js";
 import { CosmosAPI } from "./Cosmos";
 jest.mock("@ledgerhq/live-network/network");
+const mockedNetwork = jest.mocked(network);
 
 describe("CosmosApi", () => {
   let cosmosApi: CosmosAPI;
@@ -14,36 +16,89 @@ describe("CosmosApi", () => {
     jest.resetAllMocks();
   });
 
+  describe("getAccount", () => {
+    it("should return base_account if available", async () => {
+      mockedNetwork.mockResolvedValue({
+        data: {
+          account: {
+            account_number: 1,
+            sequence: 0,
+            pub_key: { key: "k", "@type": "type" },
+            base_account: {
+              account_number: 2,
+              sequence: 42,
+              pub_key: { key: "k2", "@type": "type2" },
+            },
+          },
+        },
+      } as AxiosResponse);
+
+      const account = await cosmosApi.getAccount("addr", "default");
+      expect(account.accountNumber).toEqual(2);
+      expect(account.sequence).toEqual(42);
+      expect(account.pubKey).toEqual("k2");
+      expect(account.pubKeyType).toEqual("type2");
+    });
+
+    it("should return account if base_account isn't available", async () => {
+      mockedNetwork.mockResolvedValue({
+        data: {
+          account: { account_number: 1, sequence: 0, pub_key: { key: "k", "@type": "type" } },
+        },
+      } as AxiosResponse);
+
+      const account = await cosmosApi.getAccount("addr", "default");
+      expect(account.accountNumber).toEqual(1);
+      expect(account.sequence).toEqual(0);
+      expect(account.pubKey).toEqual("k");
+      expect(account.pubKeyType).toEqual("type");
+    });
+
+    it("should return default sequence value if network fails", async () => {
+      mockedNetwork.mockImplementation(() => {
+        throw new Error();
+      });
+      const account = await cosmosApi.getAccount("addr", "default");
+      expect(account.sequence).toEqual(0);
+    });
+
+    it("should return default pubkeytype value if network fails", async () => {
+      mockedNetwork.mockImplementation(() => {
+        throw new Error();
+      });
+      const account = await cosmosApi.getAccount("addr", "default");
+      expect(account.pubKeyType).toEqual("default");
+    });
+  });
+
   describe("simulate", () => {
     it("should return gas used when the network call returns gas used", async () => {
-      // @ts-expect-error method is mocked
-      network.mockResolvedValue({
+      mockedNetwork.mockResolvedValue({
         data: {
           gas_info: {
             gas_used: 42000,
           },
         },
-      });
+      } as AxiosResponse);
       const gas = await cosmosApi.simulate([]);
       expect(gas).toEqual(new BigNumber(42000));
     });
 
     it("should throw an error when the network call does not return gas used", async () => {
-      // @ts-expect-error method is mocked
-      network.mockResolvedValue({
+      mockedNetwork.mockResolvedValue({
         data: { gas_info: {} },
-      });
+      } as AxiosResponse);
       await expect(cosmosApi.simulate([])).rejects.toThrowError();
     });
 
     it("should throw an error when the network call fails", async () => {
-      // @ts-expect-error method is mocked
-      network.mockImplementation(() => {
+      mockedNetwork.mockImplementation(() => {
         throw new Error();
       });
       await expect(cosmosApi.simulate([])).rejects.toThrowError();
     });
   });
+
   describe("getTransactions", () => {
     it("should return an empty array when network call fails", async () => {
       // @ts-expect-error method is mocked