Merge branch 'main' into feat/conformance-reports-temp

Author: alexcambose

.github/workflows/ci-turbo-build.yml

@@ -26,10 +26,17 @@ jobs:
       # precompiled binary isn't found.
       - name: Install libusb
         run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev
+      # Install Foundry for Ethereum contract builds
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: v0.3.0
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
           run_install: true
+      - name: Install Forge dependencies
+        run: cd target_chains/ethereum/contracts && pnpm run install-forge-deps
       - name: Cache for Turbo
         uses: rharkor/[email protected]
       - name: Build

.github/workflows/ci-turbo-test.yml

@@ -17,6 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - uses: actions/setup-node@v4
         with:
           node-version-file: "package.json"
@@ -25,10 +26,17 @@ jobs:
       # precompiled binary isn't found.
       - name: Install libusb
         run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev
+      # Install Foundry for Ethereum contract tests
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: v0.3.0
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
           run_install: true
+      - name: Install Forge dependencies
+        run: cd target_chains/ethereum/contracts && pnpm run install-forge-deps
       - name: Cache for Turbo
         uses: rharkor/[email protected]
       - name: Test

.github/workflows/publish-js.yml

@@ -9,7 +9,8 @@ jobs:
     name: Publish Javascript Packages to NPM
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - uses: actions/setup-node@v4
         with:
           node-version-file: "package.json"
@@ -18,10 +19,17 @@ jobs:
       # precompiled binary isn't found.
       - name: Install libusb
         run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev
+      # Install Foundry for Ethereum contract builds
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: v0.3.0
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
           run_install: true
+      - name: Install Forge dependencies
+        run: cd target_chains/ethereum/contracts && pnpm run install-forge-deps
       - name: Set publishing config
         run: pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
         env:

Cargo.lock

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/developer-hub/next-env.d.ts

@@ -9,22 +9,24 @@ const transformer = {
   deserialize: parse,
 };
 
-export const DEFAULT_CACHE_TTL = 3600; // 1 hour
-export const DEFAULT_CACHE_STALE = 86_400; // 24 hours
+/**
+ * - API routes will be cached for 1 hour
+ * - Cached function will be cached for 10 minutes,
+ * If the function is called within 1 hour, it will
+ * still be served from the cache, but also fetch the latest data
+ */
+export const DEFAULT_NEXT_FETCH_TTL = 3600; // 1 hour
+export const DEFAULT_REDIS_CACHE_TTL = 60 * 10; // 10 minutes
+export const DEFAULT_REDIS_CACHE_STALE = 3600; // 1 hour
 
 export const redisCache: ACDCache = createCache({
   transformer,
-  stale: DEFAULT_CACHE_STALE,
-  ttl: DEFAULT_CACHE_TTL,
+  stale: DEFAULT_REDIS_CACHE_STALE,
+  ttl: DEFAULT_REDIS_CACHE_TTL,
   storage: {
     type: "redis",
     options: {
       client: getRedis(),
     },
   },
 });
-
-export const memoryOnlyCache: ACDCache = createCache({
-  ttl: DEFAULT_CACHE_TTL,
-  stale: DEFAULT_CACHE_STALE,
-});

apps/insights/src/cache.ts

@@ -42,4 +42,9 @@
     background: theme.pallette-color("emerald", 300);
     fill: theme.pallette-color("stone", 700);
   }
+
+  &[data-asset-class="ECO"] {
+    background: theme.pallette-color("sky", 200);
+    fill: theme.pallette-color("sky", 800);
+  }
 }

apps/insights/src/components/PriceFeedIcon/eco.svg

@@ -4,6 +4,7 @@ import Commodities from "./commodities.svg";
 import CryptoIndex from "./crypto-index.svg";
 import CryptoRedemptionRate from "./crypto-redemption-rate.svg";
 import Crypto from "./crypto.svg";
+import Eco from "./eco.svg";
 import Equity from "./equity.svg";
 import Fx from "./fx.svg";
 import { icons } from "./icons";
