Merge branch 'main' into feat/dynamic-jito-tips

Author: guibescos

.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.18.0

.tool-versions

@@ -1,4 +1,4 @@
-nodejs 20.17.0
-pnpm 9.12.1
+nodejs 20.18.0
+pnpm 9.12.3
 rust 1.78.0
 python 3.12.4

Dockerfile.node

@@ -1,4 +1,4 @@
-FROM node:20.17.0-slim@sha256:2394e403d45a644e41ac2a15b6f843a7d4a99ad24be48c27982c5fdc61a1ef17 as builder-base
+FROM node:20.18.0-slim@sha256:ec35a66c9a0a275b027debde05247c081f8b2f0c43d7399d3a6ad5660cee2f6a as builder-base
 WORKDIR /usr/src/pyth
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
@@ -7,7 +7,7 @@ COPY ./ .
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 
 
-FROM node:20.17.0-alpine@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 as runner-base
+FROM node:20.18.0-alpine3.20@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 as runner-base
 WORKDIR /srv
 ENV NODE_ENV production
 RUN addgroup --system --gid 1001 pyth && adduser --system --uid 1001 pyth -g pyth && chown pyth:pyth .

apps/hermes/client/js/package.json

@@ -26,7 +26,7 @@
     "example": "node lib/examples/HermesClient.js",
     "format": "prettier --write \"src/**/*.ts\"",
     "test:lint": "eslint src/",
-    "prepublishOnly": "pnpm run build && pnpm run test:lint",
+    "prepublishOnly": "pnpm run build:typescript && pnpm run test:lint",
     "preversion": "pnpm run test:lint",
     "version": "pnpm run format && git add -A src"
   },

apps/hermes/server/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name        = "hermes"
-version     = "0.7.1"
+version     = "0.7.2"
 description = "Hermes is an agent that provides Verified Prices from the Pythnet Pyth Oracle."
 edition     = "2021"
 

apps/hermes/server/Cargo.toml

@@ -326,17 +326,71 @@ pub struct PriceFeedMetadata {
 }
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, ToSchema)]
-#[serde(rename_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
 pub enum AssetType {
     Crypto,
+    #[serde(rename = "fx")]
     FX,
     Equity,
-    Metals,
+    Metal,
     Rates,
+    CryptoRedemptionRate,
 }
 
 impl Display for AssetType {
     fn fmt(&self, f: &mut Formatter) -> FmtResult {
-        write!(f, "{:?}", self)
+        match self {
+            AssetType::Crypto => write!(f, "crypto"),
+            AssetType::FX => write!(f, "fx"),
+            AssetType::Equity => write!(f, "equity"),
+            AssetType::Metal => write!(f, "metal"),
+            AssetType::Rates => write!(f, "rates"),
+            AssetType::CryptoRedemptionRate => write!(f, "crypto_redemption_rate"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_serialize_matches_display() {
+        assert_eq!(
+            AssetType::Crypto.to_string(),
+            serde_json::to_string(&AssetType::Crypto)
+                .unwrap()
+                .trim_matches('"')
+        );
+        assert_eq!(
+            AssetType::FX.to_string(),
+            serde_json::to_string(&AssetType::FX)
+                .unwrap()
+                .trim_matches('"')
+        );
+        assert_eq!(
+            AssetType::Equity.to_string(),
+            serde_json::to_string(&AssetType::Equity)
+                .unwrap()
+                .trim_matches('"')
+        );
+        assert_eq!(
+            AssetType::Metal.to_string(),
+            serde_json::to_string(&AssetType::Metal)
+                .unwrap()
+                .trim_matches('"')
+        );
+        assert_eq!(
+            AssetType::Rates.to_string(),
+            serde_json::to_string(&AssetType::Rates)
+                .unwrap()
+                .trim_matches('"')
+        );
+        assert_eq!(
+            AssetType::CryptoRedemptionRate.to_string(),
+            serde_json::to_string(&AssetType::CryptoRedemptionRate)
+                .unwrap()
+                .trim_matches('"')
+        );
     }
 }

apps/hermes/server/src/api/types.rs

@@ -83,7 +83,8 @@ where
         if let Some(asset_type) = &asset_type {
             price_feeds_metadata.retain(|feed| {
                 feed.attributes.get("asset_type").map_or(false, |type_str| {
-                    type_str.to_lowercase() == asset_type.to_string().to_lowercase()
+                    type_str.to_lowercase().trim().replace(" ", "_")
+                        == asset_type.to_string().to_lowercase()
                 })
             });
         }

apps/hermes/server/src/state/price_feeds_metadata.rs

@@ -10,21 +10,35 @@
     "build": "next build",
     "fix:format": "prettier --write .",
     "fix:lint": "eslint --fix .",
+    "pull:env": "[ $CI ] || VERCEL_ORG_ID=team_BKQrg3JJFLxZyTqpuYtIY0rj VERCEL_PROJECT_ID=prj_TBkf9EyQjQF37gs4Vk0sQKJj97kE vercel env pull",
     "start:dev": "next dev --port 3003",
     "start:prod": "next start --port 3003",
     "test:format": "prettier --check .",
     "test:lint": "jest --selectProjects lint",
     "test:types": "tsc"
   },
   "dependencies": {
+    "@clickhouse/client": "catalog:",
+    "@phosphor-icons/react": "catalog:",
     "@pythnetwork/app-logger": "workspace:*",
+    "@pythnetwork/client": "catalog:",
     "@pythnetwork/component-library": "workspace:*",
     "@pythnetwork/fonts": "workspace:*",
+    "@pythnetwork/known-publishers": "workspace:*",
     "@pythnetwork/next-root": "workspace:*",
+    "@react-hookz/web": "catalog:",
+    "@solana/web3.js": "catalog:",
     "clsx": "catalog:",
+    "cryptocurrency-icons": "catalog:",
+    "framer-motion": "catalog:",
     "next": "catalog:",
+    "next-themes": "catalog:",
+    "nuqs": "catalog:",
     "react": "catalog:",
-    "react-dom": "catalog:"
+    "react-aria": "catalog:",
+    "react-aria-components": "catalog:",
+    "react-dom": "catalog:",
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@cprussin/eslint-config": "catalog:",

apps/insights/package.json

@@ -0,0 +1 @@
+export { Loading as default } from "../components/Loading";