@ledgerhq/coin-solana 0.30.0 → 0.31.0-nightly.0

package/src/network/validator-app/index.ts

@@ -1,4 +1,4 @@
-import network from "@ledgerhq/live-network/network";
+import network from "@ledgerhq/live-network";
 import { Cluster } from "@solana/web3.js";
 import { compact } from "lodash/fp";
 import { getEnv } from "@ledgerhq/live-env";
@@ -24,6 +24,13 @@ export type ValidatorsAppValidator = {
   name?: string | undefined;
   avatarUrl?: string | undefined;
   wwwUrl?: string | undefined;
+  apy?: number | undefined;
+};
+
+type ValidatorApyRaw = {
+  address: string;
+  delegator_apy: number;
+  name: string;
 };
 
 const URLS = {
@@ -36,18 +43,46 @@ const URLS = {
     const baseUrl = getEnv("SOLANA_VALIDATORS_APP_BASE_URL");
     return baseUrl;
   },
+  validatorApylist: getEnv("SOLANA_VALIDATORS_SUMMARY_BASE_URL"),
 };
 
+async function fetchFigmentApy(
+  cluster: Extract<Cluster, "mainnet-beta" | "testnet">,
+): Promise<Record<string, number>> {
+  if (cluster !== "mainnet-beta") return {};
+  try {
+    const response = await network({
+      method: "GET",
+      url: URLS.validatorApylist,
+    });
+
+    if (response.status === 200 && Array.isArray(response.data)) {
+      return response.data.reduce((acc: Record<string, number>, item: ValidatorApyRaw) => {
+        if (typeof item.address === "string" && typeof item.delegator_apy === "number") {
+          acc[item.address] = item.delegator_apy;
+        }
+        return acc;
+      }, {});
+    }
+  } catch (error) {
+    console.warn("Failed to fetch Figment APY", error);
+  }
+
+  return {};
+}
+
 export async function getValidators(
   cluster: Extract<Cluster, "mainnet-beta" | "testnet">,
 ): Promise<ValidatorsAppValidator[]> {
-  const response = await network({
-    method: "GET",
-    url: URLS.validatorList(cluster),
-  });
+  const [validatorsResponse, apyMap] = await Promise.all([
+    network({ method: "GET", url: URLS.validatorList(cluster) }),
+    fetchFigmentApy(cluster),
+  ]);
 
   const allRawValidators =
-    response.status === 200 ? (response.data as ValidatorsAppValidatorRaw[]) : [];
+    validatorsResponse.status === 200
+      ? (validatorsResponse.data as ValidatorsAppValidatorRaw[])
+      : [];
 
   // validators app data is not clean: random properties can randomly contain
   // data, null, undefined
@@ -69,6 +104,7 @@ export async function getValidators(
         name: validator.name ?? undefined,
         avatarUrl: validator.avatar_url ?? undefined,
         wwwUrl: validator.www_url ?? undefined,
+        apy: apyMap[validator.vote_account],
       };
     }
 

package/src/signOperation.test.ts

@@ -3,7 +3,7 @@ import { SolanaAddress } from "./signer";
 import { buildSignOperation } from "./signOperation";
 import { Account, Operation, OperationType, SignOperationEvent } from "@ledgerhq/types-live";
 import { ChainAPI } from "./network";
-import { DeviceModelId } from "@ledgerhq/devices/lib/index";
+import { DeviceModelId } from "@ledgerhq/devices";
 import { Transaction } from "./types";
 import { BlockhashWithExpiryBlockHeight, VersionedTransaction } from "@solana/web3.js";
 

package/src/utils.ts

@@ -19,9 +19,10 @@ export const LEDGER_VALIDATOR_BY_FIGMENT: ValidatorsAppValidator = {
   avatarUrl:
     "https://s3.amazonaws.com/keybase_processed_uploads/3c47b62f3d28ecfd821536f69be82905_360_360.jpg",
   wwwUrl: "https://www.ledger.com/staking",
-  activeStake: 9079057178046828,
+  activeStake: 8860644178046828,
   commission: 7,
   totalScore: 6,
+  apy: 0.078107,
 };
 
 export const LEDGER_VALIDATOR_BY_CHORUS_ONE: ValidatorsAppValidator = {
@@ -30,9 +31,10 @@ export const LEDGER_VALIDATOR_BY_CHORUS_ONE: ValidatorsAppValidator = {
   avatarUrl:
     "https://s3.amazonaws.com/keybase_processed_uploads/3c47b62f3d28ecfd821536f69be82905_360_360.jpg",
   wwwUrl: "https://www.ledger.com/staking",
-  activeStake: 10001001000098,
+  activeStake: 110738001000098,
   commission: 7,
   totalScore: 7,
+  apy: 0.07228,
 };
 
 export const LEDGER_VALIDATOR_DEFAULT = LEDGER_VALIDATOR_BY_FIGMENT;