@@ -19,19 +20,25 @@ type Props = Omit<SVGProps, keyof OwnProps | "width" | "height" | "viewBox"> &
   OwnProps;
 
 export const PriceFeedIcon = ({ assetClass, symbol, ...props }: Props) => {
-  if (assetClass === "Crypto") {
-    const firstPart = symbol.split(".")[1]?.split("/")[0];
-    const Icon = firstPart ? (icons as SVGRecord)[firstPart] : undefined;
-    return Icon ? (
-      <Icon width="100%" height="100%" viewBox="0 0 32 32" {...props} />
-    ) : (
-      <GenericIcon assetClass="Crypto" {...props} />
-    );
-  } else {
-    return assetClassHasIcon(assetClass) ? (
-      <GenericIcon assetClass={assetClass} {...props} />
-    ) : // eslint-disable-next-line unicorn/no-null
-    null;
+  switch (assetClass) {
+    case "Crypto": {
+      const firstPart = symbol.split(".")[1]?.split("/")[0];
+      const Icon = firstPart ? (icons as SVGRecord)[firstPart] : undefined;
+      return Icon ? (
+        <Icon width="100%" height="100%" viewBox="0 0 32 32" {...props} />
+      ) : (
+        <GenericIcon assetClass="Crypto" {...props} />
+      );
+    }
+    case "Crypto NAV": {
+      return <GenericIcon assetClass="Crypto" {...props} />;
+    }
+    default: {
+      return assetClassHasIcon(assetClass) ? (
+        <GenericIcon assetClass={assetClass} {...props} />
+      ) : // eslint-disable-next-line unicorn/no-null
+      null;
+    }
   }
 };
 
@@ -64,6 +71,7 @@ const ASSET_CLASS_TO_ICON = {
   "Crypto Index": CryptoIndex,
   "Crypto Redemption Rate": CryptoRedemptionRate,
   Crypto,
+  ECO: Eco,
   Equity,
   FX: Fx,
   Metal,

apps/insights/src/components/PriceFeedIcon/index.module.scss

@@ -1,7 +1,7 @@
 import { parse } from "superjson";
 import { z } from "zod";
 
-import { DEFAULT_CACHE_TTL } from "../cache";
+import { DEFAULT_NEXT_FETCH_TTL } from "../cache";
 import { VERCEL_REQUEST_HEADERS } from "../config/server";
 import { getHost } from "../get-host";
 import { priceFeedsSchema } from "../schemas/pyth/price-feeds-schema";
@@ -19,7 +19,7 @@ export async function getPublishersForFeedRequest(
 
   const data = await fetch(url, {
     next: {
-      revalidate: DEFAULT_CACHE_TTL,
+      revalidate: DEFAULT_NEXT_FETCH_TTL,
     },
     headers: VERCEL_REQUEST_HEADERS,
   });
@@ -39,7 +39,7 @@ export async function getFeedsForPublisherRequest(
 
   const data = await fetch(url, {
     next: {
-      revalidate: DEFAULT_CACHE_TTL,
+      revalidate: DEFAULT_NEXT_FETCH_TTL,
     },
     headers: VERCEL_REQUEST_HEADERS,
   });
@@ -55,7 +55,7 @@ export const getFeedsRequest = async (cluster: Cluster) => {
 
   const data = await fetch(url, {
     next: {
-      revalidate: DEFAULT_CACHE_TTL,
+      revalidate: DEFAULT_NEXT_FETCH_TTL,
     },
     headers: VERCEL_REQUEST_HEADERS,
   });
@@ -83,7 +83,7 @@ export const getFeedForSymbolRequest = async ({
 
   const data = await fetch(url, {
     next: {
-      revalidate: DEFAULT_CACHE_TTL,
+      revalidate: DEFAULT_NEXT_FETCH_TTL,
     },
     headers: VERCEL_REQUEST_HEADERS,
   });
@@ -94,5 +94,7 @@ export const getFeedForSymbolRequest = async ({
 
   const rawData = await data.text();
   const parsedData = parse(rawData);
-  return priceFeedsSchema.element.parse(parsedData);
+  return parsedData === undefined
+    ? undefined
+    : priceFeedsSchema.element.parse(parsedData);
 };