Merge origin/main and resolve conflicts

Author: dev-dist

.github/scripts/data/baseline.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2025-11-23T21:03:30Z",
+  "timestamp": "2025-11-30T21:03:22Z",
   "knownIds": [
   "aptos-apt-usd",
   "aptos-btc-usd",
@@ -185,6 +185,7 @@
   "arbitrum-eth-usd",
   "arbitrum-eth-usd-marketcap",
   "arbitrum-eth-usd-premium-prod",
+  "arbitrum-eth-usd-svr",
   "arbitrum-ethfi-usd-premium-prod",
   "arbitrum-ethx-eth-exchange-rate",
   "arbitrum-eur-usd",
@@ -365,6 +366,8 @@
   "arbitrum-mnt-usd",
   "arbitrum-mnt-usd-refprice-mainnet-production",
   "arbitrum-mog-usd-premium-prod-v03",
+  "arbitrum-mon-usd",
+  "arbitrum-mon-usd-streams-cexprice-mainnet-production",
   "arbitrum-moodeng-usd-premium-prod-v03",
   "arbitrum-morpho-usd-refprice-mainnet-production",
   "arbitrum-mplx-usd-streams-cexprice-mainnet-production",
@@ -1499,6 +1502,7 @@
   "linea-linea-usd",
   "linea-link-eth",
   "linea-link-usd",
+  "linea-m-nav-linea",
   "linea-matic-usd",
   "linea-musd-usd",
   "linea-oseth-eth-exchange-rate",
@@ -1512,6 +1516,7 @@
   "linea-rseth-eth",
   "linea-rsweth-eth-exchange-rate",
   "linea-savbtc-avbtc-exchange-rate",
+  "linea-saveth-aveth-exchange-rate",
   "linea-savusd-avusd-exchange-rate",
   "linea-ultraeths-eth-exchange-rate",
   "linea-usd1-usd",

.github/workflows/test.yml

@@ -8,6 +8,7 @@ concurrency:
 
 env:
   FOUNDRY_PROFILE: ci
+  NODE_VERSION: '22'
 
 # Set default permissions as restrictive as possible
 permissions:
@@ -26,7 +27,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -55,7 +56,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -102,7 +103,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -141,7 +142,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -173,7 +174,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -205,19 +206,15 @@ jobs:
   jest:
     needs: [setup]
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-      fail-fast: false
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v6
 
-      - name: Setup Node.js ${{ matrix.node-version }}
+      - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -242,6 +239,6 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v5
         with:
-          name: coverage-report-node-${{ matrix.node-version }}
+          name: coverage-report-node-${{ env.NODE_VERSION }}
           path: coverage/
           retention-days: 30

jest.config.cjs

@@ -13,6 +13,7 @@ module.exports = {
   extensionsToTreatAsEsm: [".ts", ".tsx"],
   moduleFileExtensions: ["js", "jsx", "ts", "tsx", "json", "node"],
   moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
     "\\.(css)$": "<rootDir>/src/__mocks__/styleMock.ts",
     "^~/(.*)$": "<rootDir>/src/$1",
     "^@api/(.*)$": "<rootDir>/src/pages/api/$1",
@@ -29,6 +30,7 @@ module.exports = {
     "^@variables$": "<rootDir>/src/config/markdown-variables.ts",
     "^@abi$": "<rootDir>/src/features/abi/index.ts",
     "^@lib$": "<rootDir>/src/lib/index.ts",
+    "^@lib/(.*)\\.js$": "<rootDir>/src/lib/$1",
     "^@lib/(.*)$": "<rootDir>/src/lib/$1",
     "\\.ya?ml$": "<rootDir>/src/__mocks__/yamlMock.ts",
   },