diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8640359..1c8b057 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,5 +13,3 @@
 
 # Operational scripts
 /scripts/safe-update.ts @metanallok
-/scripts/backfill.ts @metanallok
-/scripts/backfillV06.ts @metanallok
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..431ef39
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      # Never let CI touch the production alert relay or a real RPC.
+      ALERT_WEBHOOK_URL: ""
+      NODE_ENV: test
+
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+
+      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
+        with:
+          bun-version: 1.3.14
+
+      # bunfig.toml registers the Socket security scanner, so this install also
+      # scans all direct + transitive deps and fails on malicious packages.
+      - name: Install dependencies (frozen lockfile + Socket scan)
+        run: bun install --frozen-lockfile
+
+      - name: Typecheck
+        run: bun run typecheck
+
+      - name: Test
+        run: bun test
+
+      - name: Phantom dependency check
+        run: bun run deps:check
diff --git a/AGENTS.md b/AGENTS.md
index 13f346c..7a8be25 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -12,23 +12,25 @@
 - **`bun test`** - Run all tests
 - **`bun run <script>`** - Run any script from package.json
 
-### Backfill Commands
-- **`bun run backfill`** - Run full backfill
-- **`bun run backfill:daily`** - Backfill daily data
-- **`bun run backfill:hourly`** - Backfill hourly data
-- **`bun run backfill:ten-minute`** - Backfill 10-minute data
+### Data Serving
+- Market data and ticker volume are served from the external user_pool ETL DB.
+- This API does not run local backfills, Dune fetchers, or indexer workers.
 
 ## Project Structure
 
 ```
 src/
-├── server.ts           # Express server entry point
+├── main.ts             # API entry point (server startup, graceful shutdown)
+├── app.ts              # Express app setup & middleware (rate limit, metrics, CORS)
 ├── config.ts           # Configuration & environment variables
-├── services/           # Business logic & data processing
-│   ├── tenMinuteVolumeService.ts
+├── runtime/            # Service composition + background heartbeat
+├── routes/             # Route handlers (tickers, market, supply, dexscreener, health)
+├── services/           # Business logic & data access
+│   ├── externalDatabaseService.ts   # Served ETL DB — the ONLY database
 │   └── [other services]
-├── schema/             # Database schema & types
-└── types/              # TypeScript type definitions
+├── middleware/         # errorHandler (AppError/asyncHandler), requestId
+├── types/              # TypeScript type definitions
+└── utils/              # Logger, alerts, validation, scheduling, resilience
 ```
 
 ## Key Technologies
@@ -52,17 +54,19 @@ src/
 
 1. Copy `example.env` to `.env`
 2. Configure PostgreSQL connection and API keys
-3. Run backfill if needed: `bun run backfill`
+3. Configure `DATABASE_PG_URL` for served ETL reads
 
 ## Important Notes
 
 - **Package Manager**: This project uses Bun exclusively. Do NOT run `npm install`, `npm run`, `pnpm`, or `yarn`.
 - **TypeScript**: Target is ESNext, compiled to dist/ via `bun run build`
-- **Main files**: 
-  - `index.ts` - Module entry point
-  - `src/server.ts` - Server startup
+- **Main files**:
+  - `src/main.ts` - Server startup (entry point)
   - `tsconfig.json` - Compiler config
 - **Lock file**: `bun.lock` - commit this, not node_modules
+- **Serving invariant**: infrastructure failures (RPC/DB) must surface as 5xx —
+  never as 200 with zero/empty/total-as-circulating data. Do not add catch
+  blocks that convert unknown errors into default values in financial paths.
 
 ## Testing
 
@@ -79,22 +83,22 @@ src/
 ## Database
 
 - Uses PostgreSQL with pg driver
-- Schema defined in `src/schema/`
-- Connection configured via .env (DATABASE_URL)
-- Backfill scripts in `scripts/` directory
+- ONE database: the read-only served ETL DB, configured via `.env`
+  (`DATABASE_PG_URL`)
+- The legacy app DB (`COINGECKO_PG_URL`/`DATABASE_URL`) is REMOVED — do not
+  reintroduce it; if a write is ever needed it goes to the prod DB
+- No local backfill scripts or Dune fetchers run in this API
 
 ## Common Issues
 
 | Issue | Solution |
 |-------|----------|
 | Dependencies missing | `bun install` |
-| TypeScript errors | `bun run build` to see full errors |
+| TypeScript errors | `bun run typecheck` to see full errors |
 | Tests fail | `bun test` to run suite |
 | ENV vars missing | Copy example.env to .env and fill values |
 
 ## Related Files
 
-- `README.md` - Project overview
-- `ARCHITECTURE_COMPARISON.md` - Architecture decisions
-- `IMPROVEMENTS.md` - Recent improvements made
-- `CODE_REVIEW_README.md` - Code review guidelines
+- `README.md` - Project overview and public API documentation
+- `docs/tickers-volume-cutover-validation.md` - Serving contract for ticker volume
diff --git a/Dockerfile b/Dockerfile
index aaf55a1..c106853 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
-FROM oven/bun:latest
+# Pin the base image to the same Bun version as packageManager in package.json.
+# (`latest` would silently change the runtime under us between builds.)
+FROM oven/bun:1.3.14
+
 WORKDIR /app
 
 COPY package.json bun.lock ./
@@ -19,6 +22,13 @@ RUN chmod +x /usr/local/bin/vault-entrypoint.sh
 COPY src/ src/
 COPY tsconfig.json ./
 
+# Fail the build on type errors — the container runs raw TS, so without this
+# nothing between the editor and production checks types.
+RUN bun run typecheck
+
+# Run as the unprivileged user the bun image ships with.
+USER bun
+
 EXPOSE 3000
 ENTRYPOINT ["/usr/local/bin/vault-entrypoint.sh"]
 CMD ["bun", "src/main.ts"]
diff --git a/README.md b/README.md
index 0a1b76c..108abfb 100644
--- a/README.md
+++ b/README.md
@@ -55,13 +55,14 @@ Returns all DAO tickers with pricing, volume, and liquidity information. Automat
 | `high_24h` / `low_24h` | 24h high/low (when available) |
 | `startDate` | First trade date for the token |
 
-**Volume sources** (priority order): 10-minute DB → hourly DB → Dune cache.
+**Volume source**: `futarchy.user_pool_spot_ohlcv` in the served ETL DB. If the
+served DB is unavailable, the endpoint returns `503` instead of reporting zero volume.
 
 ---
 
 ### DexScreener Adapter Endpoints
 
-Implements the [DexScreener Adapter Spec v1.1](https://dexscreener.notion.site/DEX-Screener-Adapter-Specs-cc1223cdf6e74a7799599106b65dcd0e). All endpoints are served under `/dexscreener/`. Requires `EXTERNAL_DATABASE_URL` to be configured (v0.6 indexer DB).
+Implements the [DexScreener Adapter Spec v1.1](https://dexscreener.notion.site/DEX-Screener-Adapter-Specs-cc1223cdf6e74a7799599106b65dcd0e). All endpoints are served under `/dexscreener/`. Requires `DATABASE_PG_URL` to be configured for the served DB.
 
 #### GET `/dexscreener/latest-block`
 
@@ -153,11 +154,13 @@ Returns swap events in the given Solana slot range (both inclusive). Events are
 
 Returns daily market data for the given date range, split by Futarchy AMM and Meteora sources.
 
-**Data source** is controlled by the `USE_DUNE_DATA` environment variable:
-- `USE_DUNE_DATA=false` — reads from `v06_fee_volume_daily_aggregate` (v0.6 indexer), providing spot + conditional volume breakdown with fee calculations and reconciliation status
-- `USE_DUNE_DATA=true` (default) — reads from `daily_volumes` (Dune pipeline)
+**Data source**: both FutarchyAMM and Meteora data come from the unified
+`futarchy.user_pool_daily` ETL table in the served DB. The served DB is a hard
+dependency: if it's unreachable the endpoint returns `503` rather than reporting
+a DB outage as zero volume.
 
-The response includes a `source` field (`"v06-indexer"` or `"dune"`) indicating which pipeline served the data.
+- **FutarchyAMM** — `source = 'futarchy_amm'`, pivoted into spot, conditional, and total daily columns. Response `futarchyAMM.source` is `"etl-user-pool-daily"`.
+- **Meteora** — `source = 'meteora'`, with the same daily accounting contract. Response `meteora.source` is `"etl-meteora-daily"`.
 
 ---
 
@@ -181,9 +184,20 @@ Returns circulating supply — total minus team performance package.
 
 | Endpoint | Description |
 |----------|-------------|
-| `GET /health` | Basic health check (status, uptime, cache status) |
-| `GET /api/health` | Comprehensive health with DB, volume services, and data freshness |
-| `GET /metrics` | Prometheus metrics |
+| `GET /health` | Liveness: process status and uptime (no dependency checks) |
+| `GET /api/health` | Readiness: served DB connectivity, ETL data contract, and data freshness |
+| `GET /metrics` | Prometheus metrics (HTTP, served-DB health gauges, heartbeat) |
+
+`/api/health` reports `status: "degraded"` (with a `message`) when the served DB
+is unreachable, the served-data contract check fails, or the freshness query fails.
+
+**Heartbeat**: a background self-check runs every `HEARTBEAT_INTERVAL_MS` (default
+1 min). It verifies served-DB connectivity, alerts when the newest swap is older
+than `HEARTBEAT_MAX_DATA_AGE_SECONDS` (default 6h — a stalled ETL with a healthy
+connection is still an outage), and re-checks the data contract every 10th tick.
+Failures push webhook alerts (with cooldowns) and update the
+`futarchy_served_db_connected` / `futarchy_served_contract_ok` /
+`futarchy_served_data_age_seconds` Prometheus gauges.
 
 ---
 
@@ -217,20 +231,19 @@ Create a `.env` file in the root directory (see `example.env` for reference):
 | **Server** | | |
 | `PORT` | Server port | `3000` |
 | `SERVER_REQUEST_TIMEOUT` | Request timeout (ms) | `300000` |
+| `TRUST_PROXY_HOPS` | Reverse-proxy hops in front of the API (needed for per-IP rate limiting behind a LB) | `0` |
 | `TRUSTED_API_KEYS` | Comma-separated allowlist of trusted partner keys | — |
 | `TRUSTED_RATE_LIMIT_MAX` | Per-bucket request count per minute for trusted keys | `600` |
-| **Database (App DB)** | | |
-| `COINGECKO_PG_URL` / `DATABASE_URL` | PostgreSQL connection string | — |
-| `DATABASE_SSL` | Enable SSL | `false` |
-| **External DB (v0.6 Indexer)** | | |
-| `EXTERNAL_DATABASE_URL` | Read-only connection to indexer DB | — |
-| `EXTERNAL_DATABASE_SSL` | Enable SSL | `false` |
-| **Dune** | | |
-| `DUNE_API_KEY` | Dune Analytics API key | — |
-| `DUNE_TEN_MINUTE_VOLUME_QUERY_ID` | 10-minute volume query ID | — |
-| `DUNE_METEORA_VOLUME_QUERY_ID` | Meteora volume query ID | — |
+| `CACHE_TICKERS_TTL` | On-chain data cache TTL (ms) | `55000` |
+| **Served indexer DB (required — the only database this API uses)** | | |
+| `DATABASE_PG_URL` | Read-only connection to the served indexer DB (Meteora, tickers, DexScreener, first-trade-dates). **Required** — `/api/market-data` returns 503 without it. | — |
+| `DATABASE_PG_SSL` | Enable SSL (server cert verified against system CAs) | `false` |
+| `DATABASE_PG_CA_CERT` | PEM CA cert content for private-CA verification | — |
+| `DATABASE_PG_SSL_NO_VERIFY` | Explicit opt-out of TLS verification (stopgap only) | `false` |
+| **Heartbeat** | | |
+| `HEARTBEAT_INTERVAL_MS` | Background self-check cadence (0 disables) | `60000` |
+| `HEARTBEAT_MAX_DATA_AGE_SECONDS` | Stale-data alert threshold (0 disables) | `21600` |
 | **Protocol** | | |
-| `USE_DUNE_DATA` | Use Dune pipeline for volume data (`true`/`false`) | `true` |
 | `PROTOCOL_FEE_RATE` | Protocol fee rate | `0.005` (0.5%) |
 | `EXCLUDED_DAOS` | Comma-separated DAO addresses to exclude | — |
 | **Alerts** | | |
@@ -242,29 +255,24 @@ Create a `.env` file in the root directory (see `example.env` for reference):
 ```
 src/
 ├── app.ts                        # Express app setup & middleware
-├── main.ts                       # Entry point, service wiring, scheduled tasks
+├── main.ts                       # API entry point (serves routes, no indexing workers)
+├── runtime/
+│   ├── services.ts               # API service composition
+│   └── heartbeat.ts              # Background self-check (served DB, freshness, contract)
 ├── config.ts                     # Environment variables & configuration
 ├── routes/
 │   ├── index.ts                  # Route registration
 │   ├── coingecko.ts              # GET /api/tickers
 │   ├── dexscreener.ts            # DexScreener adapter (4 endpoints)
-│   ├── market.ts                 # GET /api/market-data (v0.6 or Dune via USE_DUNE_DATA)
+│   ├── market.ts                 # GET /api/market-data (user_pool ETL)
 │   ├── supply.ts                 # GET /api/supply/*
-│   ├── health.ts                 # Health checks
+│   ├── health.ts                 # Liveness + readiness checks
 │   ├── metrics.ts                # Prometheus metrics
 │   └── root.ts                   # GET / (API info)
 ├── services/
 │   ├── futarchyService.ts        # On-chain DAO/pool/token data
 │   ├── priceService.ts           # Price, spread, liquidity calculations
-│   ├── databaseService.ts        # App DB (volumes, OHLCV, fees, metrics)
-│   ├── externalDatabaseService.ts # Read-only indexer DB connection
-│   ├── v06ReconciliationService.ts # Hourly v0.6 data reconciliation
-│   ├── tenMinuteVolumeFetcherService.ts # 10-min volume from Dune
-│   ├── hourlyAggregationService.ts     # Hourly rollups
-│   ├── dailyAggregationService.ts      # Daily rollups
-│   ├── meteoraVolumeFetcherService.ts  # Meteora pool volumes
-│   ├── duneCacheService.ts       # Dune API cache layer
-│   ├── duneService.ts            # Dune API client
+│   ├── externalDatabaseService.ts # Read-only served ETL DB connection (the only DB)
 │   ├── solanaService.ts          # SPL token supply queries
 │   ├── launchpadService.ts       # Token allocation breakdown
 │   └── metricsService.ts         # Prometheus counters/histograms
@@ -274,41 +282,29 @@ src/
 ├── middleware/
 │   ├── errorHandler.ts           # Error handling & asyncHandler
 │   └── requestId.ts              # Request ID injection
-├── utils/                        # Logger, alerts, validation, scheduling
-└── schema/                       # Dune SQL queries, v0.6 DDL reference
+└── utils/                        # Logger, alerts, validation, scheduling
 ```
 
 ## Data Pipeline
 
-### Volume Sources (priority order)
-1. **10-minute volumes** — from Dune, stored in `ten_minute_volumes`, rolled up to hourly/daily
-2. **v0.6 Reconciliation** — hourly job reads `v0_6_spot_swaps` + `v0_6_conditional_swaps` from the external indexer DB, writes OHLCV and fee breakdowns to app DB
-3. **Dune cache** — fallback for 24h metrics when DB sources unavailable
-
-### DexScreener Pipeline
-The DexScreener adapter reads **directly from the external indexer DB** (`v0_6_spot_swaps` + `v0_6_daos`) and serves real-time swap events indexed by Solana slot. No intermediate aggregation — raw swap data mapped to the DexScreener schema.
+### Sources (Dune fully removed)
+The API process serves market data from the read-only served ETL DB:
 
-## Backfill Scripts
+- `/api/tickers` reads rolling 24h metrics from `futarchy.user_pool_spot_ohlcv`.
+- `/api/market-data` reads FutarchyAMM and Meteora daily rows from `futarchy.user_pool_daily`.
+- DexScreener routes read raw indexed v0.6 swap/DAO tables from the same served DB.
 
-```bash
-# Full v0.6 backfill (since 2025-01-01)
-bun run backfill:v06
+The served ETL DB is the **only** database this API connects to (the legacy app DB
+is fully removed). The API does not start indexing, fetchers, rollups, or any
+schema setup — it is serve-only.
 
-# With custom range
-bun run backfill:v06 -- --since 2025-06-01
-
-# Chunked for large ranges
-bun run backfill:v06 -- --since 2025-01-01 --chunk-days 30
-
-# Legacy Dune-based backfills
-bun run backfill:daily
-bun run backfill:hourly
-bun run backfill:ten-minute
-```
+### DexScreener Pipeline
+The DexScreener adapter reads **directly from the external indexer DB** (`v0_6_spot_swaps` + `v0_6_daos`) and serves real-time swap events indexed by Solana slot. No intermediate aggregation — raw swap data mapped to the DexScreener schema.
 
 ## Rate Limiting
 
 - **Anonymous (default):** 60 requests per minute per IP. Returns `429 Too Many Requests` when exceeded.
+  - **Behind a proxy/load balancer, set `TRUST_PROXY_HOPS`** to the real hop count — otherwise every anonymous client resolves to the proxy's IP and shares a single bucket.
 - **Trusted partners:** 600 requests per minute per key (configurable via `TRUSTED_RATE_LIMIT_MAX`). Send the issued key in the `X-API-Key` header. Each key has its own bucket — partners do not share quota.
 - Requests sent with an `X-API-Key` header that does not match the server-side allowlist receive `401 Unauthorized` with `code: "INVALID_API_KEY"`.
 - Keys are issued out-of-band by the team. Contact us if you need elevated access.
diff --git a/bun.lock b/bun.lock
index 368b3f0..09d1578 100644
--- a/bun.lock
+++ b/bun.lock
@@ -9,24 +9,21 @@
         "@metadaoproject/programs": "0.1.0-alpha.2",
         "@solana/spl-token": "0.4.14",
         "@solana/web3.js": "1.98.4",
-        "@types/express": "5.0.6",
-        "@types/jest": "30.0.0",
-        "@types/node": "25.5.0",
         "bn.js": "5.2.2",
-        "dotenv": "17.3.1",
         "express": "5.1.0",
-        "nodemon": "3.1.14",
         "pg": "8.20.0",
         "prom-client": "15.1.3",
-        "supertest": "7.2.2",
-        "ts-node": "10.9.2",
       },
       "devDependencies": {
         "@socketsecurity/bun-security-scanner": "1.1.2",
         "@types/bun": "1.3.3",
+        "@types/express": "5.0.6",
+        "@types/jest": "30.0.0",
+        "@types/node": "25.5.0",
         "@types/pg": "8.20.0",
         "@types/supertest": "7.2.0",
         "knip": "6.3.0",
+        "supertest": "7.2.2",
         "typescript": "5.9.3",
       },
     },
@@ -44,8 +41,6 @@
 
     "@coral-xyz/borsh": ["@coral-xyz/borsh@0.31.1", "", { "dependencies": { "bn.js": "^5.1.2", "buffer-layout": "^1.2.0" }, "peerDependencies": { "@solana/web3.js": "^1.69.0" } }, "sha512-9N8AU9F0ubriKfNE3g1WF0/4dtlGXoBN/hd1PvbNBamBNwRgHxH4P+o3Zt7rSEloW1HUs6LfZEchlx9fW7POYw=="],
 
-    "@cspotcode/source-map-support": ["@cspotcode/source-map-support@0.8.1", "", { "dependencies": { "@jridgewell/trace-mapping": "0.3.9" } }, "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="],
-
     "@emnapi/core": ["@emnapi/core@1.10.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" } }, "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw=="],
 
     "@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="],
@@ -64,12 +59,6 @@
 
     "@jest/types": ["@jest/types@30.2.0", "", { "dependencies": { "@jest/pattern": "30.0.1", "@jest/schemas": "30.0.5", "@types/istanbul-lib-coverage": "^2.0.6", "@types/istanbul-reports": "^3.0.4", "@types/node": "*", "@types/yargs": "^17.0.33", "chalk": "^4.1.2" } }, "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg=="],
 
-    "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="],
-
-    "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="],
-
-    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],
-
     "@metadaoproject/programs": ["@metadaoproject/programs@0.1.0-alpha.2", "", { "dependencies": { "@coral-xyz/anchor": "^0.29.0", "@noble/hashes": "^1.4.0", "@solana/spl-token": "^0.3.7", "@solana/web3.js": "^1.76.0", "@sqds/multisig": "^2.1.4", "bn.js": "^5.2.1" } }, "sha512-xuOwUaGC6qS1D9tIzQiXlAmi0t4Y88pZEAT6juZensQxn1MBEQoANetHd16Mzrvmc6l/9Ayzf7eVesk+2FTNZw=="],
 
     "@metaplex-foundation/beet": ["@metaplex-foundation/beet@0.7.1", "", { "dependencies": { "ansicolors": "^0.3.2", "bn.js": "^5.2.0", "debug": "^4.3.3" } }, "sha512-hNCEnS2WyCiYyko82rwuISsBY3KYpe828ubsd2ckeqZr7tl0WVLivGkoyA/qdiaaHEBGdGl71OpfWa2rqL3DiA=="],
@@ -210,14 +199,6 @@
 
     "@swc/helpers": ["@swc/helpers@0.5.17", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="],
 
-    "@tsconfig/node10": ["@tsconfig/node10@1.0.12", "", {}, "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ=="],
-
-    "@tsconfig/node12": ["@tsconfig/node12@1.0.11", "", {}, "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="],
-
-    "@tsconfig/node14": ["@tsconfig/node14@1.0.3", "", {}, "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="],
-
-    "@tsconfig/node16": ["@tsconfig/node16@1.0.4", "", {}, "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="],
-
     "@tybys/wasm-util": ["@tybys/wasm-util@0.10.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg=="],
 
     "@types/bn.js": ["@types/bn.js@5.2.0", "", { "dependencies": { "@types/node": "*" } }, "sha512-DLbJ1BPqxvQhIGbeu8VbUC1DiAiahHtAYvA0ZEAa4P31F7IaArc8z3C3BRQdWX4mtLQuABG4yzp76ZrS02Ui1Q=="],
@@ -274,20 +255,12 @@
 
     "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
 
-    "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
-
-    "acorn-walk": ["acorn-walk@8.3.4", "", { "dependencies": { "acorn": "^8.11.0" } }, "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g=="],
-
     "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],
 
     "ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
 
     "ansicolors": ["ansicolors@0.3.2", "", {}, "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="],
 
-    "anymatch": ["anymatch@3.1.3", "", { "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="],
-
-    "arg": ["arg@4.1.3", "", {}, "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="],
-
     "asap": ["asap@2.0.6", "", {}, "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="],
 
     "assert": ["assert@2.1.0", "", { "dependencies": { "call-bind": "^1.0.2", "is-nan": "^1.3.2", "object-is": "^1.1.5", "object.assign": "^4.1.4", "util": "^0.12.5" } }, "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw=="],
@@ -296,8 +269,6 @@
 
     "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="],
 
-    "balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
-
     "base-x": ["base-x@3.0.11", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA=="],
 
     "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="],
@@ -306,8 +277,6 @@
 
     "bignumber.js": ["bignumber.js@9.3.1", "", {}, "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ=="],
 
-    "binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
-
     "bindings": ["bindings@1.5.0", "", { "dependencies": { "file-uri-to-path": "1.0.0" } }, "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="],
 
     "bintrees": ["bintrees@1.0.2", "", {}, "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="],
@@ -318,8 +287,6 @@
 
     "borsh": ["borsh@0.7.0", "", { "dependencies": { "bn.js": "^5.2.0", "bs58": "^4.0.0", "text-encoding-utf-8": "^1.0.2" } }, "sha512-CLCsZGIBCFnPtkNnieW/a8wmreDmfUtjU2m9yHrzPXIlNbqVs0AQrSatSG6vdNYUqdc83tkQi2eHfF98ubzQLA=="],
 
-    "brace-expansion": ["brace-expansion@5.0.5", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ=="],
-
     "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
 
     "bs58": ["bs58@4.0.1", "", { "dependencies": { "base-x": "^3.0.2" } }, "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw=="],
@@ -342,9 +309,7 @@
 
     "camelcase": ["camelcase@6.3.0", "", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="],
 
-    "chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
-
-    "chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
+    "chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
 
     "ci-info": ["ci-info@4.3.1", "", {}, "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA=="],
 
@@ -368,8 +333,6 @@
 
     "cookiejar": ["cookiejar@2.1.4", "", {}, "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="],
 
-    "create-require": ["create-require@1.1.1", "", {}, "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="],
-
     "cross-fetch": ["cross-fetch@3.2.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="],
 
     "crypto-hash": ["crypto-hash@1.3.0", "", {}, "sha512-lyAZ0EMyjDkVvz8WOeVnuCPvKVBXcMv1l5SVqO1yC7PzTwrD/pPje/BIRbWhMoPe436U+Y2nD7f5bFx0kt+Sbg=="],
@@ -388,12 +351,8 @@
 
     "dezalgo": ["dezalgo@1.0.4", "", { "dependencies": { "asap": "^2.0.0", "wrappy": "1" } }, "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="],
 
-    "diff": ["diff@4.0.2", "", {}, "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="],
-
     "dot-case": ["dot-case@3.0.4", "", { "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="],
 
-    "dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
-
     "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="],
 
     "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="],
@@ -456,8 +415,6 @@
 
     "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
 
-    "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
-
     "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
 
     "generator-function": ["generator-function@2.0.1", "", {}, "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g=="],
@@ -474,7 +431,7 @@
 
     "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
 
-    "has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="],
+    "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
 
     "has-property-descriptors": ["has-property-descriptors@1.0.2", "", { "dependencies": { "es-define-property": "^1.0.0" } }, "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="],
 
@@ -492,8 +449,6 @@
 
     "ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
 
-    "ignore-by-default": ["ignore-by-default@1.0.1", "", {}, "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA=="],
-
     "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="],
 
     "invariant": ["invariant@2.2.4", "", { "dependencies": { "loose-envify": "^1.0.0" } }, "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="],
@@ -502,8 +457,6 @@
 
     "is-arguments": ["is-arguments@1.2.0", "", { "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" } }, "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA=="],
 
-    "is-binary-path": ["is-binary-path@2.1.0", "", { "dependencies": { "binary-extensions": "^2.0.0" } }, "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="],
-
     "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="],
 
     "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="],
@@ -550,8 +503,6 @@
 
     "lower-case": ["lower-case@2.0.2", "", { "dependencies": { "tslib": "^2.0.3" } }, "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="],
 
-    "make-error": ["make-error@1.3.6", "", {}, "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="],
-
     "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="],
 
     "media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
@@ -570,8 +521,6 @@
 
     "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],
 
-    "minimatch": ["minimatch@10.2.5", "", { "dependencies": { "brace-expansion": "^5.0.5" } }, "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg=="],
-
     "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="],
 
     "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
@@ -584,10 +533,6 @@
 
     "node-gyp-build": ["node-gyp-build@4.8.4", "", { "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ=="],
 
-    "nodemon": ["nodemon@3.1.14", "", { "dependencies": { "chokidar": "^3.5.2", "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^10.2.1", "pstree.remy": "^1.1.8", "semver": "^7.5.3", "simple-update-notifier": "^2.0.0", "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.5" }, "bin": { "nodemon": "bin/nodemon.js" } }, "sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw=="],
-
-    "normalize-path": ["normalize-path@3.0.0", "", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="],
-
     "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="],
 
     "object-is": ["object-is@1.1.6", "", { "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1" } }, "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="],
@@ -646,8 +591,6 @@
 
     "proxy-addr": ["proxy-addr@2.0.7", "", { "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="],
 
-    "pstree.remy": ["pstree.remy@1.1.8", "", {}, "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="],
-
     "qs": ["qs@6.14.0", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w=="],
 
     "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="],
@@ -658,8 +601,6 @@
 
     "react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
 
-    "readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],
-
     "resolve-pkg-maps": ["resolve-pkg-maps@1.0.0", "", {}, "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="],
 
     "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="],
@@ -676,8 +617,6 @@
 
     "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
 
-    "semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="],
-
     "send": ["send@1.2.0", "", { "dependencies": { "debug": "^4.3.5", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.0", "mime-types": "^3.0.1", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.1" } }, "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw=="],
 
     "serve-static": ["serve-static@2.2.0", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ=="],
@@ -694,8 +633,6 @@
 
     "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="],
 
-    "simple-update-notifier": ["simple-update-notifier@2.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w=="],
-
     "slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
 
     "smol-toml": ["smol-toml@1.6.1", "", {}, "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg=="],
@@ -720,7 +657,7 @@
 
     "supertest": ["supertest@7.2.2", "", { "dependencies": { "cookie-signature": "^1.2.2", "methods": "^1.1.2", "superagent": "^10.3.0" } }, "sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA=="],
 
-    "supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="],
+    "supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
 
     "tdigest": ["tdigest@0.1.2", "", { "dependencies": { "bintrees": "1.0.2" } }, "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="],
 
@@ -732,12 +669,8 @@
 
     "toml": ["toml@3.0.0", "", {}, "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="],
 
-    "touch": ["touch@3.1.1", "", { "bin": { "nodetouch": "bin/nodetouch.js" } }, "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="],
-
     "tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
 
-    "ts-node": ["ts-node@10.9.2", "", { "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", "@tsconfig/node12": "^1.0.7", "@tsconfig/node14": "^1.0.0", "@tsconfig/node16": "^1.0.2", "acorn": "^8.4.1", "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", "v8-compile-cache-lib": "^3.0.1", "yn": "3.1.1" }, "peerDependencies": { "@swc/core": ">=1.2.50", "@swc/wasm": ">=1.2.50", "@types/node": "*", "typescript": ">=2.7" }, "optionalPeers": ["@swc/core", "@swc/wasm"], "bin": { "ts-node": "dist/bin.js", "ts-script": "dist/bin-script-deprecated.js", "ts-node-cwd": "dist/bin-cwd.js", "ts-node-esm": "dist/bin-esm.js", "ts-node-script": "dist/bin-script.js", "ts-node-transpile-only": "dist/bin-transpile.js" } }, "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ=="],
-
     "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
     "type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],
@@ -746,8 +679,6 @@
 
     "unbash": ["unbash@2.2.0", "", {}, "sha512-X2wH19RAPZE3+ldGicOkoj/SIA83OIxcJ6Cuaw23hf8Xc6fQpvZXY0SftE2JgS0QhYLUG4uwodSI3R53keyh7w=="],
 
-    "undefsafe": ["undefsafe@2.0.5", "", {}, "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="],
-
     "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
 
     "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="],
@@ -758,8 +689,6 @@
 
     "uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
 
-    "v8-compile-cache-lib": ["v8-compile-cache-lib@3.0.1", "", {}, "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="],
-
     "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="],
 
     "walk-up-path": ["walk-up-path@4.0.0", "", {}, "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A=="],
@@ -778,16 +707,12 @@
 
     "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="],
 
-    "yn": ["yn@3.1.1", "", {}, "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="],
-
     "zod": ["zod@4.4.3", "", {}, "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ=="],
 
     "@jest/pattern/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
     "@jest/types/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
-    "@jest/types/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
     "@metadaoproject/programs/@coral-xyz/anchor": ["@coral-xyz/anchor@0.29.0", "", { "dependencies": { "@coral-xyz/borsh": "^0.29.0", "@noble/hashes": "^1.3.1", "@solana/web3.js": "^1.68.0", "bn.js": "^5.1.2", "bs58": "^4.0.1", "buffer-layout": "^1.2.2", "camelcase": "^6.3.0", "cross-fetch": "^3.1.5", "crypto-hash": "^1.3.0", "eventemitter3": "^4.0.7", "pako": "^2.0.3", "snake-case": "^3.0.4", "superstruct": "^0.15.4", "toml": "^3.0.0" } }, "sha512-eny6QNG0WOwqV0zQ7cs/b1tIuzZGmP7U7EcH+ogt4Gdbl8HDmIYVMh/9aTmYZPaFWjtUaI8qSn73uYEXWfATdA=="],
 
     "@metadaoproject/programs/@solana/spl-token": ["@solana/spl-token@0.3.11", "", { "dependencies": { "@solana/buffer-layout": "^4.0.0", "@solana/buffer-layout-utils": "^0.2.0", "@solana/spl-token-metadata": "^0.1.2", "buffer": "^6.0.3" }, "peerDependencies": { "@solana/web3.js": "^1.88.0" } }, "sha512-bvohO3rIMSVL24Pb+I4EYTJ6cL82eFpInEXD/I8K8upOGjpqHsKUoAempR/RnUlI1qSFNyFlWJfu6MNUgfbCQQ=="],
@@ -810,6 +735,8 @@
 
     "@solana/codecs-strings/@solana/errors": ["@solana/errors@2.0.0-rc.1", "", { "dependencies": { "chalk": "^5.3.0", "commander": "^12.1.0" }, "peerDependencies": { "typescript": ">=5" }, "bin": { "errors": "bin/cli.mjs" } }, "sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ=="],
 
+    "@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
+
     "@solana/errors/commander": ["commander@14.0.2", "", {}, "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ=="],
 
     "@solana/options/@solana/codecs-core": ["@solana/codecs-core@2.0.0-rc.1", "", { "dependencies": { "@solana/errors": "2.0.0-rc.1" }, "peerDependencies": { "typescript": ">=5" } }, "sha512-bauxqMfSs8EHD0JKESaNmNuNvkvHSuN3bbWAF5RjOfDu2PugxHrvRebmYauvSumZ3cTfQ4HJJX6PG5rN852qyQ=="],
@@ -840,32 +767,22 @@
 
     "@types/ws/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
-    "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
-
     "bun-types/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
+    "chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
+
     "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
 
     "jayson/@types/node": ["@types/node@12.20.55", "", {}, "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="],
 
-    "jest-diff/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
-    "jest-matcher-utils/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
-    "jest-message-util/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
     "jest-mock/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
     "jest-util/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
-    "jest-util/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
     "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
     "raw-body/iconv-lite": ["iconv-lite@0.7.0", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ=="],
 
-    "readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
-
     "rpc-websockets/@types/ws": ["@types/ws@8.18.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg=="],
 
     "rpc-websockets/eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
@@ -878,22 +795,24 @@
 
     "@jest/types/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
 
-    "@jest/types/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "@jest/types/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
     "@metadaoproject/programs/@coral-xyz/anchor/@coral-xyz/borsh": ["@coral-xyz/borsh@0.29.0", "", { "dependencies": { "bn.js": "^5.1.2", "buffer-layout": "^1.2.0" }, "peerDependencies": { "@solana/web3.js": "^1.68.0" } }, "sha512-s7VFVa3a0oqpkuRloWVPdCK7hMbAMY270geZOGfCnaqexrP5dTIpbEHL33req6IYPPJ0hYa71cdvJ1h6V55/oQ=="],
 
     "@metaplex-foundation/beet-solana/bs58/base-x": ["base-x@4.0.1", "", {}, "sha512-uAZ8x6r6S3aUM9rbHGVOIsR15U/ZSc82b3ymnCPsT45Gk1DDvhDPdIgB5MrhirZWt+5K0EEPQH985kNqZgNPFw=="],
 
+    "@solana/codecs-data-structures/@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
+
     "@solana/codecs-data-structures/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
+    "@solana/codecs-strings/@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
+
     "@solana/codecs-strings/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
     "@solana/codecs/@solana/codecs-core/@solana/errors": ["@solana/errors@2.0.0-rc.1", "", { "dependencies": { "chalk": "^5.3.0", "commander": "^12.1.0" }, "peerDependencies": { "typescript": ">=5" }, "bin": { "errors": "bin/cli.mjs" } }, "sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ=="],
 
     "@solana/codecs/@solana/codecs-numbers/@solana/errors": ["@solana/errors@2.0.0-rc.1", "", { "dependencies": { "chalk": "^5.3.0", "commander": "^12.1.0" }, "peerDependencies": { "typescript": ">=5" }, "bin": { "errors": "bin/cli.mjs" } }, "sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ=="],
 
+    "@solana/options/@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
+
     "@solana/options/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
     "@types/bn.js/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
@@ -914,41 +833,19 @@
 
     "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
 
-    "jest-diff/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "jest-diff/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
-    "jest-matcher-utils/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "jest-matcher-utils/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
-    "jest-message-util/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "jest-message-util/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
     "jest-mock/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
 
     "jest-util/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
 
-    "jest-util/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "jest-util/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
     "rpc-websockets/@types/ws/@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
 
-    "@jest/types/chalk/supports-color/has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
+    "@solana/codecs/@solana/codecs-core/@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
 
     "@solana/codecs/@solana/codecs-core/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
-    "@solana/codecs/@solana/codecs-numbers/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
-
-    "jest-diff/chalk/supports-color/has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
-
-    "jest-matcher-utils/chalk/supports-color/has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
+    "@solana/codecs/@solana/codecs-numbers/@solana/errors/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
 
-    "jest-message-util/chalk/supports-color/has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
-
-    "jest-util/chalk/supports-color/has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
+    "@solana/codecs/@solana/codecs-numbers/@solana/errors/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
 
     "rpc-websockets/@types/ws/@types/node/undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
   }
diff --git a/docs/tickers-volume-cutover-validation.md b/docs/tickers-volume-cutover-validation.md
new file mode 100644
index 0000000..772e531
--- /dev/null
+++ b/docs/tickers-volume-cutover-validation.md
@@ -0,0 +1,33 @@
+# `/api/tickers` volume cutover
+
+Status: **completed**. The Dune ticker pipeline and app-DB fallback have been
+removed from the API runtime.
+
+## Current Serving Contract
+
+`/api/tickers` serves rolling 24h spot volume from the served ETL DB:
+
+- table: `futarchy.user_pool_spot_ohlcv`
+- filters: `source = 'futarchy_amm'`, `interval = '1m'`, `bucket_start >= now - 24h`
+- key: `token` is the DAO base mint; the API maps base mint to DAO address for `pool_id`
+- units: human token units for `base_volume`, USD/USDC units for `target_volume`
+
+The served DB is a hard dependency. If it is unavailable, `/api/tickers` returns
+`503` instead of reporting zero volume.
+
+## Removed Paths
+
+The following are no longer serving sources:
+
+- Dune query fetchers, caches, and rollups
+- `futarchy.trades` direct reads for ticker 24h volume
+- app-DB `v06_spot_ohlcv_1m` ticker fallback
+
+## Validation Expectations
+
+Future changes to ticker volume should validate:
+
+- every active DAO base mint has ETL coverage or an explicit zero-volume row absence
+- rolling window aggregation matches the ETL table's human-unit contract
+- served DB outage returns `503`
+- `/api/health` reports the served ETL contract for the user_pool tables
diff --git a/example.env b/example.env
index 6f5708b..c6cb16d 100644
--- a/example.env
+++ b/example.env
@@ -1,97 +1,66 @@
 # ===========================================
-# Development Mode
+# REQUIRED — Served ETL database (the ONLY database this API reads)
 # ===========================================
-# Set to 'true' to disable external Dune API calls
-# Useful for local development without hitting Dune rate limits
-# When enabled, Dune services will return mock/empty data
-# DEV_MODE=true
+# Read-only connection to the served user_pool ETL DB. Without it, /api/tickers,
+# /api/market-data, and the DexScreener routes return 503.
+DATABASE_PG_URL=postgresql://readonly:password@host:5432/database
 
-# Solana Configuration
-SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
-SOLANA_WS_URL=wss://api.mainnet-beta.solana.com
-
-DEX_FORK_TYPE="Uniswap V1"
-FACTORY_ADDRESS=FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq
-ROUTER_ADDRESS=FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq
+# TLS to the served DB. Verifies the server cert by default (system CAs, or the
+# PEM CA cert CONTENT below for a private CA).
+DATABASE_PG_SSL=true
+# DATABASE_PG_CA_CERT=
+# Encrypt WITHOUT authenticating the server (self-signed/legacy) — stopgap only.
+# DATABASE_PG_SSL_NO_VERIFY=true
 
-# Server Configuration
+# ===========================================
+# Server
+# ===========================================
 PORT=3000
 NODE_ENV=production
-# Request timeout in milliseconds (default: 300000 = 5 minutes)
+# Reverse-proxy hop count in front of the process; required so per-IP rate limiting
+# resolves real client IPs (not the proxy's). 0 = no proxy. Use the exact count.
+# TRUST_PROXY_HOPS=1
+# Request / keep-alive timeouts in ms (default 300000 each).
 # SERVER_REQUEST_TIMEOUT=300000
-# Keep-alive timeout in milliseconds (default: 300000 = 5 minutes)
 # SERVER_KEEP_ALIVE_TIMEOUT=300000
 
 # ===========================================
-# Trusted API Keys (Higher Rate Limits)
+# Trusted API keys (elevated rate limit)
 # ===========================================
-# Partners send these via the 'X-API-Key' header to receive an elevated limit.
-# Comma-separated, opaque secrets (e.g. `openssl rand -hex 32`). Each key gets
-# its own bucket. Requests with an unrecognized key return 401 Unauthorized.
+# Comma-separated opaque secrets sent via the 'X-API-Key' header; each gets its own
+# bucket, unknown keys get 401. Per-key limit/min via TRUSTED_RATE_LIMIT_MAX (default 600).
 # TRUSTED_API_KEYS=
-# Per-bucket limit per minute for trusted keys (default: 600).
 # TRUSTED_RATE_LIMIT_MAX=600
 
-# Blockchain Data Cache TTL in milliseconds (default: 10000 = 10 seconds)
-# Controls how long pool data, prices, and other blockchain data is cached
-# Lower = more real-time prices but more RPC calls
-# Higher = less RPC load but slightly stale prices
-# CACHE_TICKERS_TTL=10000
-
-PROTOCOL_FEE_RATE=0.005
-
-EXCLUDED_DAOS=DMB74TZgN7Rqfwtqqm3VQBgKBb2WYPdBqVtHbvB4LLeV,AE7jPb9jYzbUE5GYJToKvXaRkJL2Q7Mm3Ek6KqyBGuxe,E3BjsvLSFqUqVtDP76qMw4QbETkxvqvg8RTSbRZxWCK4,CnUUCGbSrAoaJniPifRU8zHRZ6e5uGRVSpCEj2WMeeSv,CLoqV77NtkbrsvtCRDP1vdYxgPZua3nnh7gCNPLzDQQ8,CJCgDqiDtkQvwXT2iiyY7QVajKLH3VRVbcsNQgtttrHn,651uV1hcd7SprwwkumFfkWtx5WrnD53awpjduGtGsHzS,4rW6iVKUq1RWYQ1VBTrjvP9FL4G3Sn7mBj7Yg12kuckv,Eo1BLMVRLJspjP5dDnwzK1m6FxMUcQDG6kDA8CjWPzRW,CTYxPujxrXiiqwG3gSBVNKuBk8u7mPG9qVMUc4aT1L8u,EbcsPbXZa81xUunDSmzYrcAWGURxcZB6BTkgzqvNJBZH,BgNq2V6vea2C7Z3cZhDUJTbmN4Y9bKG6dfEPhH19J7Fb,DHjQLd6LCM4yzZ9e8eabyGofDJLjbouqpuX8wh1rQuBs,BQjNtXjZB7b9WrqgJZQWfR52T1MqZoqMELAoombywDi8,j6Hx7bdAzcj1NsoRBqdafFuRkgEU48QeZ1i5NVXz9fF,AE7jPb9jYzbUE5GYJToKvXaRkJL2Q7Mm3Ek6KqyBGuxe
-
-# Dune Analytics Configuration
-# Get your API key from https://dune.com/settings/api
-DUNE_API_KEY=your_dune_api_key_here
-
-# 10-Minute volume query ID - PRIMARY query for rolling 24h metrics on /api/tickers
-# This query should accept 'start_time', 'end_time', and 'token_list' parameters
-# See src/schema/dune-ten-minute-volume.sql for the query template
-# Runs every 10 minutes = 144 queries/day = ~4,320 queries/month
-# Hourly and daily data are automatically aggregated from 10-minute data using DB functions
-# DUNE_TEN_MINUTE_VOLUME_QUERY_ID=
-
-# Meteora daily volumes query ID - tracks Meteora pool fees per owner
-# This query should accept 'start_date' parameter
-# See src/schema/dune-meteora-volumes.sql for the query template
-# Runs once daily at 00:00 UTC (midnight) = 1 query/day = ~30 queries/month
-# DUNE_METEORA_VOLUME_QUERY_ID=
-
-# Dune Cache Configuration
-# Cache refresh interval in seconds (default: 3600 = 1 hour)
-# DUNE_CACHE_REFRESH_INTERVAL=3600
-# Fetch timeout in seconds (default: 240 = 4 minutes)
-# DUNE_FETCH_TIMEOUT=240
-
-# Optional: Internal cache TTLs in seconds (used by DuneService internally)
-# These are less important now that we have the main cache layer
-# DUNE_CACHE_TTL=60
-# DUNE_BATCH_CACHE_TTL=300
-# DUNE_AGGREGATE_VOLUME_CACHE_TTL=600
-
 # ===========================================
-# PostgreSQL Database Configuration
+# Solana RPC (used by /api/tickers + supply reads)
 # ===========================================
-# Used for storing historical volume data to avoid re-fetching from Dune
-# Either use DATABASE_URL or individual connection parameters
+# RPCPOOL_RPC_URL takes precedence; SOLANA_RPC_URL is the public fallback.
+# RPCPOOL_RPC_URL=
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 
-# Option 1: Connection string (recommended for cloud deployments)
-# DATABASE_URL=postgresql://user:password@host:5432/database
+# ===========================================
+# Misc
+# ===========================================
+# Ticker cache TTL in ms (default 55000).
+# CACHE_TICKERS_TTL=55000
+# Protocol fee rate (0.005 = 0.5%); reported as fee bps on the DexScreener routes.
+# PROTOCOL_FEE_RATE=0.005
+# Shown on the root info route.
+# DEX_FORK_TYPE=Custom
+# FACTORY_ADDRESS=
+# ROUTER_ADDRESS=
+# DAOs excluded from /api/tickers (comma-separated mints). Default: none.
+EXCLUDED_DAOS=DMB74TZgN7Rqfwtqqm3VQBgKBb2WYPdBqVtHbvB4LLeV,AE7jPb9jYzbUE5GYJToKvXaRkJL2Q7Mm3Ek6KqyBGuxe,E3BjsvLSFqUqVtDP76qMw4QbETkxvqvg8RTSbRZxWCK4,CnUUCGbSrAoaJniPifRU8zHRZ6e5uGRVSpCEj2WMeeSv,CLoqV77NtkbrsvtCRDP1vdYxgPZua3nnh7gCNPLzDQQ8,CJCgDqiDtkQvwXT2iiyY7QVajKLH3VRVbcsNQgtttrHn,651uV1hcd7SprwwkumFfkWtx5WrnD53awpjduGtGsHzS,4rW6iVKUq1RWYQ1VBTrjvP9FL4G3Sn7mBj7Yg12kuckv,Eo1BLMVRLJspjP5dDnwzK1m6FxMUcQDG6kDA8CjWPzRW,CTYxPujxrXiiqwG3gSBVNKuBk8u7mPG9qVMUc4aT1L8u,EbcsPbXZa81xUunDSmzYrcAWGURxcZB6BTkgzqvNJBZH,BgNq2V6vea2C7Z3cZhDUJTbmN4Y9bKG6dfEPhH19J7Fb,DHjQLd6LCM4yzZ9e8eabyGofDJLjbouqpuX8wh1rQuBs,BQjNtXjZB7b9WrqgJZQWfR52T1MqZoqMELAoombywDi8,j6Hx7bdAzcj1NsoRBqdafFuRkgEU48QeZ1i5NVXz9fF
 
-# Option 2: Individual connection parameters
-# DATABASE_HOST=localhost
-# DATABASE_PORT=5432
-# DATABASE_NAME=futarchy_volumes
-# DATABASE_USER=postgres
-# DATABASE_PASSWORD=
-# DATABASE_SSL=false
+# ===========================================
+# Heartbeat (background self-check) — 0 disables
+# ===========================================
+# HEARTBEAT_INTERVAL_MS=60000
+# HEARTBEAT_MAX_DATA_AGE_SECONDS=21600
 
 # ===========================================
-# Query Schedule (automatic, no config needed)
+# Alerts (Telegram webhook relay)
 # ===========================================
-# PRIMARY (10-min):  144 queries/day at :00, :10, :20, :30, :40, :50
-#                    = ~4,320 queries/month
-# This is the main source for /api/tickers 24h volume data
-# Hourly and daily data are automatically aggregated from 10-minute data using DB functions
\ No newline at end of file
+# ALERT_WEBHOOK_URL=
+# ALERT_WEBHOOK_SECRET=
diff --git a/index.ts b/index.ts
deleted file mode 100644
index f67b2c6..0000000
--- a/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.log("Hello via Bun!");
\ No newline at end of file
diff --git a/package.json b/package.json
index 579c37e..7660cb5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "futarchy-external-api",
-  "module": "index.ts",
+  "module": "src/main.ts",
   "type": "module",
   "private": true,
   "version": "2.0.0",
@@ -10,14 +10,8 @@
     "start": "bun dist/main.js",
     "prestart": "bun run build",
     "test": "bun test",
-    "backfill": "bun run scripts/backfill.ts",
-    "backfill:daily": "bun run scripts/backfill.ts daily",
-    "backfill:hourly": "bun run scripts/backfill.ts hourly",
-    "backfill:ten-minute": "bun run scripts/backfill.ts ten-minute",
-    "backfill:v06": "bun run scripts/backfillV06.ts",
     "safe-update": "bun run scripts/safe-update.ts",
     "safe-update:dry": "bun run scripts/safe-update.ts --dry-run",
-    "compare:dune-vs-v06": "bun run scripts/compareDuneVsV06.ts",
     "typecheck": "tsc --noEmit",
     "repo:guard": "bun scripts/repo-guard.ts",
     "deps:check": "knip --include unlisted --reporter compact"
@@ -27,24 +21,21 @@
     "@metadaoproject/programs": "0.1.0-alpha.2",
     "@solana/spl-token": "0.4.14",
     "@solana/web3.js": "1.98.4",
-    "@types/express": "5.0.6",
-    "@types/jest": "30.0.0",
-    "@types/node": "25.5.0",
     "bn.js": "5.2.2",
-    "dotenv": "17.3.1",
     "express": "5.1.0",
-    "nodemon": "3.1.14",
     "pg": "8.20.0",
-    "prom-client": "15.1.3",
-    "supertest": "7.2.2",
-    "ts-node": "10.9.2"
+    "prom-client": "15.1.3"
   },
   "devDependencies": {
+    "@socketsecurity/bun-security-scanner": "1.1.2",
     "@types/bun": "1.3.3",
+    "@types/express": "5.0.6",
+    "@types/jest": "30.0.0",
+    "@types/node": "25.5.0",
     "@types/pg": "8.20.0",
     "@types/supertest": "7.2.0",
-    "@socketsecurity/bun-security-scanner": "1.1.2",
     "knip": "6.3.0",
+    "supertest": "7.2.2",
     "typescript": "5.9.3"
   },
   "installConfig": {
diff --git a/scripts/backfill.ts b/scripts/backfill.ts
deleted file mode 100644
index 6633d37..0000000
--- a/scripts/backfill.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bun
-/**
- * Backfill script - Run a full data insert from Dune to PostgreSQL
- * 
- * Usage:
- *   bun run scripts/backfill.ts [ten-minute]
- * 
- * Note: Hourly and daily data are now aggregated from 10-minute data using DB functions.
- * This script only supports 10-minute backfill. Hourly and daily will be automatically
- * aggregated from the 10-minute data.
- * 
- * Required environment variables:
- *   - DATABASE_URL: PostgreSQL connection string
- *   - DUNE_API_KEY: Your Dune API key
- *   - DUNE_TEN_MINUTE_VOLUME_QUERY_ID: For 10-minute volumes
- */
-
-import { config } from '../src/config';
-
-// Dynamically import services to avoid circular deps
-async function main() {
-  const args = process.argv.slice(2);
-  const mode = args[0] || 'all';
-  
-  console.log('🚀 Starting backfill script...');
-  console.log(`📊 Mode: ${mode}`);
-  console.log('');
-  
-  // Check required env vars
-  if (!process.env.DATABASE_URL) {
-    console.error('❌ DATABASE_URL is required');
-    process.exit(1);
-  }
-  
-  if (!process.env.DUNE_API_KEY) {
-    console.error('❌ DUNE_API_KEY is required');
-    process.exit(1);
-  }
-  
-  // Import services
-  const { DatabaseService } = await import('../src/services/databaseService');
-  const { DuneService } = await import('../src/services/duneService');
-  const { FutarchyService } = await import('../src/services/futarchyService');
-  
-  // Initialize database
-  const databaseService = new DatabaseService();
-  await databaseService.initialize();
-  
-  if (!databaseService.isAvailable()) {
-    console.error('❌ Failed to connect to database');
-    process.exit(1);
-  }
-  
-  console.log('✅ Database connected');
-  
-  // Initialize Dune service (uses config internally)
-  const duneService = new DuneService();
-  
-  // Initialize FutarchyService for token list (uses config internally)
-  const futarchyService = new FutarchyService();
-  
-  const allDaos = await futarchyService.getAllDaos();
-  const tokenAddresses = allDaos.map(dao => dao.baseMint.toString());
-  console.log(`📋 Found ${tokenAddresses.length} DAOs to backfill`);
-  console.log('');
-  
-  try {
-    // Only support ten-minute mode - hourly and daily are aggregated from 10-minute data
-    if (mode === 'ten-minute' || mode === 'all' || !mode) {
-      await backfillTenMinute(databaseService, duneService, tokenAddresses);
-    } else if (mode === 'daily' || mode === 'hourly') {
-      console.log(`⚠️  ${mode} mode is deprecated. Hourly and daily data are now aggregated from 10-minute data.`);
-      console.log('   Please use "ten-minute" mode instead. Hourly and daily will be automatically aggregated.');
-      process.exit(1);
-    }
-    
-    console.log('');
-    console.log('✅ Backfill complete!');
-    console.log('   Note: Hourly and daily records will be automatically aggregated from 10-minute data.');
-    
-    // Print summary
-    console.log('');
-    console.log('📊 Database summary:');
-    const tenMinCount = await databaseService.getTenMinuteRecordCount();
-    console.log(`   10-minute records: ${tenMinCount}`);
-    console.log('   (Hourly and daily records are aggregated from 10-minute data)');
-    
-  } catch (error: any) {
-    console.error('❌ Backfill failed:', error.message);
-    process.exit(1);
-  } finally {
-    await databaseService.close();
-  }
-}
-
-async function backfillTenMinute(
-  databaseService: any,
-  duneService: any,
-  tokenAddresses: string[]
-) {
-  const queryId = config.dune.tenMinuteVolumeQueryId;
-  if (!queryId) {
-    console.log('⏭️  Skipping 10-minute backfill - DUNE_TEN_MINUTE_VOLUME_QUERY_ID not set');
-    return;
-  }
-  
-  console.log('⏱️  Starting 10-MINUTE volume backfill...');
-  console.log(`   Query ID: ${queryId}`);
-  
-  // Always backfill from the beginning
-  const startTime = new Date('2026-01-24T00:00:00Z'); // Futarchy launch date
-  const startTimeStr = startTime.toISOString().slice(0, 19).replace('T', ' ');
-  console.log(`   Start time: ${startTimeStr} (always from beginning)`);
-  
-  const fetchStart = Date.now();
-  
-  // Build token list parameter
-  const tokenListParam = tokenAddresses.length > 0 
-    ? tokenAddresses.map(t => `'${t}'`).join(',')
-    : "'__ALL__'";
-  
-  // Execute query
-  const result = await duneService.executeQueryManually(queryId, {
-    start_time: startTimeStr,
-    token_list: tokenListParam,
-  });
-  
-  if (!result || !result.rows || result.rows.length === 0) {
-    console.log('   No data returned from Dune');
-    return;
-  }
-  
-  console.log(`   Fetched ${result.rows.length} rows from Dune`);
-  
-  // Debug: show first row structure
-  if (result.rows.length > 0) {
-    console.log(`   Sample row keys: ${Object.keys(result.rows[0]).join(', ')}`);
-    console.log(`   Sample row:`, JSON.stringify(result.rows[0], null, 2));
-  }
-  
-  // Transform and insert - Dune field names match DB field names
-  const records = result.rows.map((row: any) => ({
-    token: row.token,
-    bucket: row.bucket,
-    base_volume: row.base_volume || '0',
-    target_volume: row.target_volume || '0',
-    trade_count: parseInt(row.trade_count || row.num_swaps) || 0,
-    high: row.high || '0',
-    low: row.low || '0',
-  }));
-  
-  const upserted = await databaseService.upsertTenMinuteVolumes(records);
-  const duration = Date.now() - fetchStart;
-  
-  console.log(`   ✅ Upserted ${upserted} 10-minute records in ${duration}ms`);
-  // Note: Not pruning data - keeping all historical records
-}
-
-main().catch(console.error);
-
diff --git a/scripts/backfillExtendedFields.ts b/scripts/backfillExtendedFields.ts
deleted file mode 100644
index 9f800e5..0000000
--- a/scripts/backfillExtendedFields.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Backfill Script for Extended Fields
- * 
- * This script safely backfills missing extended fields in existing database records.
- * It:
- * 1. Identifies 10-minute records missing extended fields
- * 2. Optionally re-fetches those records from Dune using the extended query (if SKIP_DUNE not set)
- * 3. Updates only the missing fields (preserves existing data)
- * 4. Aggregates hourly and daily records from the updated 10-minute data
- * 
- * Run this BEFORE starting services to ensure all existing data has extended fields.
- * 
- * Usage: 
- *   bun run scripts/backfillExtendedFields.ts
- *   SKIP_DUNE=true bun run scripts/backfillExtendedFields.ts  # Skip Dune, use DB aggregation only
- *   RECENT_DAYS=7 bun run scripts/backfillExtendedFields.ts   # Only backfill last 7 days from Dune
- */
-
-import { DatabaseService } from '../src/services/databaseService.js';
-import { DuneService } from '../src/services/duneService.js';
-import { FutarchyService } from '../src/services/futarchyService.js';
-import { TenMinuteVolumeFetcherService } from '../src/services/tenMinuteVolumeFetcherService.js';
-import { config } from '../src/config.js';
-
-async function backfillExtendedFields() {
-  console.log('=== Starting Extended Fields Backfill ===\n');
-
-  // Check environment variables for options
-  const skipDune = process.env.SKIP_DUNE === 'true';
-  const recentDays = process.env.RECENT_DAYS ? parseInt(process.env.RECENT_DAYS) : null;
-
-  if (skipDune) {
-    console.log('⚠ SKIP_DUNE=true: Will skip Dune backfill and use database aggregation only\n');
-  }
-  if (recentDays) {
-    console.log(`⚠ RECENT_DAYS=${recentDays}: Will only backfill last ${recentDays} days from Dune\n`);
-  }
-
-  // Initialize services
-  const databaseService = new DatabaseService();
-  const duneService = new DuneService();
-  const futarchyService = new FutarchyService();
-  const tenMinuteService = new TenMinuteVolumeFetcherService(duneService, databaseService, futarchyService);
-
-  try {
-    // 1. Connect to database
-    console.log('1. Connecting to database...');
-    const dbConnected = await databaseService.initialize();
-    if (!dbConnected) {
-      console.error('Failed to connect to database');
-      process.exit(1);
-    }
-    console.log('✓ Database connected\n');
-
-    // 2. Check for existing 10-minute records with missing extended fields
-    console.log('2. Checking for records with missing extended fields...');
-    if (!databaseService.pool) {
-      console.error('Database pool not available');
-      process.exit(1);
-    }
-
-    const missingFieldsCheck = await databaseService.pool.query(`
-      SELECT 
-        COUNT(*) as total_records,
-        COUNT(CASE WHEN average_price IS NULL OR average_price = 0 THEN 1 END) as missing_average_price,
-        MIN(bucket) as earliest_bucket,
-        MAX(bucket) as latest_bucket
-      FROM ten_minute_volumes
-    `);
-
-    const stats = missingFieldsCheck.rows[0];
-    console.log(`   Total 10-minute records: ${stats.total_records}`);
-    console.log(`   Missing average_price (needs backfill): ${stats.missing_average_price}`);
-    console.log(`   Date range: ${stats.earliest_bucket} to ${stats.latest_bucket}\n`);
-
-    if (parseInt(stats.missing_average_price) === 0) {
-      console.log('✓ All 10-minute records already have extended fields\n');
-    } else if (skipDune) {
-      console.log('3. Skipping Dune backfill (SKIP_DUNE=true)\n');
-      console.log('   Will use database aggregation to fill missing fields in hourly/daily tables\n');
-    } else {
-      // 3. Find the earliest missing average_price date
-      console.log('3. Finding earliest missing average_price date...');
-      
-      const earliestMissingResult = await databaseService.pool.query(`
-        SELECT MIN(bucket) as earliest_missing
-        FROM ten_minute_volumes
-        WHERE (average_price IS NULL OR average_price = 0)
-      `);
-
-      const earliestMissing = earliestMissingResult.rows[0].earliest_missing;
-      
-      if (!earliestMissing) {
-        console.log('   ✓ No missing average_price records found\n');
-      } else {
-        // Use the earliest missing date as start, but truncate to beginning of day
-        let startDate = new Date(earliestMissing);
-        startDate.setHours(0, 0, 0, 0);
-        
-        // Apply RECENT_DAYS filter if set
-        if (recentDays) {
-          const cutoffDate = new Date();
-          cutoffDate.setDate(cutoffDate.getDate() - recentDays);
-          cutoffDate.setHours(0, 0, 0, 0);
-          if (cutoffDate > startDate) {
-            startDate = cutoffDate;
-            console.log(`   Using RECENT_DAYS=${recentDays} filter: starting from ${startDate.toISOString().split('T')[0]}\n`);
-          } else {
-            console.log(`   Starting from earliest missing date: ${startDate.toISOString().split('T')[0]}\n`);
-          }
-        } else {
-          console.log(`   Starting from earliest missing date: ${startDate.toISOString().split('T')[0]}\n`);
-        }
-
-        // 4. Get specific buckets that need backfilling
-        console.log('4. Identifying specific buckets that need backfilling...');
-        
-        const dateFilter = `AND bucket >= '${startDate.toISOString()}'`;
-
-        const missingBucketsResult = await databaseService.pool.query(`
-          SELECT DISTINCT 
-            date_trunc('day', bucket)::DATE as date,
-            COUNT(*) as missing_count
-          FROM ten_minute_volumes
-          WHERE (average_price IS NULL OR average_price = 0)
-            ${dateFilter}
-          GROUP BY date_trunc('day', bucket)::DATE
-          ORDER BY date_trunc('day', bucket)::DATE ASC
-        `);
-
-        const missingDays = missingBucketsResult.rows;
-        console.log(`   Found ${missingDays.length} days with missing extended fields\n`);
-
-        if (missingDays.length === 0) {
-          console.log('✓ No days need backfilling\n');
-        } else {
-          // Show summary
-          const totalMissing = missingDays.reduce((sum, day) => sum + parseInt(day.missing_count), 0);
-          console.log(`   Total buckets needing backfill: ${totalMissing}`);
-          if (missingDays.length > 0) {
-            console.log(`   Date range: ${missingDays[0].date} to ${missingDays[missingDays.length - 1].date}\n`);
-          }
-
-          // Warn if too many days
-          if (missingDays.length > 30 && !recentDays) {
-            console.log(`⚠ WARNING: ${missingDays.length} days need backfilling. This may use significant Dune datapoints.`);
-            console.log(`   Options:`);
-            console.log(`   - Set RECENT_DAYS=30 to only backfill last 30 days`);
-            console.log(`   - Set SKIP_DUNE=true to skip Dune and use DB aggregation only`);
-            console.log(`   - Check your Dune subscription limits\n`);
-          }
-
-          // Backfill in 7-day increments (1008 buckets per chunk = 7 days * 24 hours * 6 buckets/hour)
-          console.log('5. Backfilling 10-minute records from Dune (7-day chunks)...');
-          console.log(`   Processing ${missingDays.length} days in 7-day increments (1008 buckets per chunk)...\n`);
-
-        let totalBackfilled = 0;
-        let totalUpdated = 0;
-        let errors = 0;
-        let apiLimitHit = false;
-
-        // Group days into 7-day chunks
-        const chunkSize = 7;
-        const chunks: Array<{ startDate: Date; endDate: Date; days: any[] }> = [];
-        
-        for (let i = 0; i < missingDays.length; i += chunkSize) {
-          const chunkDays = missingDays.slice(i, i + chunkSize);
-          const startDate = new Date(chunkDays[0].date);
-          startDate.setHours(0, 0, 0, 0);
-          
-          const endDate = new Date(chunkDays[chunkDays.length - 1].date);
-          endDate.setHours(23, 59, 59, 999);
-          endDate.setDate(endDate.getDate() + 1); // Exclusive end (start of next day)
-          
-          chunks.push({ startDate, endDate, days: chunkDays });
-        }
-
-        // Process chunks in chronological order (oldest first)
-        for (let chunkIdx = 0; chunkIdx < chunks.length; chunkIdx++) {
-          const chunk = chunks[chunkIdx];
-          const startTime = chunk.startDate.toISOString().replace('T', ' ').replace('Z', '').slice(0, 19);
-          const endTime = chunk.endDate.toISOString().replace('T', ' ').replace('Z', '').slice(0, 19);
-          
-          const totalMissingInChunk = chunk.days.reduce((sum, day) => sum + parseInt(day.missing_count), 0);
-          const dayRange = `${chunk.days[0].date} to ${chunk.days[chunk.days.length - 1].date}`;
-
-          console.log(`   [${chunkIdx + 1}/${chunks.length}] ${dayRange} (${totalMissingInChunk} missing buckets across ${chunk.days.length} days)...`);
-          
-          try {
-            // Fetch 7-day chunk from Dune with explicit start_time and end_time (will only update missing fields)
-            const count = await tenMinuteService.backfillExtendedFields(startTime, endTime);
-            if (count > 0) {
-              totalUpdated += count;
-              console.log(`      ✓ Updated ${count} records`);
-            } else {
-              console.log(`      - Skipped (no missing fields)`);
-            }
-
-            totalBackfilled++;
-            
-            // Add delay between chunks to avoid rate limits (3 seconds between 7-day chunks)
-            if (chunkIdx < chunks.length - 1) {
-              await new Promise(resolve => setTimeout(resolve, 3000));
-            }
-          } catch (error: any) {
-            errors++;
-            if (error.message.includes('402') || error.message.includes('Payment Required')) {
-              apiLimitHit = true;
-              console.error(`\n      ✗ Dune API limit reached!`);
-              console.error(`\n   Processed ${totalBackfilled} chunks (${totalBackfilled * 7} days), updated ${totalUpdated} records before limit.`);
-              console.error(`\n   Options to continue:`);
-              console.error(`   1. Wait for your Dune billing cycle to reset`);
-              console.error(`   2. Upgrade your Dune subscription`);
-              console.error(`   3. Run with SKIP_DUNE=true to use database aggregation only:`);
-              console.error(`      SKIP_DUNE=true bun run scripts/backfillExtendedFields.ts`);
-              console.error(`   4. Resume later - script will skip already-filled records`);
-              console.error(`\n   Note: New data will automatically include extended fields going forward.\n`);
-              break;
-            } else {
-              console.error(`      ✗ Error: ${error.message}`);
-              // Continue with next chunk on non-limit errors
-            }
-          }
-
-          if (apiLimitHit) break;
-        }
-
-        if (!apiLimitHit) {
-          console.log(`\n✓ Backfilled ${totalBackfilled} chunks from Dune`);
-          console.log(`  Total records updated: ${totalUpdated}`);
-          if (errors > 0) {
-            console.log(`  Errors encountered: ${errors}`);
-          }
-          console.log('');
-        } else {
-          console.log('\n⚠ Backfill incomplete due to API limits. See options above.\n');
-        }
-      }
-      }
-    }
-
-    // 6. Run database aggregation backfill (always run this - it's free, no Dune calls)
-    console.log('6. Running database aggregation backfill...');
-    console.log('   (This aggregates from existing 10-minute data - no Dune API calls)\n');
-    const backfillResults = await databaseService.backfillMissingFields();
-    console.log(`   Updated hourly records: ${backfillResults.hourlyUpdated}`);
-    console.log(`   Updated daily records: ${backfillResults.dailyUpdated}\n`);
-    
-    if (backfillResults.hourlyUpdated > 0 || backfillResults.dailyUpdated > 0) {
-      console.log('   ✓ Database aggregation completed - hourly/daily records now have extended fields\n');
-    } else {
-      console.log('   ✓ No hourly/daily records needed updating\n');
-    }
-
-    // 7. Verify final state
-    console.log('7. Verifying final state...');
-    const finalCheck = await databaseService.pool.query(`
-      SELECT 
-        COUNT(*) as total_records,
-        COUNT(CASE WHEN average_price IS NULL OR average_price = 0 THEN 1 END) as missing_average_price
-      FROM ten_minute_volumes
-    `);
-
-    const finalStats = finalCheck.rows[0];
-    console.log(`   Total 10-minute records: ${finalStats.total_records}`);
-    console.log(`   Still missing average_price: ${finalStats.missing_average_price}\n`);
-
-    if (parseInt(finalStats.missing_average_price) === 0) {
-      console.log('✓ All records now have extended fields!\n');
-    } else {
-      console.log('⚠ Some records still missing fields (may need additional backfill)\n');
-    }
-
-    console.log('=== Backfill Completed ===');
-    process.exit(0);
-  } catch (error: any) {
-    console.error('Error during backfill:', error);
-    console.error(error.stack);
-    process.exit(1);
-  }
-}
-
-// Run the backfill
-backfillExtendedFields();
diff --git a/scripts/backfillMeteoraVolumes.ts b/scripts/backfillMeteoraVolumes.ts
deleted file mode 100644
index a7de7a1..0000000
--- a/scripts/backfillMeteoraVolumes.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- * Backfill Script for Meteora Daily Volumes
- * 
- * This script backfills historical Meteora pool fee data from Dune.
- * It fetches data from 2025-10-09 to present and stores it in the database.
- * Processes data in chunks to avoid API limits.
- * 
- * Usage: 
- *   bun run scripts/backfillMeteoraVolumes.ts
- *   RECENT_DAYS=7 bun run scripts/backfillMeteoraVolumes.ts   # Only backfill last 7 days
- *   CHUNK_DAYS=30 bun run scripts/backfillMeteoraVolumes.ts   # Use 30-day chunks (default: 30)
- *
- * Chunk skipping (METEORA_BACKFILL_SKIP_CHUNKS):
- *   coverage (default) — skip a chunk only if DB already has rows for every mapped token in that date range (adds missing tokens after you extend the map + Dune query).
- *   any — skip whenever any row exists in the chunk (legacy; misses new tokens in already-filled ranges).
- *   never — always call Dune (idempotent upserts; highest Dune usage).
- */
-
-import { DatabaseService } from '../src/services/databaseService.js';
-import { DuneService } from '../src/services/duneService.js';
-import { MeteoraVolumeFetcherService } from '../src/services/meteoraVolumeFetcherService.js';
-import { getAllMappedTokens } from '../src/services/meteoraService.js';
-import { config } from '../src/config.js';
-
-/** Chunk skip behavior: avoid re-querying Dune when data already exists. */
-type ChunkSkipMode = 'coverage' | 'any' | 'never';
-
-function parseChunkSkipMode(raw: string | undefined): ChunkSkipMode {
-  if (raw === 'any' || raw === 'never' || raw === 'coverage') {
-    return raw;
-  }
-  return 'coverage';
-}
-
-/**
- * Helper to add days to a date
- */
-function addDays(date: Date, days: number): Date {
-  const result = new Date(date);
-  result.setDate(result.getDate() + days);
-  return result;
-}
-
-/**
- * Helper to format date as YYYY-MM-DD
- */
-function formatDate(date: Date): string {
-  return date.toISOString().split('T')[0]!;
-}
-
-/**
- * Generate date chunks for backfilling
- */
-function generateDateChunks(startDate: Date, endDate: Date, chunkDays: number): Array<{ start: Date; end: Date }> {
-  const chunks: Array<{ start: Date; end: Date }> = [];
-  let currentStart = new Date(startDate);
-
-  while (currentStart < endDate) {
-    const currentEnd = new Date(currentStart);
-    currentEnd.setDate(currentEnd.getDate() + chunkDays - 1);
-    
-    // Don't go past the end date
-    if (currentEnd > endDate) {
-      currentEnd.setTime(endDate.getTime());
-    }
-
-    chunks.push({
-      start: new Date(currentStart),
-      end: new Date(currentEnd),
-    });
-
-    // Move to next chunk
-    currentStart = addDays(currentEnd, 1);
-  }
-
-  return chunks;
-}
-
-async function backfillMeteoraVolumes() {
-  console.log('=== Starting Meteora Volumes Backfill ===\n');
-
-  // Check environment variables for options
-  const recentDays = process.env.RECENT_DAYS ? parseInt(process.env.RECENT_DAYS) : null;
-  const chunkDays = process.env.CHUNK_DAYS ? parseInt(process.env.CHUNK_DAYS) : 30; // Default: 30-day chunks
-  const chunkSkipMode = parseChunkSkipMode(process.env.METEORA_BACKFILL_SKIP_CHUNKS);
-  const expectedTokens = getAllMappedTokens();
-
-  if (recentDays) {
-    console.log(`⚠ RECENT_DAYS=${recentDays}: Will only backfill last ${recentDays} days\n`);
-  }
-  console.log(`📦 Using ${chunkDays}-day chunks to avoid API limits`);
-  console.log(`   Mapped Meteora tokens: ${expectedTokens.length} (${chunkSkipMode} chunk skip)\n`);
-
-  // Initialize services
-  const databaseService = new DatabaseService();
-  const duneService = new DuneService();
-  const meteoraService = new MeteoraVolumeFetcherService(duneService, databaseService);
-
-  try {
-    // 1. Connect to database
-    console.log('1. Connecting to database...');
-    const dbConnected = await databaseService.initialize();
-    if (!dbConnected) {
-      console.error('Failed to connect to database');
-      process.exit(1);
-    }
-    console.log('✓ Database connected\n');
-
-    // 2. Check for existing records
-    console.log('2. Checking for existing records...');
-    if (!databaseService.pool) {
-      console.error('Database pool not available');
-      process.exit(1);
-    }
-
-    const existingCheck = await databaseService.pool.query(`
-      SELECT 
-        COUNT(*) as total_records,
-        MIN(date) as earliest_date,
-        MAX(date) as latest_date
-      FROM daily_meteora_volumes
-    `);
-
-    const stats = existingCheck.rows[0];
-    console.log(`   Total records: ${stats.total_records}`);
-    console.log(`   Date range: ${stats.earliest_date || 'N/A'} to ${stats.latest_date || 'N/A'}\n`);
-
-    // 3. Determine date range
-    const launchDate = new Date('2025-10-09');
-    const today = new Date();
-    today.setHours(0, 0, 0, 0);
-    
-    let actualStartDate = new Date(launchDate);
-    let actualEndDate = new Date(today);
-
-    if (recentDays) {
-      const cutoffDate = new Date();
-      cutoffDate.setDate(cutoffDate.getDate() - recentDays);
-      cutoffDate.setHours(0, 0, 0, 0);
-      if (cutoffDate > launchDate) {
-        actualStartDate = cutoffDate;
-        console.log(`   Limiting to last ${recentDays} days (since ${formatDate(actualStartDate)})\n`);
-      } else {
-        console.log(`   Starting from ${formatDate(launchDate)} (launch date)\n`);
-      }
-    } else {
-      console.log(`   Date range: ${formatDate(actualStartDate)} to ${formatDate(actualEndDate)}\n`);
-    }
-
-    // 4. Check if query ID is configured
-    if (!config.dune.meteoraVolumeQueryId) {
-      console.error('❌ DUNE_METEORA_VOLUME_QUERY_ID not configured');
-      console.error('   Please set DUNE_METEORA_VOLUME_QUERY_ID in your .env file');
-      process.exit(1);
-    }
-
-    console.log(`3. Using Dune query ID: ${config.dune.meteoraVolumeQueryId}\n`);
-
-    // 5. Skip service initialization to avoid automatic backfill
-    // The backfill script handles chunked fetching manually
-    console.log('4. Ready to process chunks (skipping service auto-initialization)\n');
-
-    // 6. Generate date chunks
-    console.log('5. Generating date chunks...');
-    const chunks = generateDateChunks(actualStartDate, actualEndDate, chunkDays);
-    console.log(`   Generated ${chunks.length} chunks of ${chunkDays} days each\n`);
-
-    // 7. Process chunks
-    console.log('6. Processing chunks from Dune...\n');
-    let totalRecords = 0;
-    let processedChunks = 0;
-    let errors = 0;
-    let apiLimitHit = false;
-
-    for (let chunkIdx = 0; chunkIdx < chunks.length; chunkIdx++) {
-      const chunk = chunks[chunkIdx]!;
-      const chunkStart = formatDate(chunk.start);
-      const chunkEnd = formatDate(chunk.end);
-      
-      console.log(`   [${chunkIdx + 1}/${chunks.length}] Processing ${chunkStart} to ${chunkEnd}...`);
-
-      try {
-        if (chunkSkipMode !== 'never') {
-          if (chunkSkipMode === 'any') {
-            const existingCheck = await databaseService.pool!.query(
-              `
-              SELECT COUNT(*)::int AS count
-              FROM daily_meteora_volumes
-              WHERE date >= $1 AND date <= $2
-            `,
-              [chunkStart, chunkEnd],
-            );
-
-            const existingCount = Number(existingCheck.rows[0]!.count);
-            if (existingCount > 0) {
-              console.log(`      ⏭️  Skipping (${existingCount} records already exist, skip mode=any)`);
-              processedChunks++;
-              continue;
-            }
-          } else {
-            const coverageCheck = await databaseService.pool!.query(
-              `
-              SELECT COUNT(*)::int AS distinct_tokens
-              FROM (
-                SELECT DISTINCT token
-                FROM daily_meteora_volumes
-                WHERE date >= $1 AND date <= $2
-                  AND token = ANY($3::varchar[])
-              ) t
-            `,
-              [chunkStart, chunkEnd, expectedTokens],
-            );
-
-            const distinctInChunk = Number(coverageCheck.rows[0]!.distinct_tokens);
-            if (distinctInChunk >= expectedTokens.length) {
-              console.log(
-                `      ⏭️  Skipping (${distinctInChunk}/${expectedTokens.length} mapped tokens present in range, skip mode=coverage)`,
-              );
-              processedChunks++;
-              continue;
-            }
-            if (distinctInChunk > 0) {
-              console.log(`      Refetch (${distinctInChunk}/${expectedTokens.length} mapped tokens in range — filling gaps)`);
-            }
-          }
-        }
-
-        // Fetch chunk from Dune
-        const recordsUpserted = await meteoraService.fetchDateRange(chunkStart, chunkEnd);
-        
-        if (recordsUpserted > 0) {
-          totalRecords += recordsUpserted;
-          console.log(`      ✓ Fetched and stored ${recordsUpserted} records`);
-        } else {
-          console.log(`      - No new records for this chunk`);
-        }
-
-        processedChunks++;
-        
-        // Add delay between chunks to avoid rate limits (3 seconds between chunks)
-        if (chunkIdx < chunks.length - 1) {
-          await new Promise(resolve => setTimeout(resolve, 3000));
-        }
-      } catch (error: any) {
-        errors++;
-        if (error.message?.includes('402') || error.message?.includes('Payment Required')) {
-          apiLimitHit = true;
-          console.error(`\n      ✗ Dune API limit reached!`);
-          console.error(`\n   Processed ${processedChunks} chunks, fetched ${totalRecords} records before limit.`);
-          console.error(`\n   Options to continue:`);
-          console.error(`   1. Wait for your Dune billing cycle to reset`);
-          console.error(`   2. Upgrade your Dune subscription`);
-          console.error(`   3. Resume later - with METEORA_BACKFILL_SKIP_CHUNKS=coverage (default), chunks skip only when every mapped token exists in that date range`);
-          console.error(`\n   Run the script again to resume; use METEORA_BACKFILL_SKIP_CHUNKS=never to force re-querying all chunks.\n`);
-          break;
-        } else {
-          console.error(`      ✗ Error: ${error.message}`);
-          // Continue with next chunk on non-limit errors
-        }
-      }
-
-      if (apiLimitHit) break;
-    }
-
-    if (!apiLimitHit) {
-      console.log(`\n✓ Backfill completed successfully`);
-      console.log(`   Processed ${processedChunks}/${chunks.length} chunks`);
-      console.log(`   Total records fetched: ${totalRecords}`);
-    } else {
-      console.log(`\n⚠ Backfill partially completed`);
-      console.log(`   Processed ${processedChunks}/${chunks.length} chunks`);
-      console.log(`   Total records fetched: ${totalRecords}`);
-      console.log(`   Run the script again to continue from where it left off.`);
-    }
-
-    if (errors > 0 && !apiLimitHit) {
-      console.log(`\n⚠ Completed with ${errors} error(s) (non-fatal)`);
-    }
-
-    // 8. Verify final state
-    console.log('\n7. Verifying final state...');
-    const finalCheck = await databaseService.pool.query(`
-      SELECT 
-        COUNT(*) as total_records,
-        MIN(date) as earliest_date,
-        MAX(date) as latest_date,
-        COUNT(DISTINCT token) as unique_tokens
-      FROM daily_meteora_volumes
-    `);
-
-    const finalStats = finalCheck.rows[0];
-    console.log(`   Total records: ${finalStats.total_records}`);
-    console.log(`   Date range: ${finalStats.earliest_date || 'N/A'} to ${finalStats.latest_date || 'N/A'}`);
-    console.log(`   Unique tokens: ${finalStats.unique_tokens}\n`);
-
-    console.log('=== Backfill Completed ===');
-    process.exit(0);
-  } catch (error: any) {
-    console.error('Error during backfill:', error);
-    console.error(error.stack);
-    process.exit(1);
-  }
-}
-
-// Run the backfill
-backfillMeteoraVolumes();
diff --git a/scripts/backfillV06.ts b/scripts/backfillV06.ts
deleted file mode 100644
index 65a8e5b..0000000
--- a/scripts/backfillV06.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bun
-/**
- * v0.6 Backfill — pull historical data from the external indexer DB
- * into the app DB's v06_* tables.
- *
- * Usage:
- *   bun run scripts/backfillV06.ts                   # backfill everything (default since 2025-01-01)
- *   bun run scripts/backfillV06.ts --since 2025-06-01
- *   bun run scripts/backfillV06.ts --days 90          # last 90 days
- *
- * Speed tips:
- *   - Only need fee / aggregate tables? Use `bun run scripts/backfillV06Fees.ts`
- *     (skips OHLCV 1m/1d — usually much faster).
- *   - After 1m, reconciliation runs daily rollup + spot fees + conditional fees
- *     in parallel on the app DB / indexer pools.
- *   - For huge date ranges, `--chunk-days` avoids one enormous indexer scan
- *     (can help with memory/timeouts; total work is similar).
- *
- * Required env:
- *   DATABASE_URL            (or COINGECKO_PG_URL) — app DB (read-write)
- *   EXTERNAL_DATABASE_URL   — indexer DB (read-only)
- */
-
-import { parseArgs } from 'util';
-
-async function main() {
-  // ---- CLI args ----
-  const { values } = parseArgs({
-    options: {
-      since:        { type: 'string',  short: 's' },
-      days:         { type: 'string',  short: 'd' },
-      'chunk-days': { type: 'string',  short: 'c' },
-    },
-    strict: false,
-  });
-
-  let since: Date;
-  if (values.since) {
-    since = new Date(values.since as string);
-  } else if (values.days) {
-    since = new Date(Date.now() - Number(values.days) * 86_400_000);
-  } else {
-    since = new Date('2025-01-01T00:00:00Z');
-  }
-
-  const chunkDays = values['chunk-days'] ? Number(values['chunk-days']) : 0;
-
-  console.log('🚀 v0.6 Backfill');
-  console.log(`   Since:      ${since.toISOString()}`);
-  console.log(`   Chunk days: ${chunkDays || 'none (single pass)'}`);
-  console.log('');
-
-  // ---- env checks ----
-  if (!process.env.DATABASE_URL && !process.env.COINGECKO_PG_URL) {
-    console.error('❌ DATABASE_URL (or COINGECKO_PG_URL) is required');
-    process.exit(1);
-  }
-  if (!process.env.EXTERNAL_DATABASE_URL) {
-    console.error('❌ EXTERNAL_DATABASE_URL is required');
-    process.exit(1);
-  }
-
-  // ---- init services ----
-  const { DatabaseService } = await import('../src/services/databaseService');
-  const { ExternalDatabaseService } = await import('../src/services/externalDatabaseService');
-  const { V06ReconciliationService } = await import('../src/services/v06ReconciliationService');
-
-  const appDb = new DatabaseService();
-  const extDb = new ExternalDatabaseService();
-
-  const dbOk = await appDb.initialize();
-  if (!dbOk) {
-    console.error('❌ Failed to connect to app database');
-    process.exit(1);
-  }
-  console.log('✅ App DB connected');
-
-  const extOk = await extDb.initialize();
-  if (!extOk) {
-    console.error('❌ Failed to connect to external indexer database');
-    await appDb.close();
-    process.exit(1);
-  }
-  console.log('✅ External DB connected');
-
-  const reconciler = new V06ReconciliationService(appDb, extDb);
-
-  try {
-    const totalStart = Date.now();
-
-    if (chunkDays > 0) {
-      // ---- chunked backfill ----
-      const chunkMs = chunkDays * 86_400_000;
-      let cursor = new Date(since);
-      const now = new Date();
-      const totalChunks = Math.ceil((now.getTime() - cursor.getTime()) / chunkMs);
-      let chunkNum = 0;
-
-      while (cursor < now) {
-        chunkNum++;
-        const chunkStart = Date.now();
-        const chunkEnd = new Date(Math.min(cursor.getTime() + chunkMs, now.getTime()));
-        console.log(`\n📦 Chunk ${chunkNum}/${totalChunks}: ${cursor.toISOString()} → ${chunkEnd.toISOString()}`);
-        await reconciler.reconcile(cursor, chunkEnd);
-        cursor = chunkEnd;
-        const chunkElapsed = ((Date.now() - chunkStart) / 1000).toFixed(1);
-        const totalElapsed = ((Date.now() - totalStart) / 1000).toFixed(1);
-        const remaining = totalChunks - chunkNum;
-        const avgPerChunk = (Date.now() - totalStart) / chunkNum / 1000;
-        const eta = remaining > 0 ? `~${(remaining * avgPerChunk / 60).toFixed(1)} min` : 'done';
-        console.log(`   ✓ Chunk ${chunkNum} done in ${chunkElapsed}s (total: ${totalElapsed}s, remaining: ${remaining} chunks, ETA: ${eta})`);
-      }
-    } else {
-      // ---- single pass ----
-      console.log('\n⏳ Running single-pass reconciliation (this may take a while)...');
-      await reconciler.reconcile(since);
-    }
-
-    const totalElapsed = ((Date.now() - totalStart) / 1000).toFixed(1);
-    console.log(`\n✅ Backfill complete in ${totalElapsed}s!`);
-  } catch (error: any) {
-    console.error('❌ Backfill failed:', error.message || error);
-    process.exit(1);
-  } finally {
-    await extDb.close();
-    await appDb.close();
-  }
-}
-
-main().catch(console.error);
diff --git a/scripts/backfillV06Fees.ts b/scripts/backfillV06Fees.ts
deleted file mode 100644
index fd37806..0000000
--- a/scripts/backfillV06Fees.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env bun
-/**
- * v0.6 Fee-only Backfill — re-calculates fee volume daily tables
- * (spot, conditional, aggregate) without touching OHLCV data.
- *
- * Usage:
- *   bun run scripts/backfillV06Fees.ts                   # default since 2025-01-01
- *   bun run scripts/backfillV06Fees.ts --since 2025-06-01
- *   bun run scripts/backfillV06Fees.ts --days 90
- *   bun run scripts/backfillV06Fees.ts --chunk-days 30
- *
- * Spot and conditional fee queries run in parallel against the indexer,
- * then the aggregate step runs once.
- */
-
-import { parseArgs } from 'util';
-
-async function main() {
-  const { values } = parseArgs({
-    options: {
-      since:        { type: 'string',  short: 's' },
-      days:         { type: 'string',  short: 'd' },
-      'chunk-days': { type: 'string',  short: 'c' },
-    },
-    strict: false,
-  });
-
-  let since: Date;
-  if (values.since) {
-    since = new Date(values.since as string);
-  } else if (values.days) {
-    since = new Date(Date.now() - Number(values.days) * 86_400_000);
-  } else {
-    since = new Date('2025-01-01T00:00:00Z');
-  }
-
-  const chunkDays = values['chunk-days'] ? Number(values['chunk-days']) : 0;
-
-  console.log('🚀 v0.6 Fee-only Backfill');
-  console.log(`   Since:      ${since.toISOString()}`);
-  console.log(`   Chunk days: ${chunkDays || 'none (single pass)'}`);
-  console.log('');
-
-  if (!process.env.DATABASE_URL && !process.env.COINGECKO_PG_URL) {
-    console.error('❌ DATABASE_URL (or COINGECKO_PG_URL) is required');
-    process.exit(1);
-  }
-  if (!process.env.EXTERNAL_DATABASE_URL) {
-    console.error('❌ EXTERNAL_DATABASE_URL is required');
-    process.exit(1);
-  }
-
-  const { DatabaseService } = await import('../src/services/databaseService');
-  const { ExternalDatabaseService } = await import('../src/services/externalDatabaseService');
-  const { V06ReconciliationService } = await import('../src/services/v06ReconciliationService');
-
-  const appDb = new DatabaseService();
-  const extDb = new ExternalDatabaseService();
-
-  const dbOk = await appDb.initialize();
-  if (!dbOk) { console.error('❌ Failed to connect to app DB'); process.exit(1); }
-  console.log('✅ App DB connected');
-
-  const extOk = await extDb.initialize();
-  if (!extOk) { console.error('❌ Failed to connect to external DB'); await appDb.close(); process.exit(1); }
-  console.log('✅ External DB connected');
-
-  const reconciler = new V06ReconciliationService(appDb, extDb);
-
-  try {
-    const totalStart = Date.now();
-
-    if (chunkDays > 0) {
-      const chunkMs = chunkDays * 86_400_000;
-      let cursor = new Date(since);
-      const now = new Date();
-      const totalChunks = Math.ceil((now.getTime() - cursor.getTime()) / chunkMs);
-      let chunkNum = 0;
-
-      while (cursor < now) {
-        chunkNum++;
-        const chunkStart = Date.now();
-        const chunkEnd = new Date(Math.min(cursor.getTime() + chunkMs, now.getTime()));
-        console.log(`\n📦 Chunk ${chunkNum}/${totalChunks}: ${cursor.toISOString()} → ${chunkEnd.toISOString()}`);
-        await reconciler.reconcileFeesOnly(cursor, chunkEnd);
-        cursor = chunkEnd;
-        const chunkElapsed = ((Date.now() - chunkStart) / 1000).toFixed(1);
-        const totalElapsed = ((Date.now() - totalStart) / 1000).toFixed(1);
-        const remaining = totalChunks - chunkNum;
-        const avgPerChunk = (Date.now() - totalStart) / chunkNum / 1000;
-        const eta = remaining > 0 ? `~${(remaining * avgPerChunk / 60).toFixed(1)} min` : 'done';
-        console.log(`   ✓ Chunk ${chunkNum} done in ${chunkElapsed}s (total: ${totalElapsed}s, remaining: ${remaining} chunks, ETA: ${eta})`);
-      }
-    } else {
-      console.log('\n⏳ Running single-pass fee reconciliation...');
-      await reconciler.reconcileFeesOnly(since);
-    }
-
-    const totalElapsed = ((Date.now() - totalStart) / 1000).toFixed(1);
-    console.log(`\n✅ Fee backfill complete in ${totalElapsed}s!`);
-  } catch (error: any) {
-    console.error('❌ Fee backfill failed:', error.message || error);
-    process.exit(1);
-  } finally {
-    await extDb.close();
-    await appDb.close();
-  }
-}
-
-main().catch(console.error);
diff --git a/scripts/compareDuneVsV06.ts b/scripts/compareDuneVsV06.ts
deleted file mode 100644
index b9a5fea..0000000
--- a/scripts/compareDuneVsV06.ts
+++ /dev/null
@@ -1,382 +0,0 @@
-#!/usr/bin/env bun
-/**
- * Compare Dune-sourced daily_volumes against v06_fee_volume_daily_aggregate
- * to identify divergences per token/day.
- *
- * Usage:
- *   bun run scripts/compareDuneVsV06.ts                         # default last 90 days
- *   bun run scripts/compareDuneVsV06.ts --since 2025-01-01
- *   bun run scripts/compareDuneVsV06.ts --days 30
- *   bun run scripts/compareDuneVsV06.ts --days 30 --token META
- *   bun run scripts/compareDuneVsV06.ts --threshold 5           # flag rows with >5% delta (default: 1%)
- *   bun run scripts/compareDuneVsV06.ts --basis total             # compare Dune to v06 total_* (spot+conditional; expect gaps)
- *
- * Basis:
- *   spot (default) — Dune daily_volumes is spot-only; compared to v06 spot_* columns (apples to apples).
- *   total          — compared to v06 total_*; divergences are normal when conditional volume exists.
- *
- * Units:
- *   daily_volumes (Dune path) stores human-scale amounts (/ 1e6 in Dune SQL).
- *   v06_fee_volume_* stores raw on-chain amounts (6 decimals). This script divides
- *   v06 volumes and fee columns by 1e6 before comparing so the delta is meaningful.
- *
- * Required env:
- *   DATABASE_URL (or COINGECKO_PG_URL)
- */
-
-import 'dotenv/config';
-import { parseArgs } from 'util';
-
-// ---- types ----
-
-interface ComparisonRow {
-  token: string;
-  date: string;
-  // Dune (daily_volumes)
-  dune_buy_volume: number;
-  dune_sell_volume: number;
-  dune_base_volume: number;
-  dune_target_volume: number;
-  dune_trade_count: number;
-  dune_usdc_fees: number;
-  dune_token_fees_usdc: number;
-  // v06 aggregate (spot_* or total_* depending on --basis)
-  v06_buy_volume: number;
-  v06_sell_volume: number;
-  v06_base_volume: number;
-  v06_target_volume: number;
-  v06_trade_count: number;
-  v06_usdc_fees: number;
-  v06_token_fees_usdc: number;
-  // flags
-  has_conditional_volume: boolean;
-  conditional_reconciled: boolean;
-  // source presence
-  in_dune: boolean;
-  in_v06: boolean;
-}
-
-interface DivergenceReport {
-  token: string;
-  date: string;
-  field: string;
-  dune_value: number;
-  v06_value: number;
-  delta: number;
-  delta_pct: number;
-  has_conditional_volume: boolean;
-  conditional_reconciled: boolean;
-}
-
-// ---- main ----
-
-type CompareBasis = 'spot' | 'total';
-
-/** v0.6 indexer + reconciliation use raw token amounts (6 dp); Dune daily_volumes uses /1e6. */
-const V06_TO_HUMAN_DIVISOR = 1_000_000;
-
-async function main() {
-  const { values } = parseArgs({
-    options: {
-      since:              { type: 'string',  short: 's' },
-      days:               { type: 'string',  short: 'd' },
-      token:              { type: 'string',  short: 't' },
-      threshold:          { type: 'string',  short: 'p' },
-      basis:              { type: 'string',  short: 'b' },
-    },
-    strict: false,
-  });
-
-  let since: Date;
-  if (values.since) {
-    since = new Date(values.since as string);
-  } else if (values.days) {
-    since = new Date(Date.now() - Number(values.days) * 86_400_000);
-  } else {
-    since = new Date(Date.now() - 90 * 86_400_000);
-  }
-
-  const thresholdPct = values.threshold ? Number(values.threshold) : 1;
-  const tokenFilter = values.token as string | undefined;
-  const basisRaw = (values.basis as string | undefined)?.toLowerCase();
-  const basis: CompareBasis = basisRaw === 'total' ? 'total' : 'spot';
-
-  console.log('🔍 Dune vs v06 Comparison');
-  console.log(`   Since:      ${since.toISOString().slice(0, 10)}`);
-  console.log(`   Token:      ${tokenFilter || 'all'}`);
-  console.log(`   Threshold:  ${thresholdPct}%`);
-  console.log(`   Basis:      ${basis} (v06 ${basis === 'spot' ? 'spot_* ↔ Dune spot-only' : 'total_* includes conditional — gaps vs Dune expected'})`);
-  console.log(`   v06 scale:  volumes/fees ÷ ${V06_TO_HUMAN_DIVISOR} (raw 6dp → match Dune)`);
-  console.log('');
-
-  // ---- connect ----
-  const { DatabaseService } = await import('../src/services/databaseService');
-  const db = new DatabaseService();
-  const ok = await db.initialize();
-  if (!ok) {
-    console.error('❌ Failed to connect to database');
-    process.exit(1);
-  }
-  console.log('✅ DB connected\n');
-
-  try {
-    // ---- run comparison query ----
-    const rows = await runComparison(db, since, tokenFilter, basis);
-    const divergences = findDivergences(rows, thresholdPct);
-
-    printSummary(rows, divergences, thresholdPct);
-    printMissingDays(rows);
-    printDivergences(divergences);
-  } finally {
-    await db.close();
-  }
-}
-
-// ---- SQL comparison: FULL OUTER JOIN daily_volumes ↔ v06_fee_volume_daily_aggregate ----
-
-async function runComparison(
-  db: any,
-  since: Date,
-  tokenFilter: string | undefined,
-  basis: CompareBasis,
-): Promise<ComparisonRow[]> {
-  const params: any[] = [since.toISOString().slice(0, 10)];
-  if (tokenFilter) {
-    params.push(tokenFilter);
-  }
-
-  const v06Cols =
-    basis === 'total'
-      ? {
-          buy: 'v.total_buy_volume',
-          sell: 'v.total_sell_volume',
-          base: 'v.total_base_volume',
-          target: 'v.total_target_volume',
-          trades: 'v.total_trade_count',
-          usdc: 'v.total_usdc_fees',
-          tokUsdc: 'v.total_token_fees_usdc',
-        }
-      : {
-          buy: 'v.spot_buy_volume',
-          sell: 'v.spot_sell_volume',
-          base: 'v.spot_base_volume',
-          target: 'v.spot_target_volume',
-          trades: 'v.spot_trade_count',
-          usdc: 'v.spot_usdc_fees',
-          tokUsdc: 'v.spot_token_fees_usdc',
-        };
-
-  // Use a FULL OUTER JOIN so we see rows present in one table but not the other
-  const sql = `
-    SELECT
-      COALESCE(d.token, v.token) AS token,
-      COALESCE(d.date, v.date)::text AS date,
-      -- dune
-      COALESCE(d.buy_volume, 0)::float8        AS dune_buy_volume,
-      COALESCE(d.sell_volume, 0)::float8        AS dune_sell_volume,
-      COALESCE(d.base_volume, 0)::float8        AS dune_base_volume,
-      COALESCE(d.target_volume, 0)::float8      AS dune_target_volume,
-      COALESCE(d.trade_count, 0)::int           AS dune_trade_count,
-      COALESCE(d.usdc_fees, 0)::float8          AS dune_usdc_fees,
-      COALESCE(d.token_fees_usdc, 0)::float8    AS dune_token_fees_usdc,
-      -- v06 (${basis}) — divide by ${V06_TO_HUMAN_DIVISOR} so amounts match Dune human scale
-      (COALESCE(${v06Cols.buy}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8   AS v06_buy_volume,
-      (COALESCE(${v06Cols.sell}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8   AS v06_sell_volume,
-      (COALESCE(${v06Cols.base}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8   AS v06_base_volume,
-      (COALESCE(${v06Cols.target}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8 AS v06_target_volume,
-      COALESCE(${v06Cols.trades}, 0)::int      AS v06_trade_count,
-      (COALESCE(${v06Cols.usdc}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8     AS v06_usdc_fees,
-      (COALESCE(${v06Cols.tokUsdc}, 0)::numeric / ${V06_TO_HUMAN_DIVISOR})::float8 AS v06_token_fees_usdc,
-      -- flags (non-zero conditional activity on this token-day)
-      (COALESCE(v.conditional_trade_count, 0) > 0) AS has_conditional_volume,
-      COALESCE(v.conditional_reconciled, false)  AS conditional_reconciled,
-      (d.token IS NOT NULL)                      AS in_dune,
-      (v.token IS NOT NULL)                      AS in_v06
-    FROM daily_volumes d
-    FULL OUTER JOIN v06_fee_volume_daily_aggregate v
-      ON LOWER(d.token) = LOWER(v.token) AND d.date = v.date
-    WHERE COALESCE(d.date, v.date) >= $1
-      ${tokenFilter ? `AND (LOWER(d.token) = LOWER($2) OR LOWER(v.token) = LOWER($2))` : ''}
-    ORDER BY COALESCE(d.token, v.token), COALESCE(d.date, v.date)
-  `;
-
-  const pool = (db as any).pool;
-  const result = await pool.query(sql, params);
-  return result.rows;
-}
-
-// ---- find divergences above threshold ----
-
-const COMPARED_FIELDS = [
-  'buy_volume',
-  'sell_volume',
-  'base_volume',
-  'target_volume',
-  'trade_count',
-  'usdc_fees',
-  'token_fees_usdc',
-] as const;
-
-function findDivergences(rows: ComparisonRow[], thresholdPct: number): DivergenceReport[] {
-  const divergences: DivergenceReport[] = [];
-
-  for (const row of rows) {
-    if (!row.in_dune || !row.in_v06) continue; // handled separately as "missing"
-
-    for (const field of COMPARED_FIELDS) {
-      const duneVal = (row as any)[`dune_${field}`] as number;
-      const v06Val = (row as any)[`v06_${field}`] as number;
-      const delta = v06Val - duneVal;
-      const maxAbs = Math.max(Math.abs(duneVal), Math.abs(v06Val));
-      const deltaPct = maxAbs > 0 ? (Math.abs(delta) / maxAbs) * 100 : 0;
-
-      if (deltaPct > thresholdPct) {
-        divergences.push({
-          token: row.token,
-          date: row.date,
-          field,
-          dune_value: duneVal,
-          v06_value: v06Val,
-          delta,
-          delta_pct: deltaPct,
-          has_conditional_volume: row.has_conditional_volume,
-          conditional_reconciled: row.conditional_reconciled,
-        });
-      }
-    }
-  }
-
-  return divergences;
-}
-
-// ---- print helpers ----
-
-function printSummary(rows: ComparisonRow[], divergences: DivergenceReport[], thresholdPct: number) {
-  const tokens = new Set(rows.map((r) => r.token));
-  const bothPresent = rows.filter((r) => r.in_dune && r.in_v06);
-  const duneOnly = rows.filter((r) => r.in_dune && !r.in_v06);
-  const v06Only = rows.filter((r) => !r.in_dune && r.in_v06);
-  const divergentDays = new Set(divergences.map((d) => `${d.token}|${d.date}`));
-
-  console.log('📊 SUMMARY');
-  console.log(`   Tokens compared:          ${tokens.size}`);
-  console.log(`   Total token-day pairs:    ${rows.length}`);
-  console.log(`   Both sources present:     ${bothPresent.length}`);
-  console.log(`   Dune only (missing v06):  ${duneOnly.length}`);
-  console.log(`   v06 only (missing Dune):  ${v06Only.length}`);
-  console.log(`   Divergent days (>${thresholdPct}%):   ${divergentDays.size}`);
-  console.log(`   Total field divergences:  ${divergences.length}`);
-  console.log('');
-}
-
-function printMissingDays(rows: ComparisonRow[]) {
-  const duneOnly = rows.filter((r) => r.in_dune && !r.in_v06);
-  const v06Only = rows.filter((r) => !r.in_dune && r.in_v06);
-
-  if (duneOnly.length > 0) {
-    console.log('⚠️  DAYS IN DUNE BUT MISSING FROM V06:');
-    const byToken = groupBy(duneOnly, (r) => r.token);
-    for (const [token, days] of Object.entries(byToken)) {
-      const dates = days.map((d) => d.date).sort();
-      const rangeStr = dates.length <= 5
-        ? dates.join(', ')
-        : `${dates[0]} … ${dates[dates.length - 1]} (${dates.length} days)`;
-      console.log(`   ${token}: ${rangeStr}`);
-    }
-    console.log('');
-  }
-
-  if (v06Only.length > 0) {
-    console.log('⚠️  DAYS IN V06 BUT MISSING FROM DUNE:');
-    const byToken = groupBy(v06Only, (r) => r.token);
-    for (const [token, days] of Object.entries(byToken)) {
-      const dates = days.map((d) => d.date).sort();
-      const rangeStr = dates.length <= 5
-        ? dates.join(', ')
-        : `${dates[0]} … ${dates[dates.length - 1]} (${dates.length} days)`;
-      console.log(`   ${token}: ${rangeStr}`);
-    }
-    console.log('');
-  }
-
-  if (duneOnly.length === 0 && v06Only.length === 0) {
-    console.log('✅ No missing days — both sources cover the same date ranges.\n');
-  }
-}
-
-function printDivergences(divergences: DivergenceReport[]) {
-  if (divergences.length === 0) {
-    console.log('✅ No field divergences above threshold.\n');
-    return;
-  }
-
-  console.log('🔴 DIVERGENCES:');
-  console.log(
-    '   ' +
-      pad('TOKEN', 12) +
-      pad('DATE', 12) +
-      pad('FIELD', 18) +
-      padR('DUNE', 16) +
-      padR('V06', 16) +
-      padR('DELTA', 16) +
-      padR('Δ%', 8) +
-      pad('COND?', 6) +
-      pad('RECON?', 6),
-  );
-  console.log('   ' + '-'.repeat(110));
-
-  for (const d of divergences) {
-    console.log(
-      '   ' +
-        pad(d.token, 12) +
-        pad(d.date, 12) +
-        pad(d.field, 18) +
-        padR(fmt(d.dune_value), 16) +
-        padR(fmt(d.v06_value), 16) +
-        padR(fmt(d.delta), 16) +
-        padR(d.delta_pct.toFixed(1) + '%', 8) +
-        pad(d.has_conditional_volume ? 'Y' : 'N', 6) +
-        pad(d.conditional_reconciled ? 'Y' : 'N', 6),
-    );
-  }
-
-  // Per-token summary
-  console.log('');
-  const byToken = groupBy(divergences, (d) => d.token);
-  console.log('   Per-token divergence counts:');
-  for (const [token, items] of Object.entries(byToken)) {
-    const fields = groupBy(items, (i) => i.field);
-    const fieldSummary = Object.entries(fields)
-      .map(([f, arr]) => `${f}:${arr.length}`)
-      .join(', ');
-    console.log(`     ${token}: ${items.length} divergences (${fieldSummary})`);
-  }
-  console.log('');
-}
-
-// ---- util ----
-
-function groupBy<T>(arr: T[], key: (item: T) => string): Record<string, T[]> {
-  const map: Record<string, T[]> = {};
-  for (const item of arr) {
-    const k = key(item);
-    (map[k] ??= []).push(item);
-  }
-  return map;
-}
-
-function pad(s: string, n: number) {
-  return s.padEnd(n);
-}
-function padR(s: string, n: number) {
-  return s.padStart(n - 1) + ' ';
-}
-function fmt(n: number): string {
-  if (Math.abs(n) < 0.01) return '0';
-  return n.toLocaleString('en-US', { maximumFractionDigits: 2 });
-}
-
-main().catch((err) => {
-  console.error('❌ Fatal:', err);
-  process.exit(1);
-});
diff --git a/scripts/repo-guard.ts b/scripts/repo-guard.ts
index fc271fa..edda76e 100644
--- a/scripts/repo-guard.ts
+++ b/scripts/repo-guard.ts
@@ -72,8 +72,6 @@ const sensitiveFiles = [
   "src/services/databaseService.ts",
   "src/services/externalDatabaseService.ts",
   "scripts/safe-update.ts",
-  "scripts/backfill.ts",
-  "scripts/backfillV06.ts",
 ];
 
 // Files whose purpose is to define the guard rules themselves, or to document
diff --git a/src/app.ts b/src/app.ts
index ede6a78..6e1b404 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -24,6 +24,18 @@ export interface AppOptions {
 function createRateLimitMiddleware() {
   const buckets = new Map<string, { count: number; resetTime: number }>();
 
+  // Evict expired buckets so the map doesn't grow without bound across
+  // distinct client IPs/keys. unref() keeps the sweep from holding the
+  // process (or test runner) open.
+  const SWEEP_INTERVAL_MS = 5 * 60 * 1000;
+  const sweep = setInterval(() => {
+    const now = Date.now();
+    for (const [key, bucket] of buckets) {
+      if (now > bucket.resetTime) buckets.delete(key);
+    }
+  }, SWEEP_INTERVAL_MS);
+  sweep.unref?.();
+
   return (req: Request, res: Response, next: NextFunction): void => {
     const apiKey = req.header('x-api-key');
     let tier: { windowMs: number; maxRequests: number };
@@ -92,6 +104,14 @@ export function createApp(options: AppOptions): Application {
   const { services } = options;
   const serviceGetters = createServiceGetters(services);
 
+  // Resolve the real client IP from X-Forwarded-For when behind a reverse
+  // proxy. Without this, every anonymous client shares the proxy's IP — and
+  // therefore one collective rate-limit bucket. Uses an explicit hop count
+  // (never `true`) so clients can't spoof their IP via XFF.
+  if (config.server.trustProxyHops > 0) {
+    app.set('trust proxy', config.server.trustProxyHops);
+  }
+
   app.use(express.json());
 
   app.use(requestIdMiddleware);
@@ -102,8 +122,9 @@ export function createApp(options: AppOptions): Application {
     next();
   });
 
-  app.use(createRateLimitMiddleware());
+  // Metrics BEFORE the rate limiter so 429/401 responses are recorded too.
   app.use(createMetricsMiddleware());
+  app.use(createRateLimitMiddleware());
 
   // Mount all routes
   app.use(createRoutes(serviceGetters));
diff --git a/src/config.ts b/src/config.ts
index 9823913..763c2d3 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,10 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 export const config = {
-  // Development mode - disables external Dune API calls
-  devMode: process.env.DEV_MODE === 'true',
   solana: {
     rpcUrl: process.env.RPCPOOL_RPC_URL || process.env.SOLANA_RPC_URL || 'https://api.mainnet-beta.solana.com',
-    wsUrl: process.env.RPCPOOL_WS_URL || process.env.SOLANA_WS_URL || 'wss://api.mainnet-beta.solana.com',
   },
   server: {
     port: parseInt(process.env.PORT || '3000'),
@@ -12,6 +9,11 @@ export const config = {
     requestTimeout: parseInt(process.env.SERVER_REQUEST_TIMEOUT || '300000'),
     // Keep-alive timeout in milliseconds (default: 5 minutes)
     keepAliveTimeout: parseInt(process.env.SERVER_KEEP_ALIVE_TIMEOUT || '300000'),
+    // Number of reverse-proxy hops in front of this process. Express uses it to
+    // resolve the real client IP from X-Forwarded-For for per-IP rate limiting.
+    // 0 = no proxy (req.ip is the socket peer). Use the exact hop count — a
+    // blanket "trust everything" would let clients spoof their IP via XFF.
+    trustProxyHops: parseInt(process.env.TRUST_PROXY_HOPS || '0'),
     rateLimit: {
       windowMs: 60000, // 1 minute
       maxRequests: 60, // 60 requests per minute
@@ -28,10 +30,12 @@ export const config = {
     },
   },
   cache: {
-    // TTL for blockchain data cache in milliseconds (default: 10 seconds)
-    // Lower = more real-time prices but more RPC calls
-    // Higher = less RPC load but slightly stale prices
-    tickersTTL: parseInt(process.env.CACHE_TICKERS_TTL || '10000'),
+    // TTL for blockchain data cache in milliseconds (default: 55 seconds).
+    // Consumers (CoinGecko/DexScreener pollers) read about once per minute, so a
+    // sub-minute TTL keeps every poll fresher than its cadence while cutting the
+    // full DAO RPC scan from ~6x/minute to ~1x/minute.
+    // Lower = more real-time prices but more RPC calls.
+    tickersTTL: parseInt(process.env.CACHE_TICKERS_TTL || '55000'),
   },
   dex: {
     forkType: process.env.DEX_FORK_TYPE || 'Custom',
@@ -44,36 +48,33 @@ export const config = {
     .filter(addr => addr.length > 0)
     .map(addr => new PublicKey(addr)),
   fees: {
-    // Protocol fee rate (0.005 = 0.5%)
+    // Protocol fee rate (0.005 = 0.5%); used to report fee bps on DexScreener routes.
     protocolFeeRate: parseFloat(process.env.PROTOCOL_FEE_RATE || '0.005'),
   },
-  // When true (default), use Dune-sourced volume data (10-min/hourly/cache) for FutarchyAMM 24h metrics.
-  // Set USE_DUNE_DATA=false to use v0.6 indexer data (v06_spot_ohlcv_1m) instead.
-  useDuneData: process.env.USE_DUNE_DATA !== 'false',
-  dune: {
-    apiKey: process.env.DUNE_API_KEY || '',
-    // ACTIVE: 10-minute query - single source of truth, all other data aggregated from this
-    tenMinuteVolumeQueryId: process.env.DUNE_TEN_MINUTE_VOLUME_QUERY_ID ? parseInt(process.env.DUNE_TEN_MINUTE_VOLUME_QUERY_ID) : undefined,
-    // ACTIVE: Meteora daily volumes query - tracks Meteora pool fees per owner (service currently disabled)
-    meteoraVolumeQueryId: process.env.DUNE_METEORA_VOLUME_QUERY_ID ? parseInt(process.env.DUNE_METEORA_VOLUME_QUERY_ID) : undefined,
-  },
   alerts: {
     webhookUrl: process.env.ALERT_WEBHOOK_URL || 'https://telegram-webhook-relay.themetadao-org.workers.dev',
     webhookSecret: process.env.ALERT_WEBHOOK_SECRET || '',
   },
-  database: {
-    // PostgreSQL connection - can use either connection string or individual params
-    connectionString: process.env.COINGECKO_PG_URL || process.env.DATABASE_URL || '',
-    host: process.env.DATABASE_HOST || '',
-    port: parseInt(process.env.DATABASE_PORT || '5432'),
-    database: process.env.DATABASE_NAME || 'futarchy_volumes',
-    user: process.env.DATABASE_USER || '',
-    password: process.env.DATABASE_PASSWORD || '',
-    ssl: process.env.DATABASE_SSL === 'true',
-  },
   externalDatabase: {
-    // Read-only connection to the external indexer DB (v0_6_* tables)
-    connectionString: process.env.FRONTEND_READER_PG_URL || process.env.EXTERNAL_DATABASE_URL || '',
-    ssl: process.env.EXTERNAL_DATABASE_SSL === 'true',
+    // Read-only connection to the served ETL DB — the ONLY database this API uses.
+    // (The old app DB is fully removed; any future write goes to the prod DB.)
+    connectionString: process.env.DATABASE_PG_URL || '',
+    ssl: process.env.DATABASE_PG_SSL === 'true',
+    // PEM CA certificate (the cert content, not a path) for verifying a server
+    // signed by a private CA. With SSL on and no CA cert, system CAs are used.
+    caCert: process.env.DATABASE_PG_CA_CERT || '',
+    // Explicit opt-out of TLS server verification (legacy/self-signed setups).
+    // Encrypts but does NOT authenticate the server — set only as a stopgap.
+    sslNoVerify: process.env.DATABASE_PG_SSL_NO_VERIFY === 'true',
+  },
+  heartbeat: {
+    // Background self-check cadence (served DB connectivity, data freshness,
+    // contract drift). 0 disables the heartbeat entirely.
+    intervalMs: parseInt(process.env.HEARTBEAT_INTERVAL_MS || '60000'),
+    // Alert when the newest user_pool swap is older than this (seconds).
+    // 0 disables the staleness alert (connectivity/contract alerts remain).
+    maxDataAgeSeconds: parseInt(process.env.HEARTBEAT_MAX_DATA_AGE_SECONDS || '21600'),
+    // Run the served-data contract check every Nth heartbeat tick.
+    contractCheckEveryTicks: 10,
   },
-};
\ No newline at end of file
+};
diff --git a/src/main.ts b/src/main.ts
index 2066213..c2e9168 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,199 +1,22 @@
-import { createApp, type Services } from './app.js';
-import { FutarchyService } from './services/futarchyService.js';
-import { PriceService } from './services/priceService.js';
-import { DuneService } from './services/duneService.js';
-import { DuneCacheService } from './services/duneCacheService.js';
-import { SolanaService } from './services/solanaService.js';
-import { LaunchpadService } from './services/launchpadService.js';
-import { DatabaseService } from './services/databaseService.js';
-import { ExternalDatabaseService } from './services/externalDatabaseService.js';
-import { HourlyAggregationService } from './services/hourlyAggregationService.js';
-import { TenMinuteVolumeFetcherService } from './services/tenMinuteVolumeFetcherService.js';
-import { DailyAggregationService } from './services/dailyAggregationService.js';
-import { MeteoraVolumeFetcherService } from './services/meteoraVolumeFetcherService.js';
-import { V06ReconciliationService } from './services/v06ReconciliationService.js';
+import { createApp } from './app.js';
 import { config } from './config.js';
+import { closeDataStores, createServices, initializeRuntimeDataStores } from './runtime/services.js';
+import { startHeartbeat } from './runtime/heartbeat.js';
 import { logger } from './utils/logger.js';
-import { scheduleWithoutPileup, scheduleDailyAtUTC, type ScheduledTask } from './utils/scheduling.js';
-import { saveHealthSnapshots } from './routes/health.js';
-import { createServiceGetters, type ServiceGetters } from './routes/types.js';
 import type { Server } from 'http';
 
-function initializeServices(): Services {
-  const futarchyService = new FutarchyService();
-  const priceService = new PriceService();
-  const databaseService = new DatabaseService();
-  const externalDatabaseService = new ExternalDatabaseService();
-  const solanaService = new SolanaService();
-  const launchpadService = new LaunchpadService();
-
-  let duneService: DuneService | null = null;
-  if (config.dune.apiKey) {
-    duneService = new DuneService();
-  }
-
-  let duneCacheService: DuneCacheService | null = null;
-  let hourlyAggregationService: HourlyAggregationService | null = null;
-  let tenMinuteVolumeFetcherService: TenMinuteVolumeFetcherService | null = null;
-  let dailyAggregationService: DailyAggregationService | null = null;
-  let meteoraVolumeFetcherService: MeteoraVolumeFetcherService | null = null;
-
-  if (duneService) {
-    duneCacheService = new DuneCacheService(duneService, databaseService, futarchyService);
-    hourlyAggregationService = new HourlyAggregationService(databaseService, duneService, futarchyService);
-    tenMinuteVolumeFetcherService = new TenMinuteVolumeFetcherService(duneService, databaseService, futarchyService);
-    dailyAggregationService = new DailyAggregationService(duneService, databaseService, futarchyService);
-    meteoraVolumeFetcherService = new MeteoraVolumeFetcherService(duneService, databaseService);
-  }
-
-  const v06ReconciliationService = new V06ReconciliationService(databaseService, externalDatabaseService);
-
-  return {
-    futarchyService,
-    priceService,
-    databaseService,
-    externalDatabaseService,
-    duneService,
-    duneCacheService,
-    solanaService,
-    launchpadService,
-    hourlyAggregationService,
-    tenMinuteVolumeFetcherService,
-    dailyAggregationService,
-    meteoraVolumeFetcherService,
-    v06ReconciliationService,
-  };
-}
-
-async function startServices(services: Services): Promise<void> {
-  // Initialize database connection first
-  const dbConnected = await services.databaseService.initialize();
-  if (dbConnected) {
-    logger.info('Database service initialized and connected');
-  } else {
-    logger.warn('Database service not available - volume history will use in-memory cache only');
-  }
-
-  if (services.hourlyAggregationService) {
-    logger.info('Starting Hourly Aggregation service');
-    try {
-      await services.hourlyAggregationService.start();
-      logger.info('Hourly Aggregation service started');
-    } catch (error) {
-      logger.error('Failed to start Hourly Aggregation service', error);
-    }
-  }
-
-  if (services.tenMinuteVolumeFetcherService) {
-    logger.info('Starting 10-Minute Volume Fetcher service');
-    try {
-      await services.tenMinuteVolumeFetcherService.start();
-      logger.info('10-Minute Volume Fetcher service started');
-    } catch (error) {
-      logger.error('Failed to start 10-Minute Volume Fetcher service', error);
-    }
-  }
-
-  if (services.dailyAggregationService) {
-    logger.info('Starting Daily Aggregation service');
-    try {
-      await services.dailyAggregationService.initialize();
-      services.dailyAggregationService.start();
-      logger.info('Daily Aggregation service started');
-    } catch (error) {
-      logger.error('Failed to start Daily Aggregation service', error);
-    }
-  }
-
-  if (services.duneCacheService) {
-    logger.info('Starting Dune cache service');
-    try {
-      await services.duneCacheService.start();
-      logger.info('Dune cache service started');
-    } catch (error) {
-      logger.error('Failed to start Dune cache service', error);
-    }
-  }
-
-  if (services.meteoraVolumeFetcherService) {
-    logger.info('Starting Meteora Volume Fetcher service');
-    try {
-      await services.meteoraVolumeFetcherService.initialize();
-      services.meteoraVolumeFetcherService.start();
-      logger.info('Meteora Volume Fetcher service started');
-    } catch (error) {
-      logger.error('Failed to start Meteora Volume Fetcher service', error);
-    }
-  }
-
-  // Initialize external indexer DB and start v0.6 reconciliation
-  if (services.externalDatabaseService) {
-    const extConnected = await services.externalDatabaseService.initialize();
-    if (extConnected && services.v06ReconciliationService) {
-      logger.info('Starting v0.6 Reconciliation service');
-      services.v06ReconciliationService.start();
-      logger.info('v0.6 Reconciliation service started');
-    }
-  }
-}
-
-async function stopServices(services: Services, scheduledTasks: ScheduledTask[]): Promise<void> {
-  scheduledTasks.forEach(task => task.stop());
-  services.duneCacheService?.stop();
-  services.hourlyAggregationService?.stop();
-  services.tenMinuteVolumeFetcherService?.stop();
-  services.dailyAggregationService?.stop();
-  services.meteoraVolumeFetcherService?.stop();
-  services.v06ReconciliationService?.stop();
-  await services.externalDatabaseService?.close();
-  await services.databaseService.close();
-}
-
-function startScheduledTasks(services: Services): ScheduledTask[] {
-  const tasks: ScheduledTask[] = [];
-  const serviceGetters = createServiceGetters(services);
-
-  // Health snapshots every 5 minutes
-  const healthSnapshotTask = scheduleWithoutPileup(
-    async () => {
-      await saveHealthSnapshots(serviceGetters);
-    },
-    {
-      name: 'HealthSnapshot',
-      intervalMs: 5 * 60 * 1000,
-      onError: (error) => logger.error('Error saving health snapshot', error),
-    }
-  );
-  tasks.push(healthSnapshotTask);
-  logger.info('Health snapshots scheduled every 5 minutes');
-
-  // Prune old metrics daily at 03:00 UTC
-  const metricsPruneTask = scheduleDailyAtUTC(
-    async () => {
-      if (services.databaseService.isAvailable()) {
-        await services.databaseService.pruneOldMetrics(30);
-        logger.info('Old metrics pruned (keeping last 30 days)');
-      }
-    },
-    {
-      name: 'MetricsPrune',
-      hourUTC: 3,
-      onError: (error) => logger.error('Error pruning metrics', error),
-    }
-  );
-  tasks.push(metricsPruneTask);
-  logger.info('Metrics pruning scheduled daily at 03:00 UTC');
-
-  return tasks;
-}
+const SHUTDOWN_TIMEOUT_MS = 15_000;
 
 async function main(): Promise<void> {
-  const services = initializeServices();
+  const services = createServices();
   const app = createApp({ services });
-  let scheduledTasks: ScheduledTask[] = [];
 
-  const server: Server = app.listen(config.server.port, async () => {
-    logger.info('Server started', {
+  await initializeRuntimeDataStores(services, 'API');
+
+  const heartbeat = startHeartbeat(services);
+
+  const server: Server = app.listen(config.server.port, () => {
+    logger.info('API server started', {
       port: config.server.port,
       tickersUrl: `http://localhost:${config.server.port}/api/tickers`,
       healthUrl: `http://localhost:${config.server.port}/health`,
@@ -202,33 +25,41 @@ async function main(): Promise<void> {
     logger.info('Trusted API keys loaded', {
       count: config.server.trustedApiKeys.size,
     });
-
-    await startServices(services);
-    scheduledTasks = startScheduledTasks(services);
-
-    // Save initial health snapshot after startup
-    const serviceGetters = createServiceGetters(services);
-    setTimeout(async () => {
-      try {
-        await saveHealthSnapshots(serviceGetters);
-        logger.info('Initial health snapshot saved');
-      } catch (error) {
-        logger.error('Error saving initial health snapshot', error);
-      }
-    }, 10000);
   });
 
   server.timeout = config.server.requestTimeout;
   server.keepAliveTimeout = config.server.keepAliveTimeout;
   server.headersTimeout = config.server.keepAliveTimeout + 1000;
 
-  const shutdown = async (signal: string): Promise<void> => {
-    logger.info(`${signal} received, shutting down gracefully`);
-    await stopServices(services, scheduledTasks);
+  let shuttingDown = false;
+  const shutdown = (signal: string): void => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    logger.info(`${signal} received, shutting down API gracefully`);
+
+    heartbeat?.stop();
+
+    // Order matters: stop accepting requests and drain in-flight ones FIRST,
+    // close the DB pools after — closing pools first makes every in-flight
+    // request fail during a deploy.
+    const forceExit = setTimeout(() => {
+      logger.error('Graceful shutdown timed out — forcing exit');
+      process.exit(1);
+    }, SHUTDOWN_TIMEOUT_MS);
+
     server.close(() => {
-      logger.info('Server closed');
-      process.exit(0);
+      closeDataStores(services)
+        .catch((error) => logger.error('Error closing data stores during shutdown', error))
+        .finally(() => {
+          clearTimeout(forceExit);
+          logger.info('API server closed');
+          process.exit(0);
+        });
     });
+
+    // Idle keep-alive sockets would otherwise hold close() open for up to
+    // keepAliveTimeout (5 min by default).
+    server.closeIdleConnections?.();
   };
 
   process.on('SIGTERM', () => shutdown('SIGTERM'));
@@ -236,6 +67,6 @@ async function main(): Promise<void> {
 }
 
 main().catch((error) => {
-  logger.error('Failed to start server', error);
+  logger.error('Failed to start API server', error);
   process.exit(1);
 });
diff --git a/src/routes/coingecko.ts b/src/routes/coingecko.ts
index d6c8d4c..4712b8e 100644
--- a/src/routes/coingecko.ts
+++ b/src/routes/coingecko.ts
@@ -1,128 +1,68 @@
 import { Router, type Request, type Response } from 'express';
 import type { CoinGeckoTicker } from '../types/coingecko.js';
 import type { ServiceGetters } from './types.js';
-import { asyncHandler } from '../middleware/errorHandler.js';
+import { AppError, asyncHandler } from '../middleware/errorHandler.js';
 import { logger } from '../utils/logger.js';
 import { sendAlert } from '../utils/alerts.js';
-import { config } from '../config.js';
 
 export function createCoinGeckoRouter(services: ServiceGetters): Router {
   const router = Router();
-  const { getFutarchyService, getPriceService, getDuneCacheService, getTenMinuteVolumeFetcherService, getHourlyAggregationService, getDatabaseService } = services;
+  const { getFutarchyService, getPriceService, getExternalDatabaseService } = services;
 
   // CoinGecko Endpoint: /tickers
   router.get('/api/tickers', asyncHandler(async (req: Request, res: Response) => {
       const futarchyService = getFutarchyService();
       const priceService = getPriceService();
-      const duneCacheService = getDuneCacheService();
-      const tenMinuteVolumeFetcherService = getTenMinuteVolumeFetcherService();
-      const hourlyAggregationService = getHourlyAggregationService();
-      const databaseService = getDatabaseService();
-      
+      const externalDatabaseService = getExternalDatabaseService();
+
+      if (!externalDatabaseService?.isAvailable()) {
+        logger.warn('Served database unavailable for /api/tickers', { requestId: req.requestId });
+        sendAlert(
+          'Served database unavailable for /api/tickers — refusing to report zero volume',
+          { cooldownKey: 'tickers-served-db-unavailable', cooldownMs: 10 * 60 * 1000 }
+        );
+        throw AppError.serviceUnavailable(
+          'Served database not available',
+          'SERVED_DB_UNAVAILABLE'
+        );
+      }
+
       const allDaos = await futarchyService.getAllDaos();
-      
-      const firstTradeDates = databaseService?.isAvailable() 
-        ? await databaseService.getFirstTradeDates() 
-        : new Map<string, string>();
-      
+
+      const firstTradeDates = await externalDatabaseService.getFirstTradeDates();
+
       const tokenToDaoMap = new Map<string, string>();
       for (const dao of allDaos) {
         tokenToDaoMap.set(dao.baseMint.toString(), dao.daoAddress.toString());
       }
-      
-      let volumeMetricsMap = new Map<string, { base_volume_24h: string; target_volume_24h: string; high_24h: string; low_24h: string }>();
-      let volumeSource = 'none';
-
-      if (!config.useDuneData) {
-        // USE_DUNE_DATA=false — source FutarchyAMM 24h volume from v0.6 indexer data
-        if (databaseService?.isAvailable()) {
-          const baseMints = allDaos.map(dao => dao.baseMint.toString());
-          const v06Metrics = await databaseService.getV06Rolling24hMetrics(baseMints);
-
-          if (v06Metrics.size > 0) {
-            for (const [tokenAddress, metrics] of v06Metrics.entries()) {
-              const daoAddress = tokenToDaoMap.get(tokenAddress);
-              if (daoAddress) {
-                volumeMetricsMap.set(daoAddress, {
-                  base_volume_24h: metrics.base_volume_24h,
-                  target_volume_24h: metrics.target_volume_24h,
-                  high_24h: metrics.high_24h,
-                  low_24h: metrics.low_24h,
-                });
-              }
-            }
-            volumeSource = 'v06-indexer';
-            logger.debug('Using v0.6 indexer rolling 24h metrics', { daoCount: volumeMetricsMap.size, requestId: req.requestId });
-          }
-        }
-      } else {
-        // USE_DUNE_DATA=true (default) — Dune pipeline: 10-min → hourly → cache
-        // Try TenMinuteVolumeFetcherService first
-        if (tenMinuteVolumeFetcherService?.isInitialized && tenMinuteVolumeFetcherService.isDatabaseConnected()) {
-          const baseMints = allDaos.map(dao => dao.baseMint.toString());
-          const tenMinMetrics = await tenMinuteVolumeFetcherService.getRolling24hMetrics(baseMints);
-
-          if (tenMinMetrics.size > 0) {
-            for (const [tokenAddress, metrics] of tenMinMetrics.entries()) {
-              const daoAddress = tokenToDaoMap.get(tokenAddress);
-              if (daoAddress) {
-                volumeMetricsMap.set(daoAddress, {
-                  base_volume_24h: String(metrics.base_volume_24h),
-                  target_volume_24h: String(metrics.target_volume_24h),
-                  high_24h: String(metrics.high_24h),
-                  low_24h: String(metrics.low_24h),
-                });
-              }
-            }
-            volumeSource = '10-minute';
-            logger.debug('Using 10-minute rolling 24h metrics', { daoCount: volumeMetricsMap.size, requestId: req.requestId });
-          }
-        }
 
-        // Fall back to HourlyAggregationService
-        if (volumeMetricsMap.size === 0 && hourlyAggregationService?.isInitialized && hourlyAggregationService.isDatabaseConnected()) {
-          const baseMints = allDaos.map(dao => dao.baseMint.toString());
-          const hourlyMetrics = await hourlyAggregationService.getRolling24hMetrics(baseMints);
-
-          if (hourlyMetrics.size > 0) {
-            for (const [tokenAddress, metrics] of hourlyMetrics.entries()) {
-              const daoAddress = tokenToDaoMap.get(tokenAddress);
-              if (daoAddress) {
-                volumeMetricsMap.set(daoAddress, {
-                  base_volume_24h: metrics.base_volume_24h,
-                  target_volume_24h: metrics.target_volume_24h,
-                  high_24h: metrics.high_24h,
-                  low_24h: metrics.low_24h,
-                });
-              }
-            }
-            volumeSource = 'hourly';
-            logger.debug('Using hourly rolling 24h metrics', { daoCount: volumeMetricsMap.size, requestId: req.requestId });
-          }
-        }
-
-        // Fall back to DuneCacheService
-        if (volumeMetricsMap.size === 0 && duneCacheService) {
-          const cachedMetrics = duneCacheService.getPoolMetrics();
-          if (cachedMetrics && cachedMetrics.size > 0) {
-            const cacheStatus = duneCacheService.getCacheStatus();
-            logger.debug('Using Dune cache metrics', { cacheAgeSeconds: Math.round(cacheStatus.cacheAgeMs / 1000), entryCount: cachedMetrics.size, requestId: req.requestId });
-            volumeMetricsMap = cachedMetrics;
-            volumeSource = 'dune-cache';
-          } else {
-            logger.warn('No cached metrics available yet', { requestId: req.requestId });
-          }
-        }
+      const volumeMetricsMap = new Map<string, { base_volume_24h: string; target_volume_24h: string; high_24h: string; low_24h: string }>();
+
+      // Single source: rolling-24h spot metrics from the unified user_pool ETL
+      // candles (user_pool_spot_ohlcv via the served DB), keyed by token (base
+      // mint) → mapped to dao (= pool_id). No futarchy.trades, no app-DB fallback.
+      const baseMints = allDaos.map(dao => dao.baseMint.toString());
+      const spotMetrics = await externalDatabaseService.getSpotRolling24hMetrics(baseMints);
+
+      for (const [token, metrics] of spotMetrics.entries()) {
+        const daoAddress = tokenToDaoMap.get(token);
+        if (!daoAddress) continue;
+        volumeMetricsMap.set(daoAddress, {
+          base_volume_24h: metrics.base_volume_24h,
+          target_volume_24h: metrics.target_volume_24h,
+          high_24h: metrics.high_24h,
+          low_24h: metrics.low_24h,
+        });
       }
 
       if (volumeMetricsMap.size === 0) {
         logger.warn('No volume metrics available', { requestId: req.requestId });
         sendAlert(
-          'No volume metrics available — all sources returned empty',
+          'No volume metrics available — user_pool_spot_ohlcv returned empty',
           { cooldownKey: 'no-volume-data', cooldownMs: 10 * 60 * 1000 }
         );
       } else {
-        logger.debug('Volume source selected', { volumeSource, daoCount: volumeMetricsMap.size, requestId: req.requestId });
+        logger.debug('Volume source: user_pool ETL (user_pool_spot_ohlcv)', { daoCount: volumeMetricsMap.size, requestId: req.requestId });
       }
       
       const tickers: CoinGeckoTicker[] = [];
@@ -165,17 +105,17 @@ export function createCoinGeckoRouter(services: ServiceGetters): Router {
           
           if (!liquidityUsd) continue;
 
-          const duneMetrics = volumeMetricsMap.get(poolId);
+          const volumeMetrics = volumeMetricsMap.get(poolId);
           let baseVolume: string;
           let targetVolume: string;
           let high24h: string | undefined;
           let low24h: string | undefined;
 
-          if (duneMetrics) {
-            baseVolume = duneMetrics.base_volume_24h;
-            targetVolume = duneMetrics.target_volume_24h;
-            high24h = duneMetrics.high_24h !== '0' ? duneMetrics.high_24h : undefined;
-            low24h = duneMetrics.low_24h !== '0' ? duneMetrics.low_24h : undefined;
+          if (volumeMetrics) {
+            baseVolume = volumeMetrics.base_volume_24h;
+            targetVolume = volumeMetrics.target_volume_24h;
+            high24h = volumeMetrics.high_24h !== '0' ? volumeMetrics.high_24h : undefined;
+            low24h = volumeMetrics.low_24h !== '0' ? volumeMetrics.low_24h : undefined;
           } else {
             baseVolume = '0';
             targetVolume = '0';
diff --git a/src/routes/dexscreener.ts b/src/routes/dexscreener.ts
index 08d4928..581cd29 100644
--- a/src/routes/dexscreener.ts
+++ b/src/routes/dexscreener.ts
@@ -23,10 +23,22 @@ export function createDexScreenerRouter(services: ServiceGetters): Router {
   const { getFutarchyService, getExternalDatabaseService, getSolanaService, getLaunchpadService } =
     services;
 
-  // In-memory TTL caches for mostly-static endpoints
+  // In-memory TTL caches for mostly-static endpoints. Bounded: the keys are
+  // caller-supplied ids, so without a cap a scanner cycling through arbitrary
+  // valid pubkeys would grow these maps (and burn RPC per miss) without limit.
   const assetCache = new Map<string, { data: DexScreenerAssetResponse; expiresAt: number }>();
   const pairCache = new Map<string, { data: DexScreenerPairResponse; expiresAt: number }>();
   const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
+  const CACHE_MAX_ENTRIES = 1000;
+
+  function cachePut<T>(cache: Map<string, T>, key: string, value: T): void {
+    if (cache.size >= CACHE_MAX_ENTRIES) {
+      // Evict oldest insertion (Map preserves insertion order)
+      const oldest = cache.keys().next().value;
+      if (oldest !== undefined) cache.delete(oldest);
+    }
+    cache.set(key, value);
+  }
 
   // ---------------------------------------------------------------
   // GET /dexscreener/latest-block
@@ -38,8 +50,9 @@ export function createDexScreenerRouter(services: ServiceGetters): Router {
     }
 
     const result = await extDb.query(`
-      SELECT slot, unix_timestamp
-      FROM v0_6_spot_swaps
+      SELECT slot, extract(epoch FROM block_time)::bigint AS unix_timestamp
+      FROM futarchy.user_pool_swaps
+      WHERE source = 'futarchy_amm' AND market_kind = 'spot'
       ORDER BY slot DESC
       LIMIT 1
     `);
@@ -124,7 +137,7 @@ export function createDexScreenerRouter(services: ServiceGetters): Router {
       },
     };
 
-    assetCache.set(id, { data: response, expiresAt: Date.now() + CACHE_TTL_MS });
+    cachePut(assetCache, id, { data: response, expiresAt: Date.now() + CACHE_TTL_MS });
     res.json(response);
   }));
 
@@ -147,48 +160,43 @@ export function createDexScreenerRouter(services: ServiceGetters): Router {
       return res.status(503).json({ error: 'External database not available' });
     }
 
-    // Look up the pair (DAO) in the external DB
-    const daoResult = await extDb.query(
-      `SELECT dao_addr, base_mint_acct, quote_mint_acct
-       FROM v0_6_daos
-       WHERE dao_addr = $1`,
+    // Pair identity + creation (first spot swap) from the unified ETL output. One
+    // query: the earliest futarchy spot swap for the DAO carries its base/quote
+    // mints AND the creation block/txn. A DAO with no spot swaps has no tradeable
+    // pair → 404 (same status the old v0_6_daos miss returned).
+    const pairResult = await extDb.query(
+      `SELECT dao_addr, base_mint, quote_mint,
+              slot, extract(epoch FROM block_time)::bigint AS unix_timestamp, signature
+       FROM futarchy.user_pool_swaps
+       WHERE source = 'futarchy_amm' AND market_kind = 'spot' AND dao_addr = $1
+       -- signature in the tie-break: separate txns in one slot can share (inner_group,
+       -- inner_ix) (those are within-txn coords), so order it too for a deterministic
+       -- "first swap" → stable createdAtTxnId.
+       ORDER BY slot ASC, signature ASC, inner_group ASC, inner_ix ASC
+       LIMIT 1`,
       [id],
     );
 
-    if (daoResult.rows.length === 0) {
+    if (pairResult.rows.length === 0) {
       return res.status(404).json({ error: 'Pair not found' });
     }
 
-    const dao = daoResult.rows[0];
-
-    // Get creation info (first swap for this pair)
-    const creationResult = await extDb.query(
-      `SELECT slot, unix_timestamp, signature
-       FROM v0_6_spot_swaps
-       WHERE dao_addr = $1
-       ORDER BY slot ASC, id ASC
-       LIMIT 1`,
-      [id],
-    );
+    const dao = pairResult.rows[0];
 
     const response: DexScreenerPairResponse = {
       pair: {
         id: dao.dao_addr,
         dexKey: DEX_KEY,
-        asset0Id: dao.base_mint_acct,
-        asset1Id: dao.quote_mint_acct,
+        asset0Id: dao.base_mint,
+        asset1Id: dao.quote_mint,
         feeBps: FEE_BPS,
+        createdAtBlockNumber: Number(dao.slot),
+        createdAtBlockTimestamp: Number(dao.unix_timestamp),
+        createdAtTxnId: dao.signature,
       },
     };
 
-    if (creationResult.rows.length > 0) {
-      const creation = creationResult.rows[0];
-      response.pair.createdAtBlockNumber = Number(creation.slot);
-      response.pair.createdAtBlockTimestamp = Number(creation.unix_timestamp);
-      response.pair.createdAtTxnId = creation.signature;
-    }
-
-    pairCache.set(id, { data: response, expiresAt: Date.now() + CACHE_TTL_MS });
+    cachePut(pairCache, id, { data: response, expiresAt: Date.now() + CACHE_TTL_MS });
     res.json(response);
   }));
 
@@ -217,26 +225,37 @@ export function createDexScreenerRouter(services: ServiceGetters): Router {
       return res.status(503).json({ error: 'External database not available' });
     }
 
-    // Query swap events in the slot range (both inclusive)
-    // amm_base_amount / amm_quote_amount = post-swap pool reserves (nullable for older rows)
+    // Query swap events in the slot range (both inclusive) from the unified ETL
+    // output. Columns are aliased to the legacy v0_6 shape so the builder below is
+    // unchanged: side→swap_type, and input/output reconstructed from base/quote +
+    // side (Buy: USDC in / token out; Sell: token in / USDC out). amm_base/quote
+    // reserves are our decoded post-swap reserves — non-NULL for EVERY spot swap
+    // (validated dollar-exact vs the live feed), unlike the nullable raw column.
+    // Ordered by (slot, signature, inner_group, inner_ix): signature MUST be in the
+    // key because inner_group/inner_ix are within-transaction coordinates — two
+    // distinct txns in one slot can share the same (inner_group, inner_ix), so
+    // ordering without signature both is non-deterministic AND interleaves one txn's
+    // events with another's, which makes the txnIndex builder below assign the same
+    // signature two different txnIndex values. Grouping by signature keeps each txn's
+    // events contiguous → stable, consistent txnIndex/eventIndex.
     const result = await extDb.query(
       `SELECT
-         s.id,
-         s.signature,
-         s.slot,
-         s.unix_timestamp,
-         s.dao_addr,
-         s.user_addr,
-         s.swap_type,
-         s.input_amount,
-         s.output_amount,
-         s.amm_base_amount,
-         s.amm_quote_amount
-       FROM v0_6_spot_swaps s
-       WHERE s.slot >= $1 AND s.slot <= $2
-         AND s.input_amount > 0 AND s.output_amount > 0
-         AND LOWER(TRIM(s.swap_type)) IN ('buy', 'sell')
-       ORDER BY s.slot ASC, s.id ASC`,
+         u.id,
+         u.signature,
+         u.slot,
+         extract(epoch FROM u.block_time)::bigint                       AS unix_timestamp,
+         u.dao_addr,
+         u.user_addr,
+         u.side                                                         AS swap_type,
+         CASE WHEN u.side = 'buy' THEN u.quote_amount ELSE u.base_amount  END AS input_amount,
+         CASE WHEN u.side = 'buy' THEN u.base_amount  ELSE u.quote_amount END AS output_amount,
+         u.amm_base_reserves                                            AS amm_base_amount,
+         u.amm_quote_reserves                                           AS amm_quote_amount
+       FROM futarchy.user_pool_swaps u
+       WHERE u.source = 'futarchy_amm' AND u.market_kind = 'spot'
+         AND u.slot >= $1 AND u.slot <= $2
+         AND u.base_amount > 0 AND u.quote_amount > 0
+       ORDER BY u.slot ASC, u.signature ASC, u.inner_group ASC, u.inner_ix ASC`,
       [fromBlock, toBlock],
     );
 
diff --git a/src/routes/health.ts b/src/routes/health.ts
index 772e09e..6b263da 100644
--- a/src/routes/health.ts
+++ b/src/routes/health.ts
@@ -1,196 +1,71 @@
 import { Router, type Request, type Response } from 'express';
+import { logger } from '../utils/logger.js';
 import type { ServiceGetters } from './types.js';
+import type { ServedDataFreshness } from '../services/externalDatabaseService.js';
 
 export function createHealthRouter(services: ServiceGetters): Router {
   const router = Router();
-  const { getDatabaseService, getDuneCacheService, getHourlyAggregationService, getTenMinuteVolumeFetcherService } = services;
+  const { getExternalDatabaseService } = services;
 
-  // Basic health check
+  // Liveness: is the process up? Never touches a dependency.
   router.get('/health', (req: Request, res: Response) => {
-    const duneCacheService = getDuneCacheService();
-    const cacheStatus = duneCacheService?.getCacheStatus();
-    
     res.json({
       status: 'healthy',
       timestamp: new Date().toISOString(),
       uptime: process.uptime(),
-      duneCache: cacheStatus ? {
-        lastUpdated: cacheStatus.lastUpdated.toISOString(),
-        isRefreshing: cacheStatus.isRefreshing,
-        poolMetricsCount: cacheStatus.poolMetricsCount,
-        cacheAgeSeconds: Math.round(cacheStatus.cacheAgeMs / 1000),
-        isInitialized: cacheStatus.isInitialized,
-      } : null,
     });
   });
 
-  // Comprehensive health check
+  // Readiness / comprehensive health. The served (external) ETL DB is the
+  // API's only data dependency, so health is modeled on its three axes:
+  // connectivity, data contract, and data freshness.
   router.get('/api/health', async (req: Request, res: Response) => {
-    const databaseService = getDatabaseService();
-    const duneCacheService = getDuneCacheService();
-    const hourlyAggregationService = getHourlyAggregationService();
-    const tenMinuteVolumeFetcherService = getTenMinuteVolumeFetcherService();
+    const externalDatabaseService = getExternalDatabaseService();
+    const connected = !!externalDatabaseService?.isAvailable();
+
+    const servedDataContract = connected
+      ? await externalDatabaseService!.checkServedDataContract()
+      : {
+          ok: false,
+          checkedAt: new Date().toISOString(),
+          missing: ['connection'],
+        };
+
+    let freshness: ServedDataFreshness | null = null;
+    let freshnessError = false;
+    if (connected) {
+      try {
+        freshness = await externalDatabaseService!.getServedDataFreshness();
+      } catch (error) {
+        freshnessError = true;
+        logger.error('Health: served DB freshness check failed', error, { requestId: req.requestId });
+      }
+    }
 
     const health: Record<string, any> = {
       status: 'healthy',
       timestamp: new Date().toISOString(),
-      services: {},
-      database: {
-        connected: databaseService.isAvailable(),
+      uptime: process.uptime(),
+      servedDatabase: {
+        connected,
+        servedDataContract,
+        freshness,
       },
     };
 
-    if (duneCacheService) {
-      const status = duneCacheService.getCacheStatus();
-      health.services.dune_cache = {
-        initialized: status.isInitialized,
-        refreshing: status.isRefreshing,
-        lastRefreshTime: status.lastUpdated ? status.lastUpdated.toISOString() : null,
-      };
-    }
-
-    if (hourlyAggregationService) {
-      health.services.hourly_volume = {
-        initialized: hourlyAggregationService.isInitialized,
-        databaseConnected: hourlyAggregationService.isDatabaseConnected(),
-      };
-    }
-
-    if (tenMinuteVolumeFetcherService) {
-      const status = tenMinuteVolumeFetcherService.getStatus();
-      health.services.ten_minute_volume = {
-        initialized: status.initialized,
-        running: status.isRunning,
-        refreshing: status.refreshInProgress,
-        lastRefreshTime: status.lastRefreshTime,
-      };
-    }
-
-    const hasUnhealthyService = Object.values(health.services).some(
-      (s: any) => s.initialized === false
-    );
-    
-    if (!databaseService.isAvailable()) {
+    if (!connected) {
+      health.status = 'degraded';
+      health.message = 'Served (external) indexer database not connected';
+    } else if (!servedDataContract.ok) {
       health.status = 'degraded';
-      health.message = 'Database not connected';
-    } else if (hasUnhealthyService) {
+      health.message = 'Served ETL contract check failed';
+    } else if (freshnessError) {
       health.status = 'degraded';
-      health.message = 'One or more services not initialized';
+      health.message = 'Served DB freshness check failed';
     }
 
     res.json(health);
   });
 
-  // Health history
-  router.get('/api/health/history', async (req: Request, res: Response) => {
-    const databaseService = getDatabaseService();
-    
-    if (!databaseService.isAvailable()) {
-      return res.status(503).json({
-        error: 'Database not connected',
-        message: 'Health history requires database connection',
-      });
-    }
-
-    try {
-      const serviceName = req.query.service as string | undefined;
-      const hours = parseInt(req.query.hours as string) || 24;
-
-      const data = await databaseService.getServiceHealthHistory(serviceName, hours);
-      
-      res.json({
-        service: serviceName || 'all',
-        hours,
-        count: data.length,
-        data,
-      });
-    } catch (error: any) {
-      res.status(500).json({
-        error: 'Failed to get health history',
-        message: error.message,
-      });
-    }
-  });
-
-  // Manual health snapshot trigger
-  router.post('/api/health/snapshot', async (req: Request, res: Response) => {
-    const databaseService = getDatabaseService();
-    
-    if (!databaseService.isAvailable()) {
-      return res.status(503).json({
-        error: 'Database not connected',
-      });
-    }
-
-    try {
-      await saveHealthSnapshots(services);
-      res.json({ message: 'Health snapshot saved successfully' });
-    } catch (error: any) {
-      res.status(500).json({
-        error: 'Failed to save health snapshot',
-        message: error.message,
-      });
-    }
-  });
-
   return router;
 }
-
-// Helper function to save health snapshots
-export async function saveHealthSnapshots(services: ServiceGetters): Promise<void> {
-  const databaseService = services.getDatabaseService();
-  const duneCacheService = services.getDuneCacheService();
-  const hourlyAggregationService = services.getHourlyAggregationService();
-  const tenMinuteVolumeFetcherService = services.getTenMinuteVolumeFetcherService();
-
-  if (!databaseService.isAvailable()) return;
-
-  if (duneCacheService) {
-    const status = duneCacheService.getCacheStatus();
-    await databaseService.insertServiceHealthSnapshot(
-      'dune_cache',
-      status.isInitialized,
-      status.lastUpdated,
-      undefined,
-      undefined,
-      { isRefreshing: status.isRefreshing }
-    );
-  }
-
-  if (hourlyAggregationService) {
-    const recordCount = await databaseService.getHourlyRecordCount();
-    await databaseService.insertServiceHealthSnapshot(
-      'hourly_volume',
-      hourlyAggregationService.isInitialized,
-      undefined,
-      recordCount,
-      undefined,
-      { databaseConnected: hourlyAggregationService.isDatabaseConnected() }
-    );
-  }
-
-  if (tenMinuteVolumeFetcherService) {
-    const status = tenMinuteVolumeFetcherService.getStatus();
-    const recordCount = await databaseService.getTenMinuteRecordCount();
-    await databaseService.insertServiceHealthSnapshot(
-      'ten_minute_volume',
-      status.initialized,
-      status.lastRefreshTime ? new Date(status.lastRefreshTime) : undefined,
-      recordCount,
-      undefined,
-      { isRunning: status.isRunning, refreshInProgress: status.refreshInProgress }
-    );
-  }
-
-  const dailyCount = await databaseService.getDailyRecordCount();
-  const hourlyCount = await databaseService.getHourlyRecordCount();
-  const tenMinCount = await databaseService.getTenMinuteRecordCount();
-  const buySellCount = await databaseService.getBuySellRecordCount();
-
-  await databaseService.insertMetricsBatch([
-    { name: 'database_record_count', value: dailyCount, labels: { table: 'daily_volumes' } },
-    { name: 'database_record_count', value: hourlyCount, labels: { table: 'hourly_volumes' } },
-    { name: 'database_record_count', value: tenMinCount, labels: { table: 'ten_minute_volumes' } },
-    { name: 'database_record_count', value: buySellCount, labels: { table: 'daily_buy_sell_volumes' } },
-  ]);
-}
diff --git a/src/routes/index.ts b/src/routes/index.ts
index b49f6c3..e925b2d 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { createHealthRouter, saveHealthSnapshots } from './health.js';
+import { createHealthRouter } from './health.js';
 import { createMetricsRouter } from './metrics.js';
 import { createCoinGeckoRouter } from './coingecko.js';
 
@@ -10,7 +10,6 @@ import { createDexScreenerRouter } from './dexscreener.js';
 import { createRootRouter } from './root.js';
 import type { ServiceGetters } from './types.js';
 
-export { saveHealthSnapshots } from './health.js';
 export type { ServiceGetters } from './types.js';
 
 export function createRoutes(services: ServiceGetters): Router {
diff --git a/src/routes/market.ts b/src/routes/market.ts
index eaed9ec..6992a86 100644
--- a/src/routes/market.ts
+++ b/src/routes/market.ts
@@ -1,42 +1,46 @@
 import { Router, type Request, type Response } from 'express';
 import { parseDateParam, parseCommaSeparatedList } from '../utils/validation.js';
-import { config } from '../config.js';
+import { logger } from '../utils/logger.js';
 import type { ServiceGetters } from './types.js';
 
 export function createMarketRouter(services: ServiceGetters): Router {
   const router = Router();
-  const { getDatabaseService } = services;
+  const { getExternalDatabaseService } = services;
 
-  // Get daily market data with date range and optional token filtering
-  // When USE_DUNE_DATA=false, sources from v0.6 indexer aggregate table;
-  // otherwise uses the Dune-sourced daily_volumes table.
+  // Daily market data with date range + optional token filtering.
+  // BOTH FutarchyAMM and Meteora are served from the unified user_pool ETL in
+  // the served DB (futarchy.user_pool_daily), via externalDatabase.
+  // FutarchyAMM no longer reads the flat-0.5% app-DB v06_fee_volume_daily_aggregate.
   router.get('/api/market-data', async (req: Request, res: Response) => {
-    const databaseService = getDatabaseService();
-    
-    if (!databaseService || !databaseService.isAvailable()) {
-      return res.status(503).json({
-        error: 'Database not available',
-        message: 'Service is initializing or database is not connected',
-      });
-    }
-
-    // Validate date parameters
+    // Validate client input BEFORE touching the served DB, so a malformed/missing
+    // parameter always returns a 400 — independent of DB state. (Checking DB
+    // availability first would turn a client error into a 503 during an outage.)
     const startDateResult = parseDateParam(req.query.startDate as string, 'startDate', { required: true });
     if (!startDateResult.success) {
       return res.status(400).json(startDateResult.error);
     }
-    
+
     const endDateResult = parseDateParam(req.query.endDate as string, 'endDate', { required: true });
     if (!endDateResult.success) {
       return res.status(400).json(endDateResult.error);
     }
-    
-    // Validate tokens list
+
     const tokensResult = parseCommaSeparatedList(req.query.tokens as string, 'tokens');
     if (!tokensResult.success) {
       return res.status(400).json(tokensResult.error);
     }
 
+    // The served DB is the source of truth for market data; surface its absence/failure
+    // rather than masking it as empty (a financial feed must never read a DB outage as
+    // "zero volume").
+    const externalDatabaseService = getExternalDatabaseService();
+    if (!externalDatabaseService || !externalDatabaseService.isAvailable()) {
+      return res.status(503).json({
+        error: 'Served database not available',
+        message: 'Market data source (served indexer DB) is not connected',
+      });
+    }
+
     try {
       const queryOptions = {
         tokens: tokensResult.value,
@@ -44,35 +48,37 @@ export function createMarketRouter(services: ServiceGetters): Router {
         endDate: endDateResult.value!,
       };
 
-      const useV06 = !config.useDuneData;
-
       const [futarchyData, meteoraData] = await Promise.all([
-        useV06
-          ? databaseService.getDailyTradingActivity(queryOptions)
-          : databaseService.getDailyBuySellVolumes(queryOptions),
-        databaseService.getDailyMeteoraVolumes(queryOptions),
+        externalDatabaseService.getFutarchyAmmDailyActivity(queryOptions),
+        externalDatabaseService.getDailyMeteoraVolumes(queryOptions),
       ]);
-      
+
       res.json({
         filters: {
           tokens: tokensResult.value || 'all',
           startDate: startDateResult.value,
           endDate: endDateResult.value,
         },
-        source: useV06 ? 'v06-indexer' : 'dune',
+        source: 'user-pool-etl',
         futarchyAMM: {
+          source: 'etl-user-pool-daily',
           count: futarchyData.length,
           data: futarchyData,
         },
         meteora: {
+          source: 'etl-meteora-daily',
           count: meteoraData.length,
           data: meteoraData,
         },
       });
     } catch (error: any) {
+      // Log the detail server-side; do NOT return raw error.message to the client
+      // (it can leak SQL/schema internals). Mirrors the global errorHandler's
+      // generic-500 behavior for unexpected errors.
+      logger.error('Failed to get market data', error, { requestId: req.requestId });
       res.status(500).json({
         error: 'Failed to get market data',
-        message: error.message,
+        requestId: req.requestId,
       });
     }
   });
diff --git a/src/routes/metrics.ts b/src/routes/metrics.ts
index 878768e..cb8df2e 100644
--- a/src/routes/metrics.ts
+++ b/src/routes/metrics.ts
@@ -1,18 +1,30 @@
 import { Router, type Request, type Response } from 'express';
 import { metricsService } from '../services/metricsService.js';
-import { parseJsonParam, parseIntParam, parseRequiredString } from '../utils/validation.js';
 import type { ServiceGetters } from './types.js';
 import { logger } from '../utils/logger.js';
 
 export function createMetricsRouter(services: ServiceGetters): Router {
   const router = Router();
-  const { getDatabaseService, getDuneCacheService, getHourlyAggregationService, getTenMinuteVolumeFetcherService, getFutarchyService } = services;
+  const { getExternalDatabaseService, getFutarchyService } = services;
+
+  // Refresh scrape-time gauges. The heartbeat keeps these up to date too; this
+  // just guarantees a scrape never reads values older than the last heartbeat.
+  async function updateMetricsSnapshot(): Promise<void> {
+    metricsService.setServedDbConnected(!!getExternalDatabaseService()?.isAvailable());
+
+    try {
+      const daos = await getFutarchyService().getAllDaos();
+      metricsService.setActiveDaosCount(daos.length);
+    } catch {
+      // Ignore errors during metrics collection
+    }
+  }
 
   // Prometheus metrics endpoint
   router.get('/metrics', async (req: Request, res: Response) => {
     try {
-      await updateMetricsSnapshot(services);
-      
+      await updateMetricsSnapshot();
+
       res.set('Content-Type', metricsService.getContentType());
       res.end(await metricsService.getMetrics());
     } catch (error: any) {
@@ -21,136 +33,5 @@ export function createMetricsRouter(services: ServiceGetters): Router {
     }
   });
 
-  // Metrics history from database
-  router.get('/api/metrics/history/:metricName', async (req: Request, res: Response) => {
-    const databaseService = getDatabaseService();
-    
-    if (!databaseService.isAvailable()) {
-      return res.status(503).json({
-        error: 'Database not connected',
-        message: 'Metrics history requires database connection',
-      });
-    }
-
-    // Validate metric name
-    const metricNameResult = parseRequiredString(req.params.metricName, 'metricName');
-    if (!metricNameResult.success) {
-      return res.status(400).json(metricNameResult.error);
-    }
-    
-    // Validate hours parameter
-    const hoursResult = parseIntParam(req.query.hours as string, 'hours', {
-      defaultValue: 24,
-      min: 1,
-      max: 168, // 1 week max
-    });
-    if (!hoursResult.success) {
-      return res.status(400).json(hoursResult.error);
-    }
-    
-    // Validate labels JSON
-    const labelsResult = parseJsonParam<Record<string, string>>(
-      req.query.labels as string,
-      'labels'
-    );
-    if (!labelsResult.success) {
-      return res.status(400).json(labelsResult.error);
-    }
-
-    try {
-      const data = await databaseService.getRecentMetrics(
-        metricNameResult.value,
-        hoursResult.value,
-        labelsResult.value
-      );
-      
-      res.json({
-        metric: metricNameResult.value,
-        hours: hoursResult.value,
-        count: data.length,
-        data,
-      });
-    } catch (error: any) {
-      res.status(500).json({
-        error: 'Failed to get metrics history',
-        message: error.message,
-      });
-    }
-  });
-
   return router;
 }
-
-// Helper function to update all metrics
-async function updateMetricsSnapshot(services: ServiceGetters): Promise<void> {
-  const databaseService = services.getDatabaseService();
-  const duneCacheService = services.getDuneCacheService();
-  const hourlyAggregationService = services.getHourlyAggregationService();
-  const tenMinuteVolumeFetcherService = services.getTenMinuteVolumeFetcherService();
-  const futarchyService = services.getFutarchyService();
-
-  metricsService.setDatabaseConnected(databaseService.isAvailable());
-  
-  if (databaseService.isAvailable()) {
-    try {
-      const dailyCount = await databaseService.getDailyRecordCount();
-      const hourlyCount = await databaseService.getHourlyRecordCount();
-      const tenMinCount = await databaseService.getTenMinuteRecordCount();
-      const buySellCount = await databaseService.getBuySellRecordCount();
-      
-      metricsService.setDatabaseRecordCount('daily_volumes', dailyCount);
-      metricsService.setDatabaseRecordCount('hourly_volumes', hourlyCount);
-      metricsService.setDatabaseRecordCount('ten_minute_volumes', tenMinCount);
-      metricsService.setDatabaseRecordCount('daily_buy_sell_volumes', buySellCount);
-
-      const dailyTokens = await databaseService.getTokenCount();
-      const hourlyTokens = await databaseService.getHourlyTokenCount();
-      metricsService.setDatabaseTokenCount('daily_volumes', dailyTokens);
-      metricsService.setDatabaseTokenCount('hourly_volumes', hourlyTokens);
-
-      const latestDaily = await databaseService.getLatestDate();
-      const latestHourly = await databaseService.getLatestHour();
-      const latestTenMin = await databaseService.getLatestTenMinuteBucket();
-      const latestBuySell = await databaseService.getLatestBuySellDate();
-      
-      metricsService.setDatabaseLatestDate('daily_volumes', latestDaily);
-      metricsService.setDatabaseLatestDate('hourly_volumes', latestHourly);
-      metricsService.setDatabaseLatestDate('ten_minute_volumes', latestTenMin);
-      metricsService.setDatabaseLatestDate('daily_buy_sell_volumes', latestBuySell);
-    } catch (error) {
-      logger.error('[Metrics] Error fetching database metrics:', error);
-    }
-  }
-
-  if (duneCacheService) {
-    const status = duneCacheService.getCacheStatus();
-    metricsService.setServiceStatus('dune_cache', status.isInitialized);
-    metricsService.setRefreshInProgress('dune_cache', status.isRefreshing);
-    if (status.lastUpdated) {
-      metricsService.setLastRefreshTime('dune_cache', status.lastUpdated);
-      metricsService.updateTimeSinceLastRefresh('dune_cache', status.lastUpdated.getTime());
-    }
-  }
-
-  if (hourlyAggregationService) {
-    metricsService.setServiceStatus('hourly_volume', hourlyAggregationService.isInitialized);
-    metricsService.setRefreshInProgress('hourly_volume', false);
-  }
-
-  if (tenMinuteVolumeFetcherService) {
-    const status = tenMinuteVolumeFetcherService.getStatus();
-    metricsService.setServiceStatus('ten_minute_volume', status.initialized);
-    metricsService.setRefreshInProgress('ten_minute_volume', status.refreshInProgress);
-    if (status.lastRefreshTime) {
-      metricsService.setLastRefreshTime('ten_minute_volume', new Date(status.lastRefreshTime));
-      metricsService.updateTimeSinceLastRefresh('ten_minute_volume', new Date(status.lastRefreshTime).getTime());
-    }
-  }
-
-  try {
-    const daos = await futarchyService.getAllDaos();
-    metricsService.setActiveDaosCount(daos.length);
-  } catch (error) {
-    // Ignore errors during metrics collection
-  }
-}
diff --git a/src/routes/root.ts b/src/routes/root.ts
index dec8528..3fef173 100644
--- a/src/routes/root.ts
+++ b/src/routes/root.ts
@@ -2,30 +2,26 @@ import { Router, type Request, type Response } from 'express';
 import { config } from '../config.js';
 import type { ServiceGetters } from './types.js';
 
-export function createRootRouter(services: ServiceGetters): Router {
+export function createRootRouter(_services: ServiceGetters): Router {
   const router = Router();
-  const { getDuneCacheService } = services;
 
   // Root endpoint with API documentation
   router.get('/', (req: Request, res: Response) => {
-    const duneCacheService = getDuneCacheService();
-    const cacheStatus = duneCacheService?.getCacheStatus();
-    
     res.json({
       name: 'Futarchy AMM - CoinGecko API',
-      version: '1.0.0',
+      version: '2.0.0',
       documentation: 'https://docs.coingecko.com/reference/exchanges-list',
       endpoints: {
         tickers: '/api/tickers - Returns all DAO tickers with pricing and volume',
-        market_data: '/api/market-data - Daily market data (futarchy AMM + Meteora); uses v0.6 indexer when USE_DUNE_DATA=false',
+        market_data: '/api/market-data - Daily market data from the served user_pool ETL',
         supply: '/api/supply/:mintAddress - Returns complete supply breakdown with allocation details',
         supply_total: '/api/supply/:mintAddress/total - Returns total supply only',
         supply_circulating: '/api/supply/:mintAddress/circulating - Returns circulating supply (excludes team performance package)',
         health: '/health',
-        health_detailed: '/api/health - Comprehensive health with DB and data freshness',
+        health_detailed: '/api/health - Comprehensive health with app DB and served ETL contract checks',
       },
       dexscreener: {
-        description: 'DexScreener Adapter (v1.1) — requires EXTERNAL_DATABASE_URL',
+        description: 'DexScreener Adapter (v1.1) — requires DATABASE_PG_URL',
         latest_block: '/dexscreener/latest-block - Latest indexed Solana slot',
         asset: '/dexscreener/asset?id=:mintAddress - Token metadata',
         pair: '/dexscreener/pair?id=:daoAddress - Pair info',
@@ -43,17 +39,7 @@ export function createRootRouter(services: ServiceGetters): Router {
         futarchyAmmLiquidity: 'Tokens in the internal FutarchyAMM for spot trading - IS circulating',
         meteoraLpLiquidity: 'Tokens in the external Meteora DAMM pool (POL) - IS circulating',
       },
-      caching: {
-        description: 'Dune data is cached and refreshed hourly to improve response times',
-        refreshInterval: `${parseInt(process.env.DUNE_CACHE_REFRESH_INTERVAL || '3600')} seconds`,
-        fetchTimeout: `${parseInt(process.env.DUNE_FETCH_TIMEOUT || '240')} seconds`,
-        status: cacheStatus ? {
-          isInitialized: cacheStatus.isInitialized,
-          poolMetricsCount: cacheStatus.poolMetricsCount,
-          lastUpdated: cacheStatus.lastUpdated.toISOString(),
-        } : 'Not available (DUNE_API_KEY not set)',
-      },
-      note: 'This API automatically discovers and aggregates all DAOs from the Futarchy protocol.',
+      note: 'Read-only API. Market data and ticker volume are served from the user_pool ETL in the served DB; no Dune, no in-process indexing.',
     });
   });
 
diff --git a/src/routes/types.ts b/src/routes/types.ts
index 5b3c0ed..55a3279 100644
--- a/src/routes/types.ts
+++ b/src/routes/types.ts
@@ -1,16 +1,8 @@
 import type { FutarchyService } from '../services/futarchyService.js';
 import type { PriceService } from '../services/priceService.js';
-import type { DuneService } from '../services/duneService.js';
-import type { DuneCacheService } from '../services/duneCacheService.js';
 import type { SolanaService } from '../services/solanaService.js';
 import type { LaunchpadService } from '../services/launchpadService.js';
-import type { DatabaseService } from '../services/databaseService.js';
-import type { HourlyAggregationService } from '../services/hourlyAggregationService.js';
-import type { TenMinuteVolumeFetcherService } from '../services/tenMinuteVolumeFetcherService.js';
-import type { DailyAggregationService } from '../services/dailyAggregationService.js';
-import type { MeteoraVolumeFetcherService } from '../services/meteoraVolumeFetcherService.js';
 import type { ExternalDatabaseService } from '../services/externalDatabaseService.js';
-import type { V06ReconciliationService } from '../services/v06ReconciliationService.js';
 import { AppError } from '../middleware/errorHandler.js';
 
 /**
@@ -24,16 +16,8 @@ import { AppError } from '../middleware/errorHandler.js';
 export interface Services {
   futarchyService: FutarchyService;
   priceService: PriceService;
-  databaseService: DatabaseService;
 
   externalDatabaseService: ExternalDatabaseService | null;
-  duneService: DuneService | null;
-  duneCacheService: DuneCacheService | null;
-  hourlyAggregationService: HourlyAggregationService | null;
-  tenMinuteVolumeFetcherService: TenMinuteVolumeFetcherService | null;
-  dailyAggregationService: DailyAggregationService | null;
-  meteoraVolumeFetcherService: MeteoraVolumeFetcherService | null;
-  v06ReconciliationService: V06ReconciliationService | null;
 
   solanaService?: SolanaService;
   launchpadService?: LaunchpadService;
@@ -47,15 +31,8 @@ export interface Services {
 export interface ServiceGetters {
   getFutarchyService: () => FutarchyService;
   getPriceService: () => PriceService;
-  getDuneService: () => DuneService | null;
-  getDuneCacheService: () => DuneCacheService | null;
   getSolanaService: () => SolanaService;
   getLaunchpadService: () => LaunchpadService;
-  getDatabaseService: () => DatabaseService;
-  getHourlyAggregationService: () => HourlyAggregationService | null;
-  getTenMinuteVolumeFetcherService: () => TenMinuteVolumeFetcherService | null;
-  getDailyAggregationService: () => DailyAggregationService | null;
-  getMeteoraVolumeFetcherService: () => MeteoraVolumeFetcherService | null;
   getExternalDatabaseService: () => ExternalDatabaseService | null;
 }
 
@@ -72,14 +49,7 @@ export function createServiceGetters(services: Services): ServiceGetters {
   return {
     getFutarchyService: () => services.futarchyService,
     getPriceService: () => services.priceService,
-    getDatabaseService: () => services.databaseService,
 
-    getDuneService: () => optionalService(services.duneService),
-    getDuneCacheService: () => optionalService(services.duneCacheService),
-    getHourlyAggregationService: () => optionalService(services.hourlyAggregationService),
-    getTenMinuteVolumeFetcherService: () => optionalService(services.tenMinuteVolumeFetcherService),
-    getDailyAggregationService: () => optionalService(services.dailyAggregationService),
-    getMeteoraVolumeFetcherService: () => optionalService(services.meteoraVolumeFetcherService),
     getExternalDatabaseService: () => optionalService(services.externalDatabaseService),
 
     getSolanaService: () => requireService(services.solanaService, 'Solana'),
diff --git a/src/runtime/heartbeat.ts b/src/runtime/heartbeat.ts
new file mode 100644
index 0000000..f987c9f
--- /dev/null
+++ b/src/runtime/heartbeat.ts
@@ -0,0 +1,101 @@
+/**
+ * Background heartbeat: the API's self-check loop.
+ *
+ * Replaces the old app-DB health snapshots. Every tick it verifies the served
+ * ETL DB (the API's only data dependency) along three axes and pushes webhook
+ * alerts (with cooldowns) when something is wrong, so failures surface even
+ * when no consumer happens to be polling:
+ *
+ *  1. connectivity — is the served DB reachable?
+ *  2. freshness    — how old is the newest user_pool swap? (a connected DB
+ *                    with a stalled ETL is still an outage for consumers)
+ *  3. contract     — every Nth tick, do the required tables/columns exist?
+ *
+ * Each tick also updates the Prometheus gauges, so /metrics exposes the same
+ * signals for scrape-based alerting.
+ */
+
+import { config } from '../config.js';
+import { metricsService } from '../services/metricsService.js';
+import { sendAlert } from '../utils/alerts.js';
+import { logger } from '../utils/logger.js';
+import { scheduleWithoutPileup, type ScheduledTask } from '../utils/scheduling.js';
+import type { Services } from '../routes/types.js';
+
+const ALERT_COOLDOWN_MS = 10 * 60 * 1000;
+
+export function startHeartbeat(services: Services): ScheduledTask | null {
+  if (config.heartbeat.intervalMs <= 0) {
+    logger.info('[Heartbeat] Disabled (HEARTBEAT_INTERVAL_MS <= 0)');
+    return null;
+  }
+
+  let tick = 0;
+
+  return scheduleWithoutPileup(
+    async () => {
+      tick++;
+      metricsService.markHeartbeatRun();
+
+      const extDb = services.externalDatabaseService;
+
+      // 1. Connectivity
+      if (!extDb?.isAvailable()) {
+        metricsService.setServedDbConnected(false);
+        logger.warn('[Heartbeat] Served DB not connected');
+        sendAlert('Heartbeat: served (external) DB not connected — market data routes are returning 503', {
+          cooldownKey: 'heartbeat-served-db-down',
+          cooldownMs: ALERT_COOLDOWN_MS,
+        });
+        return;
+      }
+      metricsService.setServedDbConnected(true);
+
+      // 2. Data freshness
+      try {
+        const freshness = await extDb.getServedDataFreshness();
+        metricsService.setServedDataAgeSeconds(freshness.ageSeconds);
+
+        const maxAge = config.heartbeat.maxDataAgeSeconds;
+        if (maxAge > 0 && freshness.ageSeconds !== null && freshness.ageSeconds > maxAge) {
+          logger.warn('[Heartbeat] Served data is stale', {
+            ageSeconds: freshness.ageSeconds,
+            latestSwapAt: freshness.latestSwapAt,
+            maxAgeSeconds: maxAge,
+          });
+          sendAlert(
+            `Heartbeat: served data is stale — newest swap is ${Math.round(freshness.ageSeconds / 60)}min old (threshold ${Math.round(maxAge / 60)}min). ETL pipeline may be stalled.`,
+            { cooldownKey: 'heartbeat-data-stale', cooldownMs: ALERT_COOLDOWN_MS }
+          );
+        }
+      } catch (error) {
+        logger.error('[Heartbeat] Freshness check failed', error);
+        sendAlert('Heartbeat: served DB freshness check failed (query error)', {
+          cooldownKey: 'heartbeat-freshness-failed',
+          cooldownMs: ALERT_COOLDOWN_MS,
+        });
+      }
+
+      // 3. Served-data contract (cheap information_schema query, but no need
+      //    to run it every minute — schema drift is not a fast-moving failure)
+      if (tick === 1 || tick % config.heartbeat.contractCheckEveryTicks === 0) {
+        const contract = await extDb.checkServedDataContract();
+        metricsService.setServedContractOk(contract.ok);
+        if (!contract.ok) {
+          logger.error('[Heartbeat] Served data contract check failed', undefined, {
+            missing: contract.missing,
+          });
+          sendAlert(
+            `Heartbeat: served ETL contract check failed — missing: ${contract.missing.join(', ')}`,
+            { cooldownKey: 'heartbeat-contract-failed', cooldownMs: ALERT_COOLDOWN_MS }
+          );
+        }
+      }
+    },
+    {
+      name: 'Heartbeat',
+      intervalMs: config.heartbeat.intervalMs,
+      immediate: true,
+    }
+  );
+}
diff --git a/src/runtime/services.ts b/src/runtime/services.ts
new file mode 100644
index 0000000..491e24c
--- /dev/null
+++ b/src/runtime/services.ts
@@ -0,0 +1,41 @@
+import type { Services } from '../app.js';
+import { ExternalDatabaseService } from '../services/externalDatabaseService.js';
+import { FutarchyService } from '../services/futarchyService.js';
+import { LaunchpadService } from '../services/launchpadService.js';
+import { PriceService } from '../services/priceService.js';
+import { SolanaService } from '../services/solanaService.js';
+import { logger } from '../utils/logger.js';
+
+export function createServices(): Services {
+  const futarchyService = new FutarchyService();
+  const priceService = new PriceService();
+  const externalDatabaseService = new ExternalDatabaseService();
+  const solanaService = new SolanaService();
+  const launchpadService = new LaunchpadService();
+
+  return {
+    futarchyService,
+    priceService,
+    externalDatabaseService,
+    solanaService,
+    launchpadService,
+  };
+}
+
+export async function initializeRuntimeDataStores(
+  services: Services,
+  runtimeName: string
+): Promise<void> {
+  if (services.externalDatabaseService) {
+    const extConnected = await services.externalDatabaseService.initialize();
+    if (extConnected) {
+      logger.info(`${runtimeName} served (external) indexer database initialized and connected`);
+    } else {
+      logger.warn(`${runtimeName} served (external) indexer database not available — market data routes will return 503`);
+    }
+  }
+}
+
+export async function closeDataStores(services: Services): Promise<void> {
+  await services.externalDatabaseService?.close();
+}
diff --git a/src/schema/dune-all-volume.sql b/src/schema/dune-all-volume.sql
deleted file mode 100644
index 6876038..0000000
--- a/src/schema/dune-all-volume.sql
+++ /dev/null
@@ -1,85 +0,0 @@
--- Aggregate Volume Query with Daily Breakdown
--- Query ID: 6422948
--- Returns daily volume data for each token, grouped by token and date
--- Parameters:
---   {{since_start}}: true = all history since 2025-10-09, false = last 24 hours
---   {{token_list}}: comma-separated token addresses in format 'token1', 'token2'
-
-WITH filtered_and_extracted AS (
-    -- Combine filtering and extraction in one pass to reduce I/O
-    -- Extract only what we need, when we need it
-    SELECT
-        block_time,
-        CAST(block_time AS DATE) AS trading_date,
-        tx_id,
-        -- Extract token immediately during scan
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 279, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 543, 32))
-        END AS token,
-        -- Extract swap_type once
-        CASE
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '00' THEN 'buy'
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '01' THEN 'sell'
-        END AS swap_type,
-        -- Pre-calculate amounts (divide by 1e6 once)
-        from_big_endian_64(reverse(SUBSTR(data, 106, 8))) / 1e6 AS input_amount,
-        from_big_endian_64(reverse(SUBSTR(data, 114, 8))) / 1e6 AS output_amount,
-        -- Extract quote_mint if needed for debugging
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 311, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 575, 32))
-        END AS quote_mint
-    FROM solana.instruction_calls
-    WHERE 
-        -- Most selective filters first (reduce cardinality early)
-        block_time >= TIMESTAMP '2025-10-09'
-        AND tx_success = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND is_inner = true
-        -- More expensive filters last
-        AND cardinality(account_arguments) = 1
-        AND CAST(data AS VARCHAR) LIKE '0xe445a52e51cb9a1d%'
-        AND LENGTH(data) >= 300
-        AND array_join(log_messages, ' ') LIKE '%SpotSwap%'
-),
-token_filtered AS (
-    -- Apply token filter and quality checks
-    SELECT
-        block_time,
-        trading_date,
-        tx_id,
-        token,
-        quote_mint,
-        swap_type,
-        input_amount,
-        output_amount,
-        -- Calculate price once per row
-        CASE
-            WHEN swap_type = 'buy' THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered_and_extracted
-    WHERE 
-        -- Apply token filter early
-        (COALESCE({{token_list}}, '') = '' OR token IN ({{token_list}}))
-        -- Data quality filters
-        AND swap_type IN ('buy', 'sell')
-        AND input_amount > 0
-        AND output_amount > 0
-        AND token IS NOT NULL
-)
--- Final aggregation by token AND date for daily breakdown
-SELECT
-    token,
-    CAST(trading_date AS VARCHAR) AS date,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS VARCHAR) AS base_volume,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS VARCHAR) AS target_volume,
-    CAST(MAX(price) AS VARCHAR) AS high,
-    CAST(MIN(price) AS VARCHAR) AS low
-FROM token_filtered
-WHERE price IS NOT NULL AND price > 0
-GROUP BY token, trading_date
-ORDER BY token ASC, trading_date ASC;
\ No newline at end of file
diff --git a/src/schema/dune-daily-buy-sell-volume.sql b/src/schema/dune-daily-buy-sell-volume.sql
deleted file mode 100644
index 118f830..0000000
--- a/src/schema/dune-daily-buy-sell-volume.sql
+++ /dev/null
@@ -1,69 +0,0 @@
--- Dune Query: Daily Buy/Sell Volume per Token
--- Parameters: 
---   start_date: DATE - fetch data from this date onwards
---   token_list: TEXT - comma-separated list of tokens, or '__ALL__' for all tokens
---
--- For incremental fetches, set start_date to last complete date
--- Cumulative values are calculated in PostgreSQL, not here (saves credits)
-
-WITH filtered AS (
-    SELECT
-        block_time,
-        tx_id,
-        CASE
-            WHEN varbinary_length(data) = 406 THEN to_base58(varbinary_substring(data, 279, 32))
-            WHEN varbinary_length(data) = 670 THEN to_base58(varbinary_substring(data, 543, 32))
-        END AS token,
-        CASE varbinary_substring(data, 105, 1)
-            WHEN 0x00 THEN 'buy'
-            WHEN 0x01 THEN 'sell'
-        END AS swap_type,
-        varbinary_to_bigint(varbinary_reverse(varbinary_substring(data, 106, 8))) / 1e6 AS input_amount,
-        varbinary_to_bigint(varbinary_reverse(varbinary_substring(data, 114, 8))) / 1e6 AS output_amount
-    FROM solana.instruction_calls
-    WHERE 
-        -- Use start_date parameter for incremental fetching
-        block_date >= DATE '{{start_date}}'
-        AND block_date <= CURRENT_DATE
-        AND tx_success = true
-        AND is_inner = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND cardinality(account_arguments) = 1
-        AND varbinary_starts_with(data, 0xe445a52e51cb9a1d)
-        AND varbinary_length(data) IN (406, 670)
-        AND any_match(log_messages, x -> strpos(x, 'SpotSwap') > 0)
-),
-clean AS (
-    SELECT
-        token,
-        date_trunc('day', block_time) AS trading_date,
-        swap_type,
-        input_amount,
-        output_amount,
-        CASE
-            WHEN swap_type = 'buy'  THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered
-    WHERE
-        token IS NOT NULL
-        AND input_amount > 0
-        AND output_amount > 0
-        AND ('__ALL__' IN ({{token_list}}) OR token IN ({{token_list}}))
-)
-SELECT
-    token,
-    trading_date AS date,
-    SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS base_volume,
-    SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS target_volume,
-    SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE 0 END) AS buy_usdc_volume,
-    SUM(CASE WHEN swap_type = 'sell' THEN input_amount ELSE 0 END) AS sell_token_volume,
-    MAX(price) AS high,
-    MIN(price) AS low,
-    COUNT(*) AS trade_count
-FROM clean
-WHERE price > 0
-GROUP BY 1, 2
-ORDER BY token, trading_date;
diff --git a/src/schema/dune-daily-fees-volume.sql b/src/schema/dune-daily-fees-volume.sql
deleted file mode 100644
index 0a033b3..0000000
--- a/src/schema/dune-daily-fees-volume.sql
+++ /dev/null
@@ -1,116 +0,0 @@
--- Dune Query: Daily Fees and Volume per Token
--- Parameters: 
---   start_date: DATE - fetch data from this date onwards
---   token_list: TEXT - comma-separated list of tokens, or '__ALL__' for all tokens
---
--- For incremental fetches, set start_date to last complete date
--- Cumulative values are calculated in the query (stored in DB)
-
-WITH filtered AS (
-    -- Combine filtering and extraction in one pass to reduce I/O
-    -- Extract only what we need, when we need it
-    SELECT
-        block_time,
-        tx_id,
-        -- Extract token immediately during scan
-        CASE
-            WHEN varbinary_length(data) = 406 THEN to_base58(varbinary_substring(data, 279, 32))
-            WHEN varbinary_length(data) = 670 THEN to_base58(varbinary_substring(data, 543, 32))
-        END AS token,
-        -- Extract swap_type once
-        CASE varbinary_substring(data, 105, 1)
-            WHEN 0x00 THEN 'buy'
-            WHEN 0x01 THEN 'sell'
-        END AS swap_type,
-        -- Pre-calculate amounts (divide by 1e6 once)
-        varbinary_to_bigint(varbinary_reverse(varbinary_substring(data, 106, 8))) / 1e6 AS input_amount,
-        varbinary_to_bigint(varbinary_reverse(varbinary_substring(data, 114, 8))) / 1e6 AS output_amount
-    FROM solana.instruction_calls
-    WHERE 
-        -- partition pruning (huge)
-        block_date >= DATE '{{start_date}}'
-        AND block_date <= CURRENT_DATE
-
-        AND tx_success = true
-        AND is_inner = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND cardinality(account_arguments) = 1
-
-        -- cheap + selective varbinary checks
-        AND varbinary_starts_with(data, 0xe445a52e51cb9a1d)
-        AND varbinary_length(data) IN (406, 670)
-
-        -- avoid array_join
-        AND any_match(log_messages, x -> strpos(x, 'SpotSwap') > 0)
-),
-clean AS (
-  SELECT
-    token,
-    date_trunc('day', block_time) AS trading_date,
-    swap_type,
-    input_amount,
-    output_amount,
-    CASE
-      WHEN swap_type = 'buy'  THEN input_amount / NULLIF(output_amount, 0)
-      WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-    END AS price
-  FROM filtered
-  WHERE
-    ('__ALL__' IN ({{token_list}}) OR token IN ({{token_list}}))
-    AND input_amount > 0
-    AND output_amount > 0
-    AND token IS NOT NULL
-),
-daily AS (
-  SELECT
-    token,
-    trading_date,
-    SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS base_volume,
-    SUM(CASE WHEN swap_type = 'buy' THEN input_amount  ELSE output_amount END) AS target_volume,
-    SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE 0 END) AS usdc_volume,
-    SUM(CASE WHEN swap_type = 'sell' THEN input_amount ELSE 0 END) AS token_volume,
-    MAX(price) AS high,
-    AVG(price) AS average_price,
-    MIN(price) AS low
-  FROM clean
-  WHERE price > 0
-  GROUP BY 1, 2
-)
-SELECT
-  token,
-  trading_date,
-  base_volume,
-  target_volume,
-  COALESCE(usdc_volume * 0.005, 0) AS usdc_fees,
-  COALESCE(token_volume * 0.005 * average_price, 0) AS token_fees_usdc,
-  token_volume * 0.005 AS token_fees,
-  usdc_volume AS buy_volume,
-  token_volume AS sell_volume,
-  token_volume * average_price AS sell_volume_usdc,
-  SUM(usdc_volume) OVER (
-    PARTITION BY token
-    ORDER BY trading_date
-    ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-  ) * 0.005 AS cumulative_usdc_fees,
-  SUM(token_volume * average_price) OVER (
-    PARTITION BY token
-    ORDER BY trading_date
-    ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-  ) * 0.005 AS cumulative_token_in_usdc_fees,
-  SUM(target_volume) OVER (
-    PARTITION BY token
-    ORDER BY trading_date
-    ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-  ) AS cumulative_target_volume,
-  SUM(base_volume) OVER (
-    PARTITION BY token
-    ORDER BY trading_date
-    ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-  ) AS cumulative_token_volume,
-  high,
-  average_price,
-  low
-FROM daily
-ORDER BY token, trading_date;
diff --git a/src/schema/dune-hourly-volume.sql b/src/schema/dune-hourly-volume.sql
deleted file mode 100644
index ced690d..0000000
--- a/src/schema/dune-hourly-volume.sql
+++ /dev/null
@@ -1,88 +0,0 @@
--- Hourly Volume Query with start_time Parameter
--- Returns hourly volume data for each token, starting from a specified timestamp
--- Used for:
---   1. Backfilling historical hourly data
---   2. Refreshing the current incomplete hour every ~10 minutes
--- 
--- Parameters:
---   {{start_time}}: Start timestamp for data fetch (format: YYYY-MM-DD HH:MM:SS, e.g., '2025-10-09 00:00:00')
---   {{token_list}}: comma-separated token addresses in format 'token1', 'token2'
---                   Use '__ALL__' to fetch all tokens
---
--- Usage:
---   - For full backfill: start_time = '2025-10-09 00:00:00', token_list = '__ALL__'
---   - For current hour: start_time = current hour start (e.g., '2026-01-07 20:00:00')
---   - For incremental: start_time = last fetched hour
-
-WITH filtered_and_extracted AS (
-    SELECT
-        block_time,
-        -- Truncate to hour for grouping
-        date_trunc('hour', block_time) AS trading_hour,
-        tx_id,
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 279, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 543, 32))
-        END AS token,
-        CASE
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '00' THEN 'buy'
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '01' THEN 'sell'
-        END AS swap_type,
-        from_big_endian_64(reverse(SUBSTR(data, 106, 8))) / 1e6 AS input_amount,
-        from_big_endian_64(reverse(SUBSTR(data, 114, 8))) / 1e6 AS output_amount,
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 311, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 575, 32))
-        END AS quote_mint
-    FROM solana.instruction_calls
-    WHERE 
-        -- Use parameterized start_time for incremental fetching
-        block_time >= TIMESTAMP '{{start_time}}'
-        AND tx_success = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND is_inner = true
-        AND cardinality(account_arguments) = 1
-        AND CAST(data AS VARCHAR) LIKE '0xe445a52e51cb9a1d%'
-        AND LENGTH(data) >= 300
-        AND array_join(log_messages, ' ') LIKE '%SpotSwap%'
-),
-token_filtered AS (
-    SELECT
-        block_time,
-        trading_hour,
-        tx_id,
-        token,
-        quote_mint,
-        swap_type,
-        input_amount,
-        output_amount,
-        CASE
-            WHEN swap_type = 'buy' THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered_and_extracted
-    WHERE 
-        -- When '__ALL__' is in the list, return all tokens; otherwise filter by token_list
-        ('__ALL__' IN ({{token_list}}) OR token IN ({{token_list}}))
-        AND swap_type IN ('buy', 'sell')
-        AND input_amount > 0
-        AND output_amount > 0
-        AND token IS NOT NULL
-)
--- Aggregate by token AND hour for hourly breakdown
-SELECT
-    token,
-    -- Format as ISO timestamp string for easy parsing
-    CAST(trading_hour AS VARCHAR) AS hour,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS VARCHAR) AS base_volume,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS VARCHAR) AS target_volume,
-    CAST(MAX(price) AS VARCHAR) AS high,
-    CAST(MIN(price) AS VARCHAR) AS low,
-    CAST(COUNT(*) AS VARCHAR) AS trade_count
-FROM token_filtered
-WHERE price IS NOT NULL AND price > 0
-GROUP BY token, trading_hour
-ORDER BY token ASC, trading_hour ASC;
-
diff --git a/src/schema/dune-incremental-volume.sql b/src/schema/dune-incremental-volume.sql
deleted file mode 100644
index c904a01..0000000
--- a/src/schema/dune-incremental-volume.sql
+++ /dev/null
@@ -1,94 +0,0 @@
--- Incremental Volume Query with start_date Parameter
--- Fork of Query ID: 6422948
--- Returns daily volume data for each token, starting from a specified date
--- 
--- Parameters:
---   {{start_date}}: Start date for data fetch (format: YYYY-MM-DD, e.g., '2025-10-09')
---   {{token_list}}: comma-separated token addresses in format 'token1', 'token2'
---                   Use '__ALL__' to fetch all tokens (required - can't be empty)
---
--- Usage:
---   - For full backfill: start_date = '2025-10-09', token_list = '__ALL__'
---   - For incremental: start_date = last fetched date (e.g., '2026-01-05')
---   - For specific tokens: token_list = 'token1', 'token2', 'token3'
-
-WITH filtered_and_extracted AS (
-    -- Combine filtering and extraction in one pass to reduce I/O
-    -- Extract only what we need, when we need it
-    SELECT
-        block_time,
-        CAST(block_time AS DATE) AS trading_date,
-        tx_id,
-        -- Extract token immediately during scan
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 279, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 543, 32))
-        END AS token,
-        -- Extract swap_type once
-        CASE
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '00' THEN 'buy'
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '01' THEN 'sell'
-        END AS swap_type,
-        -- Pre-calculate amounts (divide by 1e6 once)
-        from_big_endian_64(reverse(SUBSTR(data, 106, 8))) / 1e6 AS input_amount,
-        from_big_endian_64(reverse(SUBSTR(data, 114, 8))) / 1e6 AS output_amount,
-        -- Extract quote_mint if needed for debugging
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 311, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 575, 32))
-        END AS quote_mint
-    FROM solana.instruction_calls
-    WHERE 
-        -- Use parameterized start_date for incremental fetching
-        block_time >= TIMESTAMP '{{start_date}}'
-        AND tx_success = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND is_inner = true
-        -- More expensive filters last
-        AND cardinality(account_arguments) = 1
-        AND CAST(data AS VARCHAR) LIKE '0xe445a52e51cb9a1d%'
-        AND LENGTH(data) >= 300
-        AND array_join(log_messages, ' ') LIKE '%SpotSwap%'
-),
-token_filtered AS (
-    -- Apply token filter and quality checks
-    SELECT
-        block_time,
-        trading_date,
-        tx_id,
-        token,
-        quote_mint,
-        swap_type,
-        input_amount,
-        output_amount,
-        -- Calculate price once per row
-        CASE
-            WHEN swap_type = 'buy' THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered_and_extracted
-    WHERE 
-        -- Apply token filter early
-        -- When '__ALL__' is in the list, return all tokens; otherwise filter by token_list
-        ('__ALL__' IN ({{token_list}}) OR token IN ({{token_list}}))
-        -- Data quality filters
-        AND swap_type IN ('buy', 'sell')
-        AND input_amount > 0
-        AND output_amount > 0
-        AND token IS NOT NULL
-)
--- Final aggregation by token AND date for daily breakdown
-SELECT
-    token,
-    CAST(trading_date AS VARCHAR) AS date,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS VARCHAR) AS base_volume,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS VARCHAR) AS target_volume,
-    CAST(MAX(price) AS VARCHAR) AS high,
-    CAST(MIN(price) AS VARCHAR) AS low
-FROM token_filtered
-WHERE price IS NOT NULL AND price > 0
-GROUP BY token, trading_date
-ORDER BY token ASC, trading_date ASC;
-
diff --git a/src/schema/dune-meteora-volumes.sql b/src/schema/dune-meteora-volumes.sql
deleted file mode 100644
index 8bb6379..0000000
--- a/src/schema/dune-meteora-volumes.sql
+++ /dev/null
@@ -1,355 +0,0 @@
--- Dune Query: Meteora Daily Volumes per Owner
--- Deploy: paste this file into the query behind DUNE_METEORA_VOLUME_QUERY_ID (see .env).
---
--- Parameters:
---   start_date: DATE - fetch data from this date onwards (default: '2025-10-09')
---   end_date: DATE (optional) - fetch data up to this date (inclusive). If not provided, fetches all data from start_date onwards.
---
--- Returns daily aggregated data per owner with all required fields
--- Cumulative fields are calculated in PostgreSQL, not here
-
-WITH
-params AS (
-  SELECT 
-    TIMESTAMP '{{start_date}}' AS start_ts,
-    CASE 
-      WHEN '{{end_date}}' = '9999-12-31' -- Sentinel value means no constraint
-      THEN TIMESTAMP '9999-12-31' -- No end date constraint if not provided
-      ELSE (CAST('{{end_date}}' AS TIMESTAMP) + INTERVAL '1' DAY) -- Make end_date inclusive by adding 1 day
-    END AS end_ts
-),
-
-target_pools AS (
-  SELECT '7dVri3qjYD3uobSZL3Zth8vSCgU6r6R2nvFsh7uVfDte' AS pool -- Umbra / USDC
-  UNION ALL SELECT '59WuweKV7DAg8aUgRhNytScQxioaFYNJdWnox5FxAXFq' -- Ranger / USDC
-  UNION ALL SELECT '6F88Y6iukU9GuL8CMWnx6YT832vBymNPicJBikQWeYe4' -- Paystream / USDC
-  UNION ALL SELECT 'BGg7WsK98rhqtTp2uSKMa2yETqgwShFAjyf1RmYqCF7n' -- Loyal / USDC
-  UNION ALL SELECT '5gB4NPgFB3MHFHSeKN4sbaY6t9MB8ikCe9HyiKYid4Td' -- Avici / USDC
-  UNION ALL SELECT '57SnL1dxJPgc6TH6DcbRn7Nn5jnYCdcrkpVTy9d5vRuP' -- ZKFG / USDC
-  UNION ALL SELECT '2zsbECzM7roqnDcuv2TNGpfv5PAnuqGmMo5YPtqmUz5p' -- Solomon / USDC
-  UNION ALL SELECT 'G63kb4W4nsHFsWExtz5vBipqiESCVYua8PzDmswDNZ8S' -- Omnipair / USDC (DAMM v2, v0.6 config)
-  UNION ALL SELECT 'AMAYXpujqBETmLz3GRppj5nKdpJLEbLXWbAJq8Zgiqav' -- Superclaw / USDC
-  UNION ALL SELECT '4cY7i4Pnt8zAgZi5k986AnNdpdHm9hLjnH9xYjRbMybr' -- Futardio cult / USDC
-),
-
-/* First on-chain add_liquidity per pool/owner — supplies position account for newer pools (see meteoraService.ts owners). */
-new_pool_first_position AS (
-  SELECT account_pool AS pool, account_owner AS owner, account_position AS position
-  FROM (
-    SELECT
-      account_pool,
-      account_owner,
-      account_position,
-      ROW_NUMBER() OVER (
-        PARTITION BY account_pool, account_owner
-        ORDER BY call_block_time ASC
-      ) AS rn
-    FROM meteora_solana.cp_amm_call_add_liquidity
-    WHERE account_pool IN (
-      'G63kb4W4nsHFsWExtz5vBipqiESCVYua8PzDmswDNZ8S',
-      'AMAYXpujqBETmLz3GRppj5nKdpJLEbLXWbAJq8Zgiqav',
-      '4cY7i4Pnt8zAgZi5k986AnNdpdHm9hLjnH9xYjRbMybr'
-    )
-    AND account_owner IN (
-      '8s6Jdoh7tgUqmU3D2EmpNJHSvuN5U4NybpLAdsiMitwB',
-      '5ZPnwQDU7dEKdMGqaY5oCQkiuQpwjtYSJNMNpiStTNvU',
-      'FeMyhpB3LJuuuA1oLzXFDuZ48EJz46gyyk3w2xuQA8uw'
-    )
-  ) x
-  WHERE rn = 1
-),
-
-pool_map AS (
-  -- pool, position, owner (one row per pool you want to track)
-  SELECT '7dVri3qjYD3uobSZL3Zth8vSCgU6r6R2nvFsh7uVfDte' AS pool,
-         '2b3fM2n9iTPG1xJrPevtdQ7Ju5QHuRbBmmA84k3UF4TA' AS position,
-         '6VsC8PuKkXm5xo54c2vbrAaSfQipkpGHqNuKTxXFySx6' AS owner
-  UNION ALL SELECT '59WuweKV7DAg8aUgRhNytScQxioaFYNJdWnox5FxAXFq',
-                  'GyPSZcXCEGxHrcX5Trs131G13HbwDYZfr2pPAijzAEcg',
-                  '55H1Q1YrHJQ93uhG4jqrBBHx3a8H7TCM8kvf2UM2g5q3'
-  UNION ALL SELECT '6F88Y6iukU9GuL8CMWnx6YT832vBymNPicJBikQWeYe4',
-                  'oawFz9eK6eqiTKDuoShc14Tt7sjzgjBY9VGGwpjdNGb',
-                  'BpXtB2ASf2Tft97ewTd8PayXCqFQ6Wqod33qrwwfK9Vz'
-  UNION ALL SELECT 'BGg7WsK98rhqtTp2uSKMa2yETqgwShFAjyf1RmYqCF7n',
-                  '5xhd93HfYtsjvDki7ZWs2NSukfKdXzWPVvD7tnQ4Xkb5',
-                  'AQyyTwCKemeeMu8ZPZFxrXMbVwAYTSbBhi1w4PBrhvYE'
-  UNION ALL SELECT '5gB4NPgFB3MHFHSeKN4sbaY6t9MB8ikCe9HyiKYid4Td',
-                  '3n3bY2XBcuqXDZ5kXZLKUzFSoSKPJjjZtyDa11CwfDqC',
-                  'DGgYoUcu1aDZt4GEL5NQiducwHRGbkMWsUzsXh2j622G'
-  UNION ALL SELECT '57SnL1dxJPgc6TH6DcbRn7Nn5jnYCdcrkpVTy9d5vRuP',
-                  '6PW5FipH8374LuocEAfjLKUJ991hsyBR8UQ1CEYkJgAa',
-                  'BNvDfXYG2FAyBDYD71Xr9GhKE18MbmhtjsLKsCuXho6z'
-  UNION ALL SELECT '2zsbECzM7roqnDcuv2TNGpfv5PAnuqGmMo5YPtqmUz5p',
-                  'w1BDxR4FvN4KryBuJwcEuohYKHkyDzD1beNH3AhF6Wn',
-                  '98SPcyUZ2rqM2dgjCqqSXS4gJrNTLSNUAAVCF38xYj9u'
-  UNION ALL SELECT pool, position, owner FROM new_pool_first_position
-),
-
-/* -----------------------------
-   INIT LIQUIDITY (KEEP THIS)
-   evtinitializepool lacks owner/position, so we attribute init liquidity
-   to the first add_liquidity call AFTER init for that pool.
-   ----------------------------- */
-initial_liquidity AS (
-  SELECT
-    e.evt_block_time AS time,
-    m.pool,
-    m.position,
-    m.owner,
-    -- if DECIMAL(38,0) overflows for some pools, switch to TRY_CAST(... AS DOUBLE)
-    CAST(e.liquidity AS DECIMAL(38,0)) AS liquidity_delta
-  FROM meteora_solana.cp_amm_evt_evtinitializepool e
-  JOIN pool_map m
-    ON m.pool = e.pool
-  WHERE e.evt_block_time >= (SELECT start_ts FROM params)
-    AND e.evt_block_time < (SELECT end_ts FROM params)
-),
-
-/* -----------------------------
-   ADD/REMOVE LIQUIDITY (ROBUST JSON PATHS + NULL-SAFE)
-   ----------------------------- */
-add_liquidity AS (
-  SELECT
-    call_block_time AS time,
-    account_pool AS pool,
-    account_position AS position,
-    account_owner AS owner,
-    COALESCE(
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.AddLiquidityParameters.liquidity_delta') AS DOUBLE),
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.AddLiquidityParameters2.liquidity_delta') AS DOUBLE),
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.liquidity_delta') AS DOUBLE),
-      0
-    ) AS liquidity_delta
-  FROM meteora_solana.cp_amm_call_add_liquidity
-  WHERE call_block_time >= (SELECT start_ts FROM params)
-    AND call_block_time < (SELECT end_ts FROM params)
-    AND account_pool IN (SELECT pool FROM target_pools)
-),
-
-remove_liquidity AS (
-  SELECT
-    call_block_time AS time,
-    account_pool AS pool,
-    account_position AS position,
-    account_owner AS owner,
-    -COALESCE(
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.RemoveLiquidityParameters.liquidity_delta') AS DOUBLE),
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.RemoveLiquidityParameters2.liquidity_delta') AS DOUBLE),
-      TRY_CAST(JSON_EXTRACT_SCALAR(params, '$.liquidity_delta') AS DOUBLE),
-      0
-    ) AS liquidity_delta
-  FROM meteora_solana.cp_amm_call_remove_liquidity
-  WHERE call_block_time >= (SELECT start_ts FROM params)
-    AND call_block_time < (SELECT end_ts FROM params)
-    AND account_pool IN (SELECT pool FROM target_pools)
-),
-
-all_liquidity_changes AS (
-  SELECT * FROM initial_liquidity
-  UNION ALL SELECT * FROM add_liquidity
-  UNION ALL SELECT * FROM remove_liquidity
-),
-
-liquidity_deltas_daily AS (
-  SELECT
-    DATE_TRUNC('day', time) AS day,
-    pool,
-    position,
-    owner,
-    SUM(COALESCE(liquidity_delta, 0)) AS liquidity_delta_day
-  FROM all_liquidity_changes
-  GROUP BY 1,2,3,4
-),
-
-position_liquidity_daily AS (
-  SELECT
-    day,
-    pool,
-    position,
-    owner,
-    SUM(COALESCE(liquidity_delta_day, 0)) OVER (
-      PARTITION BY pool, position, owner
-      ORDER BY day
-      ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-    ) AS cumulative_liquidity
-  FROM liquidity_deltas_daily
-),
-
-pool_liquidity_daily AS (
-  SELECT
-    day,
-    pool,
-    SUM(cumulative_liquidity) AS total_pool_liquidity
-  FROM position_liquidity_daily
-  WHERE cumulative_liquidity > 0
-  GROUP BY 1,2
-),
-
-ownership_shares_daily AS (
-  SELECT
-    p.day,
-    p.pool,
-    p.position,
-    p.owner,
-    p.cumulative_liquidity,
-    t.total_pool_liquidity,
-    CAST(p.cumulative_liquidity AS DOUBLE) / NULLIF(CAST(t.total_pool_liquidity AS DOUBLE), 0) AS ownership_share
-  FROM position_liquidity_daily p
-  JOIN pool_liquidity_daily t
-    ON p.day = t.day AND p.pool = t.pool
-  WHERE p.cumulative_liquidity > 0
-),
-
-/* -----------------------------
-   SWAPS (UNCHANGED LOGIC, JUST MULTI-POOL)
-   ----------------------------- */
-swaps_union AS (
-  SELECT
-    DATE_TRUNC('day', evt_block_time) AS day,
-    pool,
-    trade_direction,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(params, '$.SwapParameters.amount_in') AS DOUBLE) END AS usdc_in_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult.output_amount') AS DOUBLE) END AS usdc_out_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(params, '$.SwapParameters.amount_in') AS DOUBLE) END AS token_in_raw,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult.output_amount') AS DOUBLE) END AS token_out_raw,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult.lp_fee') AS DOUBLE) END AS lp_fee_usdc_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult.lp_fee') AS DOUBLE) END AS lp_fee_token_raw
-  FROM meteora_solana.cp_amm_evt_evtswap
-  WHERE evt_block_time >= (SELECT start_ts FROM params)
-    AND evt_block_time < (SELECT end_ts FROM params)
-    AND pool IN (SELECT pool FROM target_pools)
-
-  UNION ALL
-
-  SELECT
-    DATE_TRUNC('day', evt_block_time) AS day,
-    pool,
-    trade_direction,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(params, '$.SwapParameters2.amount_0') AS DOUBLE) END AS usdc_in_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult2.output_amount') AS DOUBLE) END AS usdc_out_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(params, '$.SwapParameters2.amount_0') AS DOUBLE) END AS token_in_raw,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult2.output_amount') AS DOUBLE) END AS token_out_raw,
-    CASE WHEN trade_direction = 0 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult2.trading_fee') AS DOUBLE) END AS lp_fee_usdc_raw,
-    CASE WHEN trade_direction = 1 THEN CAST(JSON_EXTRACT_SCALAR(swap_result, '$.SwapResult2.trading_fee') AS DOUBLE) END AS lp_fee_token_raw
-  FROM meteora_solana.cp_amm_evt_evtswap2
-  WHERE evt_block_time >= (SELECT start_ts FROM params)
-    AND evt_block_time < (SELECT end_ts FROM params)
-    AND pool IN (SELECT pool FROM target_pools)
-),
-
-daily_fees AS (
-  SELECT
-    day,
-    pool,
-    COUNT(*) AS num_swaps,
-    (SUM(COALESCE(usdc_in_raw, 0)) + SUM(COALESCE(usdc_out_raw, 0))) / 1e6 AS volume_usd_approx,
-    SUM(COALESCE(lp_fee_usdc_raw, 0)) / 1e6 AS lp_fee_usdc,
-    SUM(COALESCE(lp_fee_token_raw, 0)) / 1e6 AS lp_fee_token,
-
-    1 / NULLIF(
-      COALESCE(
-        (SUM(COALESCE(token_in_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_out_raw, 0)) / 1e6, 0),
-        (SUM(COALESCE(token_out_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_in_raw, 0)) / 1e6, 0)
-      ),
-      0
-    ) AS token_per_usdc_raw,
-
-    COALESCE(
-      (SUM(COALESCE(token_in_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_out_raw, 0)) / 1e6, 0),
-      (SUM(COALESCE(token_out_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_in_raw, 0)) / 1e6, 0)
-    ) AS token_price_usdc,
-
-    (SUM(COALESCE(lp_fee_token_raw, 0)) / 1e6) *
-    COALESCE(
-      (SUM(COALESCE(token_in_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_out_raw, 0)) / 1e6, 0),
-      (SUM(COALESCE(token_out_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_in_raw, 0)) / 1e6, 0)
-    ) AS lp_fee_token_usdc,
-
-    (SUM(COALESCE(lp_fee_usdc_raw, 0)) / 1e6)
-    +
-    (
-      (SUM(COALESCE(lp_fee_token_raw, 0)) / 1e6) *
-      COALESCE(
-        (SUM(COALESCE(token_in_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_out_raw, 0)) / 1e6, 0),
-        (SUM(COALESCE(token_out_raw, 0)) / 1e6) / NULLIF(SUM(COALESCE(usdc_in_raw, 0)) / 1e6, 0)
-      )
-    ) AS lp_fee_total_usdc,
-
-    -- Buy volume: sum of USDC in for trade_direction=0 (buy)
-    SUM(CASE WHEN trade_direction = 0 THEN COALESCE(usdc_in_raw, 0) ELSE 0 END) / 1e6 AS buy_volume,
-    -- Sell volume: sum of USDC out for trade_direction=1 (sell) - USDC received when selling tokens
-    SUM(CASE WHEN trade_direction = 1 THEN COALESCE(usdc_out_raw, 0) ELSE 0 END) / 1e6 AS sell_volume
-  FROM swaps_union
-  GROUP BY 1,2
-),
-
-/* -----------------------------
-   AS-OF OWNERSHIP: last known share <= fee day
-   This fixes "no results" when swaps happen on days without LP events.
-   Gets the most recent ownership share for each owner/position on or before each fee day.
-   Ensures all pools from pool_map are included with their owners.
-   ----------------------------- */
-ownership_shares_asof AS (
-  SELECT day, pool, owner, position, ownership_share
-  FROM (
-    SELECT
-      f.day,
-      f.pool,
-      m.owner,
-      m.position,
-      COALESCE(o.ownership_share, 0) AS ownership_share,
-      ROW_NUMBER() OVER (
-        PARTITION BY f.day, f.pool, m.owner
-        ORDER BY o.day DESC NULLS LAST
-      ) AS rn
-    FROM daily_fees f
-    CROSS JOIN pool_map m
-    LEFT JOIN ownership_shares_daily o
-      ON o.pool = f.pool
-     AND o.owner = m.owner
-     AND o.day <= f.day
-     AND o.ownership_share > 0
-    WHERE f.pool = m.pool
-  ) x
-  WHERE rn = 1
-),
-
-fees_earned AS (
-  SELECT
-    f.day,
-    f.pool,
-    o.owner,
-    o.position,
-    o.ownership_share,
-    f.num_swaps,
-    f.volume_usd_approx,
-    f.lp_fee_usdc,
-    f.lp_fee_token,
-    f.token_per_usdc_raw,
-    f.token_price_usdc AS avg_price_usdc,
-    f.lp_fee_token_usdc,
-    f.lp_fee_total_usdc,
-    f.buy_volume,
-    f.sell_volume,
-    f.lp_fee_total_usdc * COALESCE(o.ownership_share, 0) AS earned_fee_usdc
-  FROM daily_fees f
-  JOIN ownership_shares_asof o
-    ON f.day = o.day AND f.pool = o.pool
-)
-
-SELECT
-  CAST(day AS DATE) AS day,
-  owner,
-  pool,
-  num_swaps,
-  buy_volume,
-  sell_volume,
-  volume_usd_approx,
-  lp_fee_usdc,
-  lp_fee_token,
-  lp_fee_token_usdc,
-  token_per_usdc_raw,
-  avg_price_usdc AS token_price_usdc,
-  earned_fee_usdc
-FROM fees_earned
-ORDER BY day, pool, owner;
diff --git a/src/schema/dune-ten-minute-volume.sql b/src/schema/dune-ten-minute-volume.sql
deleted file mode 100644
index d0661ec..0000000
--- a/src/schema/dune-ten-minute-volume.sql
+++ /dev/null
@@ -1,119 +0,0 @@
--- Extended 10-Minute Volume Query with start_time and end_time Parameters
--- Returns 10-minute bucket volume data for each token with buy/sell volumes and fees
--- Used for accurate rolling 24h calculations on /api/tickers
--- This is the SINGLE SOURCE OF TRUTH - all other aggregations (hourly, daily) are derived from this data
--- 
--- Parameters:
---   {{start_time}}: Start timestamp for data fetch (format: YYYY-MM-DD HH:MM:SS)
---   {{end_time}}: End timestamp for data fetch (format: YYYY-MM-DD HH:MM:SS) - optional, if not provided fetches until now
---   {{token_list}}: comma-separated token addresses in format 'token1', 'token2'
---                   Use '__ALL__' to fetch all tokens
---
--- Usage:
---   - For backfill: start_time = day start, end_time = day end (to limit data)
---   - For refresh: start_time = current 10-minute bucket start, end_time = current time
---
--- Schedule: Every 10 minutes at :00, :10, :20, :30, :40, :50 (144 queries/day)
---
--- Returns: token, bucket, base_volume, target_volume, buy_volume, sell_volume, high, low, 
---          average_price, trade_count, usdc_fees, token_fees, token_fees_usdc, sell_volume_usdc
-
-WITH filtered_and_extracted AS (
-    SELECT
-        block_time,
-        -- Truncate to 10-minute bucket: floor(minute/10)*10
-        date_trunc('hour', block_time) + 
-          (floor(extract(minute from block_time) / 10) * interval '10' minute) AS bucket_time,
-        tx_id,
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 279, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 543, 32))
-        END AS token,
-        CASE
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '00' THEN 'buy'
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '01' THEN 'sell'
-        END AS swap_type,
-        from_big_endian_64(reverse(SUBSTR(data, 106, 8))) / 1e6 AS input_amount,
-        from_big_endian_64(reverse(SUBSTR(data, 114, 8))) / 1e6 AS output_amount,
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 311, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 575, 32))
-        END AS quote_mint
-    FROM solana.instruction_calls
-    WHERE 
-        block_time >= TIMESTAMP '{{start_time}}'
-        AND block_time < TIMESTAMP '{{end_time}}'
-        AND tx_success = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND is_inner = true
-        AND cardinality(account_arguments) = 1
-        AND CAST(data AS VARCHAR) LIKE '0xe445a52e51cb9a1d%'
-        AND LENGTH(data) >= 300
-        AND array_join(log_messages, ' ') LIKE '%SpotSwap%'
-),
-token_filtered AS (
-    SELECT
-        block_time,
-        bucket_time,
-        tx_id,
-        token,
-        quote_mint,
-        swap_type,
-        input_amount,
-        output_amount,
-        CASE
-            WHEN swap_type = 'buy' THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered_and_extracted
-    WHERE 
-        ('__ALL__' IN ({{token_list}}) OR token IN ({{token_list}}))
-        AND swap_type IN ('buy', 'sell')
-        AND input_amount > 0
-        AND output_amount > 0
-        AND token IS NOT NULL
-),
-aggregated AS (
-    -- First aggregate to get base metrics and average_price
-    SELECT
-        token,
-        bucket_time,
-        SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS base_volume,
-        SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS target_volume,
-        SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE 0 END) AS buy_volume,
-        SUM(CASE WHEN swap_type = 'sell' THEN input_amount ELSE 0 END) AS sell_volume,
-        MAX(price) AS high,
-        MIN(price) AS low,
-        AVG(price) AS average_price,
-        COUNT(*) AS trade_count
-    FROM token_filtered
-    WHERE price IS NOT NULL AND price > 0
-    GROUP BY token, bucket_time
-)
--- Final SELECT with fee calculations using pre-calculated average_price
-SELECT
-    token,
-    CAST(bucket_time AS VARCHAR) AS bucket,
-    -- Core volume metrics
-    CAST(base_volume AS VARCHAR) AS base_volume,
-    CAST(target_volume AS VARCHAR) AS target_volume,
-    -- Buy/sell volume breakdown
-    CAST(buy_volume AS VARCHAR) AS buy_volume,
-    CAST(sell_volume AS VARCHAR) AS sell_volume,
-    -- Price metrics
-    CAST(high AS VARCHAR) AS high,
-    CAST(low AS VARCHAR) AS low,
-    CAST(average_price AS VARCHAR) AS average_price,
-    -- Trade count
-    CAST(trade_count AS VARCHAR) AS trade_count,
-    -- Fees (0.5% = 0.005)
-    CAST(buy_volume * 0.005 AS VARCHAR) AS usdc_fees,
-    CAST(sell_volume * 0.005 AS VARCHAR) AS token_fees,
-    CAST(sell_volume * average_price * 0.005 AS VARCHAR) AS token_fees_usdc,
-    -- Sell volume in USDC terms
-    CAST(sell_volume * average_price AS VARCHAR) AS sell_volume_usdc
-FROM aggregated
-ORDER BY token ASC, bucket_time ASC;
-
diff --git a/src/schema/dune.sql b/src/schema/dune.sql
deleted file mode 100644
index 8fc7227..0000000
--- a/src/schema/dune.sql
+++ /dev/null
@@ -1,75 +0,0 @@
-WITH filtered_and_extracted AS (
-    -- Combine filtering and extraction in one pass to reduce I/O
-    -- Extract only what we need, when we need it
-    SELECT
-        block_time,
-        tx_id,
-        -- Extract token immediately during scan
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 279, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 543, 32))
-        END AS token,
-        -- Extract swap_type once
-        CASE
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '00' THEN 'buy'
-            WHEN to_hex(SUBSTR(data, 105, 1)) = '01' THEN 'sell'
-        END AS swap_type,
-        -- Pre-calculate amounts (divide by 1e6 once)
-        from_big_endian_64(reverse(SUBSTR(data, 106, 8))) / 1e6 AS input_amount,
-        from_big_endian_64(reverse(SUBSTR(data, 114, 8))) / 1e6 AS output_amount,
-        -- Extract quote_mint if needed for debugging
-        CASE
-            WHEN LENGTH(data) = 406 THEN to_base58(SUBSTR(data, 311, 32))
-            WHEN LENGTH(data) = 670 THEN to_base58(SUBSTR(data, 575, 32))
-        END AS quote_mint
-    FROM solana.instruction_calls
-    WHERE 
-        -- Most selective filters first (reduce cardinality early)
-        block_time >= current_timestamp - interval '24' hour
-        AND tx_success = true
-        AND executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND inner_executing_account = 'FUTARELBfJfQ8RDGhg1wdhddq1odMAJUePHFuBYfUxKq'
-        AND account_arguments[1] = 'DGEympSS4qLvdr9r3uGHTfACdN8snShk4iGdJtZPxuBC'
-        AND is_inner = true
-        -- More expensive filters last
-        AND cardinality(account_arguments) = 1
-        AND CAST(data AS VARCHAR) LIKE '0xe445a52e51cb9a1d%'
-        AND LENGTH(data) >= 300
-        AND array_join(log_messages, ' ') LIKE '%SpotSwap%'
-),
-token_filtered AS (
-    -- Apply token filter and quality checks
-    SELECT
-        block_time,
-        tx_id,
-        token,
-        quote_mint,
-        swap_type,
-        input_amount,
-        output_amount,
-        -- Calculate price once per row
-        CASE
-            WHEN swap_type = 'buy' THEN input_amount / NULLIF(output_amount, 0)
-            WHEN swap_type = 'sell' THEN output_amount / NULLIF(input_amount, 0)
-        END AS price
-    FROM filtered_and_extracted
-    WHERE 
-        -- Apply token filter early
-        (COALESCE({{token_list}}, '') = '' OR token IN ({{token_list}}))
-        -- Data quality filters
-        AND swap_type IN ('buy', 'sell')
-        AND input_amount > 0
-        AND output_amount > 0
-        AND token IS NOT NULL
-)
--- Final aggregation with pre-calculated values
-SELECT
-    token,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN output_amount ELSE input_amount END) AS VARCHAR) AS base_volume_24h,
-    CAST(SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS VARCHAR) AS target_volume_24h,
-    CAST(MAX(price) AS VARCHAR) AS high_24h,
-    CAST(MIN(price) AS VARCHAR) AS low_24h
-FROM token_filtered
-WHERE price IS NOT NULL AND price > 0
-GROUP BY token
-ORDER BY CAST(SUM(CASE WHEN swap_type = 'buy' THEN input_amount ELSE output_amount END) AS DOUBLE) DESC;
\ No newline at end of file
diff --git a/src/schema/v06-ohlcv-tables.sql b/src/schema/v06-ohlcv-tables.sql
deleted file mode 100644
index 8bd9298..0000000
--- a/src/schema/v06-ohlcv-tables.sql
+++ /dev/null
@@ -1,157 +0,0 @@
--- v0.6 OHLCV + Fee Volume Tables
--- Source: external indexer DB (v0_6_spot_swaps, v0_6_conditional_swaps, v0_6_daos, v0_6_proposals)
--- Written to: app DB via hourly reconciliation upserts
---
--- Token key = base_mint_acct from v0_6_daos (same concept as existing daily_volumes.token)
--- All timestamps are TIMESTAMPTZ in UTC
--- All amounts are raw integer units; 6 decimals for human-scale
--- Fee rate: 0.5% (0.005)
-
--- ============================================
--- 1) Spot OHLCV — 1-minute granularity
--- ============================================
-CREATE TABLE IF NOT EXISTS v06_spot_ohlcv_1m (
-  id SERIAL PRIMARY KEY,
-  token VARCHAR(64) NOT NULL,
-  bucket TIMESTAMPTZ NOT NULL,
-  open NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  close NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  trade_count INT NOT NULL DEFAULT 0,
-  is_complete BOOLEAN NOT NULL DEFAULT false,
-  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(token, bucket)
-);
-
-CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1m_token_bucket ON v06_spot_ohlcv_1m(token, bucket DESC);
-CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1m_bucket ON v06_spot_ohlcv_1m(bucket DESC);
-
--- ============================================
--- 2) Spot OHLCV — daily granularity
--- ============================================
-CREATE TABLE IF NOT EXISTS v06_spot_ohlcv_1d (
-  id SERIAL PRIMARY KEY,
-  token VARCHAR(64) NOT NULL,
-  bucket TIMESTAMPTZ NOT NULL,
-  open NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  close NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  trade_count INT NOT NULL DEFAULT 0,
-  is_complete BOOLEAN NOT NULL DEFAULT false,
-  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(token, bucket)
-);
-
-CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1d_token_bucket ON v06_spot_ohlcv_1d(token, bucket DESC);
-CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1d_bucket ON v06_spot_ohlcv_1d(bucket DESC);
-
--- ============================================
--- 3) Fee breakdown: spot — daily by (token, date)
--- ============================================
-CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_spot (
-  id SERIAL PRIMARY KEY,
-  token VARCHAR(64) NOT NULL,
-  date DATE NOT NULL,
-  buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  trade_count INT NOT NULL DEFAULT 0,
-  usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(token, date)
-);
-
-CREATE INDEX IF NOT EXISTS idx_v06_fee_spot_token_date ON v06_fee_volume_daily_spot(token, date DESC);
-CREATE INDEX IF NOT EXISTS idx_v06_fee_spot_date ON v06_fee_volume_daily_spot(date DESC);
-
--- ============================================
--- 4) Fee breakdown: conditional — daily by (token, date)
---    Fee columns are NULL until the proposal resolves
--- ============================================
-CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_conditional (
-  id SERIAL PRIMARY KEY,
-  token VARCHAR(64) NOT NULL,
-  date DATE NOT NULL,
-  buy_volume NUMERIC(40, 12),
-  sell_volume NUMERIC(40, 12),
-  base_volume NUMERIC(40, 12),
-  target_volume NUMERIC(40, 12),
-  trade_count INT,
-  usdc_fees NUMERIC(40, 12),
-  token_fees NUMERIC(40, 12),
-  token_fees_usdc NUMERIC(40, 12),
-  sell_volume_usdc NUMERIC(40, 12),
-  conditional_reconciled BOOLEAN NOT NULL DEFAULT false,
-  pending_open_proposals INT NOT NULL DEFAULT 0,
-  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(token, date)
-);
-
-CREATE INDEX IF NOT EXISTS idx_v06_fee_cond_token_date ON v06_fee_volume_daily_conditional(token, date DESC);
-CREATE INDEX IF NOT EXISTS idx_v06_fee_cond_date ON v06_fee_volume_daily_conditional(date DESC);
-
--- ============================================
--- 5) Fee aggregate — primary for accountant
---    Totals = spot + COALESCE(conditional, 0)
--- ============================================
-CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_aggregate (
-  id SERIAL PRIMARY KEY,
-  token VARCHAR(64) NOT NULL,
-  date DATE NOT NULL,
-  -- Spot breakdown
-  spot_buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_trade_count INT NOT NULL DEFAULT 0,
-  spot_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  spot_token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  -- Conditional breakdown (nullable until reconciled)
-  conditional_buy_volume NUMERIC(40, 12),
-  conditional_sell_volume NUMERIC(40, 12),
-  conditional_base_volume NUMERIC(40, 12),
-  conditional_target_volume NUMERIC(40, 12),
-  conditional_trade_count INT,
-  conditional_usdc_fees NUMERIC(40, 12),
-  conditional_token_fees NUMERIC(40, 12),
-  conditional_token_fees_usdc NUMERIC(40, 12),
-  -- Totals: spot + COALESCE(conditional, 0)
-  total_buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_trade_count INT NOT NULL DEFAULT 0,
-  total_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  total_token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-  -- Reconciliation status
-  conditional_reconciled BOOLEAN NOT NULL DEFAULT false,
-  pending_open_proposals INT NOT NULL DEFAULT 0,
-  created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(token, date)
-);
-
-CREATE INDEX IF NOT EXISTS idx_v06_fee_agg_token_date ON v06_fee_volume_daily_aggregate(token, date DESC);
-CREATE INDEX IF NOT EXISTS idx_v06_fee_agg_date ON v06_fee_volume_daily_aggregate(date DESC);
diff --git a/src/services/dailyAggregationService.ts b/src/services/dailyAggregationService.ts
deleted file mode 100644
index e39bcca..0000000
--- a/src/services/dailyAggregationService.ts
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Daily Aggregation Service
- * 
- * Extracts/rolls up daily metrics from daily_volumes table (which is populated by aggregate_hourly_to_daily DB function).
- * Provides comprehensive daily metrics: volume, price, fees, trade count, cumulative values.
- * Part of the aggregation pipeline: 10-min → hourly → daily
- * 
- * Schedule: Daily at 00:05 UTC (after day boundary)
- */
-
-import { config } from '../config.js';
-import { DuneService } from './duneService.js';
-import { DatabaseService, DailyFeesVolumeRecord } from './databaseService.js';
-import { FutarchyService } from './futarchyService.js';
-import { logger } from '../utils/logger.js';
-
-export class DailyAggregationService {
-  private duneService: DuneService;
-  private databaseService: DatabaseService;
-  private futarchyService: FutarchyService;
-  private initialized: boolean = false;
-  private refreshTimer: NodeJS.Timeout | null = null;
-  private isRefreshing: boolean = false;
-
-  constructor(
-    duneService: DuneService,
-    databaseService: DatabaseService,
-    futarchyService: FutarchyService
-  ) {
-    this.duneService = duneService;
-    this.databaseService = databaseService;
-    this.futarchyService = futarchyService;
-  }
-
-  /**
-   * Initialize the service - check database for existing data
-   */
-  async initialize(): Promise<void> {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[DailyAggregation] Database not connected - service disabled');
-      return;
-    }
-
-    logger.info('[DailyAggregation] Initializing daily aggregation service...');
-
-    try {
-      const recordCount = await this.databaseService.getFeesRecordCount();
-      logger.info(`[DailyAggregation] Current record count in database: ${recordCount}`);
-
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[DailyAggregation] Service initialized with existing database records.');
-      } else {
-        logger.info('[DailyAggregation] No existing data - performing initial backfill...');
-        await this.backfillFromStart();
-        this.initialized = true;
-        logger.info('[DailyAggregation] Initialization complete with backfill.');
-      }
-    } catch (error: any) {
-      logger.error('[DailyAggregation] Error during initialization:', error);
-      const recordCount = await this.databaseService.getFeesRecordCount();
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[DailyAggregation] Serving existing data despite initialization error.');
-      }
-    }
-  }
-
-  /**
-   * Start the scheduled refresh process
-   */
-  start(): void {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[DailyAggregation] Service not starting - database not available');
-      return;
-    }
-
-    logger.info('[DailyAggregation] Starting daily aggregation service...');
-    this.refresh().catch(err => {
-      logger.error('[DailyAggregation] Background refresh error', err);
-    });
-
-    this.scheduleDailyRefresh();
-    logger.info('[DailyAggregation] Service started - will refresh daily at 00:05 UTC');
-  }
-
-  /**
-   * Stop the service
-   */
-  stop(): void {
-    if (this.refreshTimer) {
-      clearTimeout(this.refreshTimer);
-      this.refreshTimer = null;
-    }
-    logger.info('[DailyAggregation] Service stopped');
-  }
-
-  /**
-   * Schedule the next refresh at 00:05 UTC
-   */
-  private scheduleDailyRefresh(): void {
-    const now = new Date();
-    const nextRefresh = new Date(now);
-    
-    // Set to 00:05 UTC
-    nextRefresh.setUTCHours(0, 5, 0, 0);
-    
-    // If we're past 00:05 today, schedule for tomorrow
-    if (now >= nextRefresh) {
-      nextRefresh.setUTCDate(nextRefresh.getUTCDate() + 1);
-    }
-
-    const msUntilRefresh = nextRefresh.getTime() - now.getTime();
-    logger.info(`[DailyAggregation] Next refresh scheduled for ${nextRefresh.toISOString()} (in ${Math.round(msUntilRefresh / 60000)} minutes)`);
-
-    this.refreshTimer = setTimeout(async () => {
-      await this.refresh();
-      // Re-schedule for the next day
-      this.scheduleDailyRefresh();
-    }, msUntilRefresh);
-  }
-
-  /**
-   * Perform incremental refresh - extract data from daily_volumes table
-   */
-  async refresh(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[DailyAggregation] Refresh already in progress, skipping...');
-      return;
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[DailyAggregation] Database not available, skipping refresh');
-        return;
-      }
-
-      const lastCompleteDate = await this.databaseService.getLatestFeesDate();
-      
-      const recordsUpserted = await this.extractFromDailyVolumes(lastCompleteDate || undefined);
-      
-      const today = new Date().toISOString().split('T')[0]!;
-      await this.databaseService.markFeesDaysComplete(today);
-
-      logger.info(`[DailyAggregation] Refresh completed successfully - ${recordsUpserted} records`);
-    } catch (error: any) {
-      logger.error('[DailyAggregation] Refresh error', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Force a full refresh (useful for manual triggering)
-   */
-  async forceRefresh(): Promise<{ success: boolean; message: string; recordsUpserted?: number }> {
-    if (this.isRefreshing) {
-      return { success: false, message: 'Refresh already in progress' };
-    }
-
-    // Service now uses daily_volumes table instead of Dune
-
-    this.isRefreshing = true;
-
-    try {
-      const lastCompleteDate = await this.databaseService.getLatestFeesDate();
-      
-      const recordsUpserted = await this.extractFromDailyVolumes(lastCompleteDate || undefined);
-      
-      const today = new Date().toISOString().split('T')[0]!;
-      await this.databaseService.markFeesDaysComplete(today);
-
-      this.initialized = true;
-      return { 
-        success: true, 
-        message: `Refresh completed, extracted from daily_volumes starting from ${lastCompleteDate || 'beginning'}`,
-        recordsUpserted 
-      };
-    } catch (error: any) {
-      return { success: false, message: error.message };
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Backfill from the very beginning (2025-10-09)
-   * Now extracts from daily_volumes instead of Dune
-   */
-  private async backfillFromStart(): Promise<void> {
-    logger.info('[DailyAggregation] Starting full backfill from daily_volumes...');
-    try {
-      const recordsUpserted = await this.extractFromDailyVolumes('2025-10-09');
-      logger.info(`[DailyAggregation] Backfill complete, upserted ${recordsUpserted} records`);
-      
-      const today = new Date().toISOString().split('T')[0]!;
-      await this.databaseService.markFeesDaysComplete(today);
-    } catch (error: any) {
-      logger.error('[DailyAggregation] Backfill failed', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Extract fees data from daily_volumes table and store in daily_fees_volumes
-   */
-  private async extractFromDailyVolumes(startDate?: string): Promise<number> {
-    if (!this.databaseService.isAvailable() || !this.databaseService.pool) {
-      return 0;
-    }
-
-    try {
-      // Query daily_volumes for records with fees and cumulative values
-      let query = `
-        SELECT 
-          token,
-          date,
-          base_volume,
-          target_volume,
-          buy_volume,
-          sell_volume,
-          usdc_fees,
-          token_fees,
-          token_fees_usdc,
-          sell_volume_usdc,
-          cumulative_usdc_fees,
-          cumulative_token_in_usdc_fees,
-          cumulative_target_volume,
-          cumulative_token_volume,
-          high,
-          average_price,
-          low
-        FROM daily_volumes
-        WHERE usdc_fees IS NOT NULL
-      `;
-      
-      const params: any[] = [];
-      if (startDate) {
-        query += ` AND date >= $1`;
-        params.push(startDate);
-      }
-
-      query += ` ORDER BY token, date`;
-
-      const result = await this.databaseService.pool.query(query, params);
-
-      if (result.rows.length === 0) {
-        logger.info('[DailyAggregation] No daily_volumes data available to extract');
-        return 0;
-      }
-
-      // Transform to DailyFeesVolumeRecord format
-      const records: DailyFeesVolumeRecord[] = result.rows.map((row: any) => ({
-        token: row.token,
-        trading_date: row.date,
-        base_volume: String(row.base_volume || 0),
-        target_volume: String(row.target_volume || 0),
-        usdc_fees: String(row.usdc_fees || 0),
-        token_fees_usdc: String(row.token_fees_usdc || 0),
-        token_fees: String(row.token_fees || 0),
-        buy_volume: String(row.buy_volume || 0),
-        sell_volume: String(row.sell_volume || 0),
-        sell_volume_usdc: String(row.sell_volume_usdc || 0),
-        cumulative_usdc_fees: String(row.cumulative_usdc_fees || 0),
-        cumulative_token_in_usdc_fees: String(row.cumulative_token_in_usdc_fees || 0),
-        cumulative_target_volume: String(row.cumulative_target_volume || 0),
-        cumulative_token_volume: String(row.cumulative_token_volume || 0),
-        high: String(row.high || 0),
-        average_price: String(row.average_price || 0),
-        low: String(row.low || 0),
-      }));
-
-      const upserted = await this.databaseService.upsertDailyFeesVolumes(records, false);
-      logger.info(`[DailyAggregation] Extracted and upserted ${upserted} records from daily_volumes`);
-      
-      return upserted;
-    } catch (error: any) {
-      logger.error('[DailyAggregation] Error extracting from daily_volumes', error);
-      return 0;
-    }
-  }
-
-
-  /**
-   * Get daily fees volumes with optional filtering
-   */
-  async getDailyFeesVolumes(options?: {
-    token?: string;
-    startDate?: string;
-    endDate?: string;
-  }): Promise<DailyFeesVolumeRecord[]> {
-    return this.databaseService.getDailyFeesVolumes(options);
-  }
-
-  /**
-   * Check if service is ready
-   */
-  isReady(): boolean {
-    return this.initialized && this.databaseService.isAvailable();
-  }
-
-  /**
-   * Get service status
-   */
-  getStatus(): {
-    initialized: boolean;
-    databaseConnected: boolean;
-    queryIdConfigured: boolean;
-    isRefreshing: boolean;
-  } {
-    return {
-      initialized: this.initialized,
-      databaseConnected: this.databaseService.isAvailable(),
-      queryIdConfigured: false, // Deprecated - now uses DB aggregation from daily_volumes
-      isRefreshing: this.isRefreshing,
-    };
-  }
-}
diff --git a/src/services/dailyMeteoraVolumeService.ts b/src/services/dailyMeteoraVolumeService.ts
deleted file mode 100644
index 90b94fd..0000000
--- a/src/services/dailyMeteoraVolumeService.ts
+++ /dev/null
@@ -1,415 +0,0 @@
-/**
- * MeteoraVolumeFetcherService
- * 
- * Fetches daily Meteora pool fees and volumes from Dune API per owner (mapped to token).
- * Stores data in PostgreSQL.
- * Cumulative values are calculated in the database, not from Dune.
- * 
- * Schedule: Daily at 00:00 UTC (midnight)
- */
-
-import { config } from '../config.js';
-import { DuneService } from './duneService.js';
-import { DatabaseService, DailyMeteoraVolumeRecord } from './databaseService.js';
-import { getTokenForOwner } from './meteoraService.js';
-import { logger } from '../utils/logger.js';
-
-export class MeteoraVolumeFetcherService {
-  private duneService: DuneService;
-  private databaseService: DatabaseService;
-  private initialized: boolean = false;
-  private refreshTimer: NodeJS.Timeout | null = null;
-  private isRefreshing: boolean = false;
-
-  constructor(
-    duneService: DuneService,
-    databaseService: DatabaseService
-  ) {
-    this.duneService = duneService;
-    this.databaseService = databaseService;
-  }
-
-  /**
-   * Initialize the service - check database for existing data
-   */
-  async initialize(): Promise<void> {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[MeteoraVolume] Database not connected - service disabled');
-      return;
-    }
-
-    logger.info('[MeteoraVolume] Initializing daily Meteora volume service...');
-
-    try {
-      const recordCount = await this.databaseService.getMeteoraRecordCount();
-      logger.info(`[MeteoraVolume] Current record count in database: ${recordCount}`);
-
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Service initialized with existing database records.');
-      } else {
-        logger.info('[MeteoraVolume] No existing data - performing initial backfill...');
-        await this.backfillFromStart();
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Initialization complete with backfill.');
-      }
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Error during initialization:', error);
-      // Still mark as initialized if we have existing data
-      const recordCount = await this.databaseService.getMeteoraRecordCount();
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Serving existing data despite initialization error.');
-      }
-    }
-  }
-
-  /**
-   * Start the scheduled refresh process
-   */
-  start(): void {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[MeteoraVolume] Service not starting - database not available');
-      return;
-    }
-
-    logger.info('[MeteoraVolume] Starting daily Meteora volume service...');
-    this.refresh().catch(err => {
-      logger.error('[MeteoraVolume] Background refresh error', err);
-    });
-
-    this.scheduleDailyRefresh();
-    logger.info('[MeteoraVolume] Service started - will refresh daily at 00:00 UTC');
-  }
-
-  /**
-   * Stop the service
-   */
-  stop(): void {
-    if (this.refreshTimer) {
-      clearTimeout(this.refreshTimer);
-      this.refreshTimer = null;
-    }
-    logger.info('[MeteoraVolume] Service stopped');
-  }
-
-  /**
-   * Schedule the next refresh at 00:00 UTC (midnight)
-   */
-  private scheduleDailyRefresh(): void {
-    const now = new Date();
-    const nextRefresh = new Date(now);
-    
-    // Set to 00:00 UTC (midnight)
-    nextRefresh.setUTCHours(0, 0, 0, 0);
-    
-    // If we're past midnight today, schedule for tomorrow
-    if (now >= nextRefresh) {
-      nextRefresh.setUTCDate(nextRefresh.getUTCDate() + 1);
-    }
-
-    const msUntilRefresh = nextRefresh.getTime() - now.getTime();
-    logger.info(`[MeteoraVolume] Next refresh scheduled for ${nextRefresh.toISOString()} (in ${Math.round(msUntilRefresh / 60000)} minutes)`);
-
-    this.refreshTimer = setTimeout(async () => {
-      await this.refresh();
-      // Re-schedule for the next day
-      this.scheduleDailyRefresh();
-    }, msUntilRefresh);
-  }
-
-  /**
-   * Perform incremental refresh - fetch data from Dune
-   */
-  async refresh(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[MeteoraVolume] Refresh already in progress, skipping...');
-      return;
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[MeteoraVolume] Database not available, skipping refresh');
-        return;
-      }
-
-      const lastCompleteDate = await this.databaseService.getLatestMeteoraDate();
-      
-      const startDate = lastCompleteDate 
-        ? this.addDays(lastCompleteDate, 1)
-        : '2025-10-09';
-      
-      // Constrain to today for daily fetches
-      const today = new Date().toISOString().split('T')[0]!;
-      const recordsUpserted = await this.fetchAndStore(startDate, today);
-      
-      await this.databaseService.markMeteoraDaysComplete(today);
-
-      logger.info(`[MeteoraVolume] Refresh completed successfully - ${recordsUpserted} records`);
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Refresh error', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Force a full refresh (useful for manual triggering)
-   */
-  async forceRefresh(): Promise<{ success: boolean; message: string; recordsUpserted?: number }> {
-    if (this.isRefreshing) {
-      return { success: false, message: 'Refresh already in progress' };
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      const lastCompleteDate = await this.databaseService.getLatestMeteoraDate();
-      const startDate = lastCompleteDate 
-        ? this.addDays(lastCompleteDate, 1)
-        : '2025-10-09';
-      
-      // Constrain to today for force refresh
-      const today = new Date().toISOString().split('T')[0]!;
-      const recordsUpserted = await this.fetchAndStore(startDate, today);
-      
-      await this.databaseService.markMeteoraDaysComplete(today);
-
-      this.initialized = true;
-      return { 
-        success: true, 
-        message: `Refresh completed, fetched from ${startDate}`,
-        recordsUpserted 
-      };
-    } catch (error: any) {
-      return { success: false, message: error.message };
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Backfill from the very beginning (2025-10-09)
-   */
-  private async backfillFromStart(): Promise<void> {
-    logger.info('[MeteoraVolume] Starting full backfill from Dune...');
-    try {
-      // For full backfill, don't constrain end date - fetch all available data
-      const recordsUpserted = await this.fetchAndStore('2025-10-09');
-      logger.info(`[MeteoraVolume] Backfill complete, upserted ${recordsUpserted} records`);
-      
-      const today = new Date().toISOString().split('T')[0]!;
-      await this.databaseService.markMeteoraDaysComplete(today);
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Backfill failed', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Public method to fetch data for a specific date range (for chunked backfills)
-   */
-  async fetchDateRange(startDate: string, endDate: string): Promise<number> {
-    return this.fetchAndStore(startDate, endDate);
-  }
-
-  /**
-   * Fetch data from Dune and store in database
-   */
-  private async fetchAndStore(startDate: string, endDate?: string): Promise<number> {
-    if (!config.dune.meteoraVolumeQueryId) {
-      throw new Error('No DUNE_METEORA_VOLUME_QUERY_ID configured');
-    }
-
-    const params: Record<string, any> = {
-      start_date: startDate,
-    };
-    
-    // Only include end_date if it's explicitly provided and not empty
-    if (endDate && endDate.trim() !== '') {
-      params.end_date = endDate;
-    }
-
-    logger.info(`[MeteoraVolume] Fetching from Dune query ${config.dune.meteoraVolumeQueryId}`);
-    logger.info(`[MeteoraVolume] Parameters: start_date=${startDate}, end_date=${endDate || '(unconstrained)'}`);
-
-    let result;
-    try {
-      result = await (this.duneService as any).executeQueryManually(
-        config.dune.meteoraVolumeQueryId,
-        params
-      );
-    } catch (duneError: any) {
-      logger.error('[MeteoraVolume] Dune query execution failed', duneError);
-      throw duneError;
-    }
-
-    if (!result) {
-      logger.info('[MeteoraVolume] Dune returned null result');
-      return 0;
-    }
-
-    if (!result.rows) {
-      logger.info('[MeteoraVolume] Dune result has no rows property:', { preview: JSON.stringify(result).slice(0, 500) });
-      return 0;
-    }
-
-    if (result.rows.length === 0) {
-      logger.info('[MeteoraVolume] No data returned from Dune (empty rows array)');
-      return 0;
-    }
-
-    logger.info(`[MeteoraVolume] Received ${result.rows.length} rows from Dune`);
-    
-    try {
-      if (result.rows.length > 0 && result.rows[0]) {
-        const sampleRow = result.rows[0] as unknown as Record<string, unknown>;
-        logger.debug('[MeteoraVolume] Sample row fields:', { fields: Object.keys(sampleRow) });
-        logger.debug('[MeteoraVolume] Sample row:', { row: JSON.stringify(sampleRow) });
-      }
-    } catch (logError: any) {
-      logger.error('[MeteoraVolume] Error logging sample row', logError);
-    }
-
-    logger.info('[MeteoraVolume] Transforming rows to database records...');
-    let records: DailyMeteoraVolumeRecord[];
-    try {
-      records = result.rows.map((row: any) => {
-        let rawDate = row.day || row.date || '';
-        let dateStr = '';
-        
-        if (rawDate instanceof Date) {
-          dateStr = rawDate.toISOString().substring(0, 10);
-        } else if (typeof rawDate === 'string') {
-          dateStr = rawDate.substring(0, 10);
-        }
-        
-        const owner = row.owner || '';
-        const token = getTokenForOwner(owner);
-        
-        if (!token) {
-          logger.warn(`[MeteoraVolume] No token mapping found for owner: ${owner}`);
-        }
-        
-        // Convert scientific notation for all numeric fields
-        const convertValue = (value: unknown): string => {
-          if (value === null || value === undefined || value === '' || value === 0 || value === '0') {
-            return '0';
-          }
-          if (typeof value === 'number') {
-            if (isNaN(value) || !isFinite(value)) {
-              return '0';
-            }
-            return value.toFixed(20).replace(/\.?0+$/, '');
-          }
-          if (typeof value === 'string') {
-            if (value.includes('E') || value.includes('e')) {
-              try {
-                const num = parseFloat(value);
-                if (isNaN(num)) {
-                  return '0';
-                }
-                return num.toFixed(20).replace(/\.?0+$/, '');
-              } catch {
-                return value;
-              }
-            }
-            return value;
-          }
-          return String(value);
-        };
-        
-        // Calculate target_volume from buy_volume + sell_volume if not provided
-        const buyVolume = parseFloat(convertValue(row.buy_volume || 0)) || 0;
-        const sellVolume = parseFloat(convertValue(row.sell_volume || 0)) || 0;
-        const targetVolume = buyVolume + sellVolume;
-        
-        return {
-          token: token || owner, // Use owner as fallback if mapping not found
-          date: dateStr,
-          base_volume: convertValue(row.volume_usd_approx || 0),
-          target_volume: String(targetVolume),
-          trade_count: parseInt(String(row.num_swaps || 0)) || 0,
-          buy_volume: convertValue(row.buy_volume || 0),
-          sell_volume: convertValue(row.sell_volume || 0),
-          usdc_fees: convertValue(row.lp_fee_usdc || 0),
-          token_fees: convertValue(row.lp_fee_token || 0),
-          token_fees_usdc: convertValue(row.lp_fee_token_usdc || 0),
-          token_per_usdc: convertValue(row.token_per_usdc_raw || 0),
-          average_price: convertValue(row.token_price_usdc || 0),
-          ownership_share: convertValue(row.ownership_share || 0), // Default to 0 if not provided by query
-          earned_fee_usdc: convertValue(row.earned_fee_usdc || 0),
-          is_complete: false,
-        };
-      });
-    } catch (transformError: any) {
-      logger.error('[MeteoraVolume] Error transforming rows', transformError);
-      throw transformError;
-    }
-
-    const validRecords = records.filter(r => r.token && r.date);
-    const invalidCount = records.length - validRecords.length;
-    
-    logger.info(`[MeteoraVolume] Transformed ${records.length} rows, ${validRecords.length} valid, ${invalidCount} invalid`);
-    
-    if (invalidCount > 0 && records.length > 0) {
-      const invalidSample = records.find(r => !r.token || !r.date);
-      if (invalidSample) {
-        logger.info('[MeteoraVolume] Sample invalid record:', { record: JSON.stringify(invalidSample) });
-      }
-    }
-    
-    if (validRecords.length === 0) {
-      logger.info('[MeteoraVolume] No valid records to insert');
-      return 0;
-    }
-
-    const today = new Date().toISOString().split('T')[0]!;
-    const markComplete = true;
-
-    logger.info(`[MeteoraVolume] Upserting ${validRecords.length} records to database...`);
-    try {
-      const upserted = await this.databaseService.upsertDailyMeteoraVolumes(validRecords, markComplete);
-      logger.info(`[MeteoraVolume] Upsert complete: ${upserted} records`);
-      return upserted;
-    } catch (upsertError: any) {
-      logger.error('[MeteoraVolume] Error upserting to database', upsertError);
-      throw upsertError;
-    }
-  }
-
-  /**
-   * Helper to add days to a date string
-   */
-  private addDays(dateStr: string, days: number): string {
-    const date = new Date(dateStr);
-    date.setDate(date.getDate() + days);
-    return date.toISOString().split('T')[0]!;
-  }
-
-  /**
-   * Check if service is ready
-   */
-  isReady(): boolean {
-    return this.initialized && this.databaseService.isAvailable();
-  }
-
-  /**
-   * Get service status
-   */
-  getStatus(): {
-    initialized: boolean;
-    databaseConnected: boolean;
-    queryIdConfigured: boolean;
-    isRefreshing: boolean;
-  } {
-    return {
-      initialized: this.initialized,
-      databaseConnected: this.databaseService.isAvailable(),
-      queryIdConfigured: !!config.dune.meteoraVolumeQueryId,
-      isRefreshing: this.isRefreshing,
-    };
-  }
-}
diff --git a/src/services/database/internal/dbRuntime.ts b/src/services/database/internal/dbRuntime.ts
deleted file mode 100644
index 2145cf0..0000000
--- a/src/services/database/internal/dbRuntime.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type pg from 'pg';
-
-/**
- * Minimal interface for database modules to access the current pool.
- * Uses getters so reconnect-created pools are always current.
- */
-export interface DbRuntime {
-  getPool(): pg.Pool | null;
-  isConnected(): boolean;
-}
diff --git a/src/services/database/internal/repos/dailyBuySellVolumesRepo.ts b/src/services/database/internal/repos/dailyBuySellVolumesRepo.ts
deleted file mode 100644
index 091f0e2..0000000
--- a/src/services/database/internal/repos/dailyBuySellVolumesRepo.ts
+++ /dev/null
@@ -1,379 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-import type { DailyBuySellVolumeRecord, CumulativeVolumeData } from '../../../databaseService.js';
-
-export function createDailyBuySellVolumesRepo(db: DbRuntime) {
-  return {
-    /**
-     * Get the latest complete date from daily_buy_sell_volumes table
-     */
-    async getLatestBuySellDate(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(date) as latest_date FROM daily_buy_sell_volumes WHERE is_complete = true'
-        );
-        return result.rows[0]?.latest_date?.toISOString().split('T')[0] || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest buy/sell date:', error);
-        return null;
-      }
-    },
-
-    async upsertDailyBuySellVolumes(records: DailyBuySellVolumeRecord[], markComplete: boolean = false): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) {
-        return 0;
-      }
-
-      const BATCH_SIZE = 500;
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-            
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-            
-            batch.forEach((record, idx) => {
-              const offset = idx * 9; // 9 parameters per record
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, ${markComplete}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.date,
-                record.base_volume,
-                record.target_volume,
-                record.buy_usdc_volume,
-                record.sell_token_volume,
-                record.high,
-                record.low,
-                record.trade_count || 0
-              );
-            });
-
-            const batchSQL = `
-              INSERT INTO daily_buy_sell_volumes (token, date, base_volume, target_volume, buy_usdc_volume, sell_token_volume, high, low, trade_count, is_complete, updated_at)
-              VALUES ${valuePlaceholders.join(', ')}
-              ON CONFLICT (token, date) 
-              DO UPDATE SET 
-                base_volume = EXCLUDED.base_volume,
-                target_volume = EXCLUDED.target_volume,
-                buy_usdc_volume = EXCLUDED.buy_usdc_volume,
-                sell_token_volume = EXCLUDED.sell_token_volume,
-                high = EXCLUDED.high,
-                low = EXCLUDED.low,
-                trade_count = EXCLUDED.trade_count,
-                is_complete = CASE WHEN EXCLUDED.is_complete THEN true ELSE daily_buy_sell_volumes.is_complete END,
-                updated_at = CURRENT_TIMESTAMP
-            `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-            
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] Buy/sell volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} daily buy/sell volume records`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting daily buy/sell volumes:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Get daily buy/sell volumes with cumulative totals calculated from DB
-     * Cumulative values are computed on-the-fly using window functions
-     */
-    async getDailyBuySellVolumesWithCumulative(token?: string): Promise<CumulativeVolumeData[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        let whereClause = '';
-        let params: any[] = [];
-
-        if (token) {
-          whereClause = 'WHERE token = $1';
-          params = [token];
-        }
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            date::text,
-            base_volume::text,
-            target_volume::text,
-            buy_usdc_volume::text,
-            sell_token_volume::text,
-            SUM(target_volume) OVER (
-              PARTITION BY token
-              ORDER BY date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::text AS cumulative_target_volume,
-            SUM(base_volume) OVER (
-              PARTITION BY token
-              ORDER BY date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::text AS cumulative_base_volume,
-            SUM(buy_usdc_volume) OVER (
-              PARTITION BY token
-              ORDER BY date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::text AS cumulative_buy_usdc_volume,
-            SUM(sell_token_volume) OVER (
-              PARTITION BY token
-              ORDER BY date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::text AS cumulative_sell_token_volume,
-            high::text,
-            low::text
-           FROM daily_buy_sell_volumes
-           ${whereClause}
-           ORDER BY token, date ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting cumulative volumes:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get daily buy/sell volumes with date range filtering
-     * @param options.token Filter by specific token
-     * @param options.startDate Start date (inclusive) in YYYY-MM-DD format
-     * @param options.endDate End date (inclusive) in YYYY-MM-DD format
-     */
-    async getDailyBuySellVolumes(options?: {
-      token?: string;
-      tokens?: string[];
-      startDate?: string;
-      endDate?: string;
-    }): Promise<{
-      token: string;
-      date: string;
-      base_volume: string;
-      target_volume: string;
-      buy_usdc_volume: string;
-      sell_token_volume: string;
-      high: string;
-      low: string;
-      trade_count: number;
-      average_price: string;
-      usdc_fees: string;
-      token_fees: string;
-      token_fees_usdc: string;
-      sell_volume_usdc: string;
-      sell_volume: string;
-      buy_volume: string;
-    }[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const conditions: string[] = [];
-        const params: any[] = [];
-        let paramIndex = 1;
-
-        // Support both single token and array of tokens
-        if (options?.tokens && options.tokens.length > 0) {
-          const placeholders = options.tokens.map((_, i) => `$${paramIndex + i}`).join(', ');
-          conditions.push(`token IN (${placeholders})`);
-          params.push(...options.tokens);
-          paramIndex += options.tokens.length;
-        } else if (options?.token) {
-          conditions.push(`token = $${paramIndex}`);
-          params.push(options.token);
-          paramIndex++;
-        }
-
-        if (options?.startDate) {
-          conditions.push(`date >= $${paramIndex}`);
-          params.push(options.startDate);
-          paramIndex++;
-        }
-
-        if (options?.endDate) {
-          conditions.push(`date <= $${paramIndex}`);
-          params.push(options.endDate);
-          paramIndex++;
-        }
-
-        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            date::text,
-            base_volume::text,
-            target_volume::text,
-            buy_volume::text,
-            buy_volume::text as buy_usdc_volume,
-            sell_volume::text,
-            sell_volume::text as sell_token_volume,
-            high::text,
-            low::text,
-            trade_count,
-            average_price::text,
-            usdc_fees::text,
-            token_fees::text,
-            token_fees_usdc::text,
-            sell_volume_usdc::text
-           FROM daily_volumes
-           ${whereClause}
-           ORDER BY token, date ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily buy/sell volumes:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get aggregated buy/sell stats for all tokens
-     */
-    async getBuySellAggregates(tokens?: string[]): Promise<Map<string, {
-      total_buy_usdc: string;
-      total_sell_token: string;
-      total_base_volume: string;
-      total_target_volume: string;
-      first_date: string;
-      last_date: string;
-      trading_days: number;
-    }>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        let whereClause = '';
-        let params: any[] = [];
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${i + 1}`).join(', ');
-          whereClause = `WHERE token IN (${placeholders})`;
-          params = [...tokens];
-        }
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            SUM(buy_usdc_volume)::text AS total_buy_usdc,
-            SUM(sell_token_volume)::text AS total_sell_token,
-            SUM(base_volume)::text AS total_base_volume,
-            SUM(target_volume)::text AS total_target_volume,
-            MIN(date)::text AS first_date,
-            MAX(date)::text AS last_date,
-            COUNT(*)::int AS trading_days
-           FROM daily_buy_sell_volumes
-           ${whereClause}
-           GROUP BY token
-           ORDER BY SUM(target_volume) DESC`,
-          params
-        );
-
-        const aggregates = new Map();
-        for (const row of result.rows) {
-          aggregates.set(row.token, {
-            total_buy_usdc: row.total_buy_usdc || '0',
-            total_sell_token: row.total_sell_token || '0',
-            total_base_volume: row.total_base_volume || '0',
-            total_target_volume: row.total_target_volume || '0',
-            first_date: row.first_date,
-            last_date: row.last_date,
-            trading_days: row.trading_days || 0,
-          });
-        }
-        return aggregates;
-      } catch (error: any) {
-        logger.error('[Database] Error getting buy/sell aggregates:', error);
-        return new Map();
-      }
-    },
-
-    /**
-     * Get the first trade date for each token (when trading started)
-     * Returns a Map of token address -> first trade date (YYYY-MM-DD)
-     */
-    async getFirstTradeDates(): Promise<Map<string, string>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        const result = await pool.query(
-          `SELECT token, MIN(date)::text AS first_date
-           FROM daily_buy_sell_volumes
-           GROUP BY token`
-        );
-
-        const map = new Map<string, string>();
-        for (const row of result.rows) {
-          map.set(row.token, row.first_date);
-        }
-        return map;
-      } catch (error: any) {
-        logger.error('[Database] Error getting first trade dates:', error);
-        return new Map();
-      }
-    },
-
-    /**
-     * Get buy/sell volume record count
-     */
-    async getBuySellRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM daily_buy_sell_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting buy/sell record count:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Mark days as complete (called when day boundary passes)
-     */
-    async markBuySellDaysComplete(beforeDate: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `UPDATE daily_buy_sell_volumes SET is_complete = true, updated_at = CURRENT_TIMESTAMP
-           WHERE date < $1 AND is_complete = false`,
-          [beforeDate]
-        );
-        logger.info(`[Database] Marked buy/sell days before ${beforeDate} as complete`);
-      } catch (error: any) {
-        logger.error('[Database] Error marking buy/sell days complete:', error);
-      }
-    },
-  };
-}
diff --git a/src/services/database/internal/repos/dailyFeesVolumesRepo.ts b/src/services/database/internal/repos/dailyFeesVolumesRepo.ts
deleted file mode 100644
index 27f2cb0..0000000
--- a/src/services/database/internal/repos/dailyFeesVolumesRepo.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-import type { DailyFeesVolumeRecord } from '../../../databaseService.js';
-
-export function createDailyFeesVolumesRepo(db: DbRuntime) {
-  return {
-    /**
-     * Get the latest date we have fees data for
-     */
-    async getLatestFeesDate(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(trading_date) as latest_date FROM daily_fees_volumes WHERE is_complete = true'
-        );
-        return result.rows[0]?.latest_date?.toISOString().split('T')[0] || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest fees date:', error);
-        return null;
-      }
-    },
-
-    /**
-     * Upsert daily fees volume records using batched inserts
-     * @param records Array of daily fees volume records
-     * @param markComplete If true, marks these days as complete (for historical data)
-     */
-    async upsertDailyFeesVolumes(records: DailyFeesVolumeRecord[], markComplete: boolean = false): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) {
-        return 0;
-      }
-
-      const BATCH_SIZE = 500;
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-            
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-            
-            batch.forEach((record, idx) => {
-              const offset = idx * 17; // 17 parameters per record
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, $${offset + 10}, $${offset + 11}, $${offset + 12}, $${offset + 13}, $${offset + 14}, $${offset + 15}, $${offset + 16}, $${offset + 17}, ${markComplete}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.trading_date,
-                record.base_volume,
-                record.target_volume,
-                record.usdc_fees,
-                record.token_fees_usdc,
-                record.token_fees,
-                record.buy_volume,
-                record.sell_volume,
-                record.sell_volume_usdc,
-                record.cumulative_usdc_fees,
-                record.cumulative_token_in_usdc_fees,
-                record.cumulative_target_volume,
-                record.cumulative_token_volume,
-                record.high,
-                record.average_price,
-                record.low
-              );
-            });
-
-            const batchSQL = `
-              INSERT INTO daily_fees_volumes (token, trading_date, base_volume, target_volume, usdc_fees, token_fees_usdc, token_fees, buy_volume, sell_volume, sell_volume_usdc, cumulative_usdc_fees, cumulative_token_in_usdc_fees, cumulative_target_volume, cumulative_token_volume, high, average_price, low, is_complete, updated_at)
-              VALUES ${valuePlaceholders.join(', ')}
-              ON CONFLICT (token, trading_date) 
-              DO UPDATE SET 
-                base_volume = EXCLUDED.base_volume,
-                target_volume = EXCLUDED.target_volume,
-                usdc_fees = EXCLUDED.usdc_fees,
-                token_fees_usdc = EXCLUDED.token_fees_usdc,
-                token_fees = EXCLUDED.token_fees,
-                buy_volume = EXCLUDED.buy_volume,
-                sell_volume = EXCLUDED.sell_volume,
-                sell_volume_usdc = EXCLUDED.sell_volume_usdc,
-                cumulative_usdc_fees = EXCLUDED.cumulative_usdc_fees,
-                cumulative_token_in_usdc_fees = EXCLUDED.cumulative_token_in_usdc_fees,
-                cumulative_target_volume = EXCLUDED.cumulative_target_volume,
-                cumulative_token_volume = EXCLUDED.cumulative_token_volume,
-                high = EXCLUDED.high,
-                average_price = EXCLUDED.average_price,
-                low = EXCLUDED.low,
-                is_complete = CASE WHEN EXCLUDED.is_complete THEN true ELSE daily_fees_volumes.is_complete END,
-                updated_at = CURRENT_TIMESTAMP
-            `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-            
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] Fees volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} daily fees volume records`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting daily fees volumes:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Get daily fees volumes with date range filtering
-     * @param options.token Filter by specific token
-     * @param options.startDate Start date (inclusive) in YYYY-MM-DD format
-     * @param options.endDate End date (inclusive) in YYYY-MM-DD format
-     */
-    async getDailyFeesVolumes(options?: {
-      token?: string;
-      startDate?: string;
-      endDate?: string;
-    }): Promise<DailyFeesVolumeRecord[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const conditions: string[] = [];
-        const params: any[] = [];
-        let paramIndex = 1;
-
-        if (options?.token) {
-          conditions.push(`token = $${paramIndex}`);
-          params.push(options.token);
-          paramIndex++;
-        }
-
-        if (options?.startDate) {
-          conditions.push(`trading_date >= $${paramIndex}`);
-          params.push(options.startDate);
-          paramIndex++;
-        }
-
-        if (options?.endDate) {
-          conditions.push(`trading_date <= $${paramIndex}`);
-          params.push(options.endDate);
-          paramIndex++;
-        }
-
-        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            trading_date::text,
-            base_volume::text,
-            target_volume::text,
-            usdc_fees::text,
-            token_fees_usdc::text,
-            token_fees::text,
-            buy_volume::text,
-            sell_volume::text,
-            sell_volume_usdc::text,
-            cumulative_usdc_fees::text,
-            cumulative_token_in_usdc_fees::text,
-            cumulative_target_volume::text,
-            cumulative_token_volume::text,
-            high::text,
-            average_price::text,
-            low::text
-           FROM daily_fees_volumes
-           ${whereClause}
-           ORDER BY token, trading_date ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily fees volumes:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Mark days as complete (called when day boundary passes)
-     */
-    async markFeesDaysComplete(beforeDate: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `UPDATE daily_fees_volumes SET is_complete = true, updated_at = CURRENT_TIMESTAMP
-           WHERE trading_date < $1 AND is_complete = false`,
-          [beforeDate]
-        );
-        logger.info(`[Database] Marked fees days before ${beforeDate} as complete`);
-      } catch (error: any) {
-        logger.error('[Database] Error marking fees days complete:', error);
-      }
-    },
-
-    /**
-     * Get fees volume record count
-     */
-    async getFeesRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM daily_fees_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting fees record count:', error);
-        return 0;
-      }
-    },
-  };
-}
diff --git a/src/services/database/internal/repos/dailyMeteoraVolumesRepo.ts b/src/services/database/internal/repos/dailyMeteoraVolumesRepo.ts
deleted file mode 100644
index d3a5d18..0000000
--- a/src/services/database/internal/repos/dailyMeteoraVolumesRepo.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-import type { DailyMeteoraVolumeRecord } from '../../../databaseService.js';
-
-export function createDailyMeteoraVolumesRepo(db: DbRuntime) {
-  return {
-    /**
-     * Get daily Meteora volumes with date range filtering
-     * @param options.token Filter by specific token
-     * @param options.tokens Filter by array of tokens
-     * @param options.startDate Start date (inclusive) in YYYY-MM-DD format
-     * @param options.endDate End date (inclusive) in YYYY-MM-DD format
-     */
-    async getDailyMeteoraVolumes(options?: {
-      token?: string;
-      tokens?: string[];
-      startDate?: string;
-      endDate?: string;
-    }): Promise<{
-      token: string;
-      date: string;
-      base_volume: string;
-      target_volume: string;
-      buy_volume: string;
-      sell_volume: string;
-      trade_count: number;
-      average_price: string;
-      usdc_fees: string;
-      token_fees: string;
-      token_fees_usdc: string;
-      token_per_usdc: string;
-    }[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const conditions: string[] = [];
-        const params: any[] = [];
-        let paramIndex = 1;
-
-        // Support both single token and array of tokens
-        if (options?.tokens && options.tokens.length > 0) {
-          const placeholders = options.tokens.map((_, i) => `$${paramIndex + i}`).join(', ');
-          conditions.push(`token IN (${placeholders})`);
-          params.push(...options.tokens);
-          paramIndex += options.tokens.length;
-        } else if (options?.token) {
-          conditions.push(`token = $${paramIndex}`);
-          params.push(options.token);
-          paramIndex++;
-        }
-
-        if (options?.startDate) {
-          conditions.push(`date >= $${paramIndex}`);
-          params.push(options.startDate);
-          paramIndex++;
-        }
-
-        if (options?.endDate) {
-          conditions.push(`date <= $${paramIndex}`);
-          params.push(options.endDate);
-          paramIndex++;
-        }
-
-        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            date::text,
-            base_volume::text,
-            target_volume::text,
-            buy_volume::text,
-            sell_volume::text,
-            trade_count,
-            average_price::text,
-            usdc_fees::text,
-            token_fees::text,
-            token_fees_usdc::text,
-            token_per_usdc::text
-           FROM daily_meteora_volumes
-           ${whereClause}
-           ORDER BY token, date ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily Meteora volumes:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get the latest complete date from daily_meteora_volumes table
-     */
-    async getLatestMeteoraDate(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(date) as latest_date FROM daily_meteora_volumes WHERE is_complete = true'
-        );
-        return result.rows[0]?.latest_date?.toISOString().split('T')[0] || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest Meteora date:', error);
-        return null;
-      }
-    },
-
-    /**
-     * Upsert daily Meteora volume records using batched inserts
-     * @param records Array of daily Meteora volume records
-     * @param markComplete Whether to mark records as complete
-     * @returns Number of records upserted
-     */
-    async upsertDailyMeteoraVolumes(records: DailyMeteoraVolumeRecord[], markComplete: boolean = false): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) {
-        return 0;
-      }
-
-      const BATCH_SIZE = 500;
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-            
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-            
-            batch.forEach((record, idx) => {
-              const offset = idx * 15; // 15 parameters per record (14 data fields + is_complete)
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, $${offset + 10}, $${offset + 11}, $${offset + 12}, $${offset + 13}, $${offset + 14}, $${offset + 15}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.date,
-                record.base_volume,
-                record.target_volume,
-                record.trade_count,
-                record.buy_volume,
-                record.sell_volume,
-                record.usdc_fees,
-                record.token_fees,
-                record.token_fees_usdc,
-                record.token_per_usdc,
-                record.average_price,
-                record.ownership_share,
-                record.earned_fee_usdc,
-                markComplete ? true : (record.is_complete ?? false)
-              );
-            });
-
-            const batchSQL = `
-              INSERT INTO daily_meteora_volumes (token, date, base_volume, target_volume, trade_count, buy_volume, sell_volume, usdc_fees, token_fees, token_fees_usdc, token_per_usdc, average_price, ownership_share, earned_fee_usdc, is_complete, updated_at)
-              VALUES ${valuePlaceholders.join(', ')}
-              ON CONFLICT (token, date) 
-              DO UPDATE SET 
-                base_volume = EXCLUDED.base_volume,
-                target_volume = EXCLUDED.target_volume,
-                trade_count = EXCLUDED.trade_count,
-                buy_volume = EXCLUDED.buy_volume,
-                sell_volume = EXCLUDED.sell_volume,
-                usdc_fees = EXCLUDED.usdc_fees,
-                token_fees = EXCLUDED.token_fees,
-                token_fees_usdc = EXCLUDED.token_fees_usdc,
-                token_per_usdc = EXCLUDED.token_per_usdc,
-                average_price = EXCLUDED.average_price,
-                ownership_share = EXCLUDED.ownership_share,
-                earned_fee_usdc = EXCLUDED.earned_fee_usdc,
-                is_complete = CASE WHEN EXCLUDED.is_complete THEN true ELSE daily_meteora_volumes.is_complete END,
-                updated_at = CURRENT_TIMESTAMP
-            `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-            
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] Meteora volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} daily Meteora volume records`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting daily Meteora volumes:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Mark Meteora volume days as complete before a given date
-     */
-    async markMeteoraDaysComplete(beforeDate: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `UPDATE daily_meteora_volumes SET is_complete = true, updated_at = CURRENT_TIMESTAMP
-           WHERE date < $1 AND is_complete = false`,
-          [beforeDate]
-        );
-        logger.info(`[Database] Marked Meteora days before ${beforeDate} as complete`);
-      } catch (error: any) {
-        logger.error('[Database] Error marking Meteora days complete:', error);
-      }
-    },
-
-    /**
-     * Get count of Meteora volume records
-     */
-    async getMeteoraRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM daily_meteora_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting Meteora record count:', error);
-        return 0;
-      }
-    },
-  };
-}
-
-export type DailyMeteoraVolumesRepo = ReturnType<typeof createDailyMeteoraVolumesRepo>;
diff --git a/src/services/database/internal/repos/dailyVolumesRepo.ts b/src/services/database/internal/repos/dailyVolumesRepo.ts
deleted file mode 100644
index ef557a4..0000000
--- a/src/services/database/internal/repos/dailyVolumesRepo.ts
+++ /dev/null
@@ -1,410 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-import type { DailyVolumeRecord, TokenVolumeAggregate, Rolling24hMetrics } from '../../../databaseService.js';
-
-export function createDailyVolumesRepo(db: DbRuntime) {
-  return {
-    /**
-     * Get the latest date we have data for (across all tokens)
-     */
-    async getLatestDate(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(date) as latest_date FROM daily_volumes'
-        );
-        return result.rows[0]?.latest_date?.toISOString().split('T')[0] || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest date:', error);
-        return null;
-      }
-    },
-
-    /**
-     * Get the latest date for a specific token
-     */
-    async getLatestDateForToken(token: string): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(date) as latest_date FROM daily_volumes WHERE token = $1',
-          [token]
-        );
-        return result.rows[0]?.latest_date?.toISOString().split('T')[0] || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest date for token:', error);
-        return null;
-      }
-    },
-
-    /**
-     * Upsert daily volume records using batched inserts for performance
-     */
-    async upsertDailyVolumes(records: DailyVolumeRecord[]): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) return 0;
-
-      const BATCH_SIZE = 500; // Insert 500 records per batch
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          // Process in batches
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-            
-            // Build multi-value INSERT statement
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-            
-            batch.forEach((record, idx) => {
-              const offset = idx * 6; // 6 parameters per record
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.date,
-                record.base_volume,
-                record.target_volume,
-                record.high,
-                record.low
-              );
-            });
-
-            const batchSQL = `
-              INSERT INTO daily_volumes (token, date, base_volume, target_volume, high, low, updated_at)
-              VALUES ${valuePlaceholders.join(', ')}
-              ON CONFLICT (token, date) 
-              DO UPDATE SET 
-                -- Only update if existing values are NULL or 0 (preserve existing data)
-                base_volume = COALESCE(NULLIF(daily_volumes.base_volume, 0), EXCLUDED.base_volume),
-                target_volume = COALESCE(NULLIF(daily_volumes.target_volume, 0), EXCLUDED.target_volume),
-                high = GREATEST(COALESCE(daily_volumes.high, 0), COALESCE(EXCLUDED.high, 0)),
-                low = LEAST(
-                  CASE WHEN daily_volumes.low > 0 THEN daily_volumes.low ELSE EXCLUDED.low END,
-                  CASE WHEN EXCLUDED.low > 0 THEN EXCLUDED.low ELSE daily_volumes.low END
-                ),
-                updated_at = CURRENT_TIMESTAMP
-            `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-            
-            // Log progress for large batches
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] Daily volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} daily volume records`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting daily volumes:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Get all daily volumes for a token
-     */
-    async getDailyVolumesForToken(token: string): Promise<DailyVolumeRecord[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const result = await pool.query(
-          `SELECT token, date::text, 
-                  base_volume::text, target_volume::text, 
-                  high::text, low::text
-           FROM daily_volumes 
-           WHERE token = $1 
-           ORDER BY date ASC`,
-          [token]
-        );
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily volumes for token:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get daily volumes for multiple tokens
-     */
-    async getDailyVolumesForTokens(tokens: string[]): Promise<Map<string, DailyVolumeRecord[]>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || tokens.length === 0) {
-        return new Map();
-      }
-
-      try {
-        const placeholders = tokens.map((_, i) => `$${i + 1}`).join(', ');
-        const result = await pool.query(
-          `SELECT token, date::text, 
-                  base_volume::text, target_volume::text, 
-                  high::text, low::text
-           FROM daily_volumes 
-           WHERE token IN (${placeholders})
-           ORDER BY token, date ASC`,
-          tokens
-        );
-
-        const tokenMap = new Map<string, DailyVolumeRecord[]>();
-        for (const row of result.rows) {
-          if (!tokenMap.has(row.token)) {
-            tokenMap.set(row.token, []);
-          }
-          tokenMap.get(row.token)!.push(row);
-        }
-        return tokenMap;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily volumes for tokens:', error);
-        return new Map();
-      }
-    },
-
-    /**
-     * Get aggregated volume data for all tokens (for API responses)
-     */
-    async getAggregatedVolumes(tokens?: string[]): Promise<TokenVolumeAggregate[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        let whereClause = '';
-        let params: string[] = [];
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${i + 1}`).join(', ');
-          whereClause = `WHERE token IN (${placeholders})`;
-          params = [...tokens];
-        }
-
-        // Get aggregates
-        const aggregateResult = await pool.query(
-          `SELECT 
-            token,
-            MIN(date)::text as first_trade_date,
-            MAX(date)::text as last_trade_date,
-            SUM(base_volume)::text as total_base_volume,
-            SUM(target_volume)::text as total_target_volume,
-            MAX(high)::text as all_time_high,
-            MIN(CASE WHEN low > 0 THEN low END)::text as all_time_low,
-            COUNT(*)::int as trading_days
-           FROM daily_volumes
-           ${whereClause}
-           GROUP BY token
-           ORDER BY SUM(base_volume) DESC`,
-          params
-        );
-
-        // Get daily data for each token
-        const dailyDataMap = await this.getDailyVolumesForTokens(
-          aggregateResult.rows.map((r: any) => r.token)
-        );
-
-        return aggregateResult.rows.map((row: any) => ({
-          token: row.token,
-          first_trade_date: row.first_trade_date,
-          last_trade_date: row.last_trade_date,
-          total_base_volume: row.total_base_volume || '0',
-          total_target_volume: row.total_target_volume || '0',
-          all_time_high: row.all_time_high || '0',
-          all_time_low: row.all_time_low || '0',
-          trading_days: row.trading_days,
-          daily_data: dailyDataMap.get(row.token) || [],
-        }));
-      } catch (error: any) {
-        logger.error('[Database] Error getting aggregated volumes:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get 24h rolling volume data (last 24 hours from current time)
-     * This queries data from today and yesterday to cover the 24h window
-     */
-    async get24hVolumes(tokens?: string[]): Promise<Map<string, { base_volume: string; target_volume: string; high: string; low: string }>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        // Get today and yesterday's date
-        const today = new Date().toISOString().split('T')[0];
-        const yesterday = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString().split('T')[0];
-
-        let whereClause = 'WHERE date >= $1';
-        let params: any[] = [yesterday];
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${i + 2}`).join(', ');
-          whereClause += ` AND token IN (${placeholders})`;
-          params = [yesterday, ...tokens];
-        }
-
-        const result = await pool.query(
-          `SELECT 
-            token,
-            SUM(base_volume)::text as base_volume,
-            SUM(target_volume)::text as target_volume,
-            MAX(high)::text as high,
-            MIN(CASE WHEN low > 0 THEN low END)::text as low
-           FROM daily_volumes
-           ${whereClause}
-           GROUP BY token`,
-          params
-        );
-
-        const volumeMap = new Map();
-        for (const row of result.rows) {
-          volumeMap.set(row.token, {
-            base_volume: row.base_volume || '0',
-            target_volume: row.target_volume || '0',
-            high: row.high || '0',
-            low: row.low || '0',
-          });
-        }
-        return volumeMap;
-      } catch (error: any) {
-        logger.error('[Database] Error getting 24h volumes:', error);
-        return new Map();
-      }
-    },
-
-    /**
-     * Get total daily volume record count
-     */
-    async getRecordCount(): Promise<number> {
-      return this.getDailyRecordCount();
-    },
-
-    /**
-     * Get total daily volume record count
-     */
-    async getDailyRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM daily_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily record count:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Get unique token count
-     */
-    async getTokenCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(DISTINCT token) as count FROM daily_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting token count:', error);
-        return 0;
-      }
-    },
-
-    /**
-     * Get rolling 24h metrics from v06_spot_ohlcv_1m table.
-     * Used when USE_DUNE_DATA=false to source FutarchyAMM volume from the v0.6 indexer.
-     * Amounts in this table are raw integers (6 decimals) — caller divides by 1e6.
-     */
-    async getV06Rolling24hMetrics(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        const cutoffTime = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
-
-        let whereClause = 'WHERE bucket >= $1';
-        let params: any[] = [cutoffTime];
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${i + 2}`).join(', ');
-          whereClause += ` AND token IN (${placeholders})`;
-          params = [cutoffTime, ...tokens];
-        }
-
-        const result = await pool.query(
-          `SELECT
-            token,
-            (SUM(base_volume) / 1e6)::text AS base_volume_24h,
-            (SUM(target_volume) / 1e6)::text AS target_volume_24h,
-            MAX(high)::text AS high_24h,
-            MIN(CASE WHEN low > 0 THEN low END)::text AS low_24h,
-            SUM(trade_count)::int AS trade_count_24h
-           FROM v06_spot_ohlcv_1m
-           ${whereClause}
-           GROUP BY token`,
-          params
-        );
-
-        const metricsMap = new Map<string, Rolling24hMetrics>();
-        for (const row of result.rows) {
-          metricsMap.set(row.token, {
-            token: row.token,
-            base_volume_24h: row.base_volume_24h || '0',
-            target_volume_24h: row.target_volume_24h || '0',
-            high_24h: row.high_24h || '0',
-            low_24h: row.low_24h || '0',
-            trade_count_24h: row.trade_count_24h || 0,
-          });
-        }
-        return metricsMap;
-      } catch (error: any) {
-        logger.error('[Database] Error getting v0.6 rolling 24h metrics:', error);
-        return new Map();
-      }
-    },
-
-    /**
-     * Get the first trade date for each token (when trading started)
-     * Returns a Map of token address -> first trade date (YYYY-MM-DD)
-     */
-    async getFirstTradeDates(): Promise<Map<string, string>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        const result = await pool.query(
-          `SELECT token, MIN(date)::text AS first_date
-           FROM daily_buy_sell_volumes
-           GROUP BY token`
-        );
-
-        const map = new Map<string, string>();
-        for (const row of result.rows) {
-          map.set(row.token, row.first_date);
-        }
-        return map;
-      } catch (error: any) {
-        logger.error('[Database] Error getting first trade dates:', error);
-        return new Map();
-      }
-    },
-  };
-}
-
-export type DailyVolumesRepo = ReturnType<typeof createDailyVolumesRepo>;
diff --git a/src/services/database/internal/repos/intervalVolumesRepo.ts b/src/services/database/internal/repos/intervalVolumesRepo.ts
deleted file mode 100644
index 339aa6b..0000000
--- a/src/services/database/internal/repos/intervalVolumesRepo.ts
+++ /dev/null
@@ -1,913 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-import type { HourlyVolumeRecord, TenMinuteVolumeRecord, Rolling24hMetrics } from '../../../databaseService.js';
-
-export function createIntervalVolumesRepo(db: DbRuntime) {
-  return {
-    // ============================================
-    // SYNC METADATA
-    // ============================================
-
-    async setSyncMetadata(key: string, value: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `INSERT INTO sync_metadata (key, value, updated_at)
-         VALUES ($1, $2, CURRENT_TIMESTAMP)
-         ON CONFLICT (key) DO UPDATE SET value = $2, updated_at = CURRENT_TIMESTAMP`,
-          [key, value]
-        );
-      } catch (error: any) {
-        logger.error('[Database] Error setting sync metadata:', error);
-      }
-    },
-
-    async getSyncMetadata(key: string): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT value FROM sync_metadata WHERE key = $1',
-          [key]
-        );
-        return result.rows[0]?.value || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting sync metadata:', error);
-        return null;
-      }
-    },
-
-    // ============================================
-    // HOURLY VOLUME METHODS
-    // ============================================
-
-    async getLatestHour(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(hour) as latest_hour FROM hourly_volumes'
-        );
-        return result.rows[0]?.latest_hour?.toISOString() || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest hour:', error);
-        return null;
-      }
-    },
-
-    async getLatestCompleteHour(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(hour) as latest_hour FROM hourly_volumes WHERE is_complete = true'
-        );
-        return result.rows[0]?.latest_hour?.toISOString() || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest complete hour:', error);
-        return null;
-      }
-    },
-
-    async upsertHourlyVolumes(records: HourlyVolumeRecord[], markComplete: boolean = false): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) return 0;
-
-      const BATCH_SIZE = 500;
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-
-            batch.forEach((record, idx) => {
-              const offset = idx * 14;
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, $${offset + 10}, $${offset + 11}, $${offset + 12}, $${offset + 13}, $${offset + 14}, ${markComplete}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.hour,
-                record.base_volume,
-                record.target_volume,
-                record.buy_volume || '0',
-                record.sell_volume || '0',
-                record.high,
-                record.low,
-                record.average_price || '0',
-                record.trade_count || 0,
-                record.usdc_fees || '0',
-                record.token_fees || '0',
-                record.token_fees_usdc || '0',
-                record.sell_volume_usdc || '0'
-              );
-            });
-
-            const batchSQL = `
-            INSERT INTO hourly_volumes (token, hour, base_volume, target_volume, buy_volume, sell_volume, high, low, average_price, trade_count, usdc_fees, token_fees, token_fees_usdc, sell_volume_usdc, is_complete, updated_at)
-            VALUES ${valuePlaceholders.join(', ')}
-            ON CONFLICT (token, hour) 
-            DO UPDATE SET 
-              base_volume = COALESCE(NULLIF(hourly_volumes.base_volume, 0), EXCLUDED.base_volume),
-              target_volume = COALESCE(NULLIF(hourly_volumes.target_volume, 0), EXCLUDED.target_volume),
-              high = GREATEST(COALESCE(hourly_volumes.high, 0), COALESCE(EXCLUDED.high, 0)),
-              low = LEAST(
-                CASE WHEN hourly_volumes.low > 0 THEN hourly_volumes.low ELSE EXCLUDED.low END,
-                CASE WHEN EXCLUDED.low > 0 THEN EXCLUDED.low ELSE hourly_volumes.low END
-              ),
-              trade_count = GREATEST(COALESCE(hourly_volumes.trade_count, 0), COALESCE(EXCLUDED.trade_count, 0)),
-              buy_volume = COALESCE(NULLIF(hourly_volumes.buy_volume, 0), EXCLUDED.buy_volume),
-              sell_volume = COALESCE(NULLIF(hourly_volumes.sell_volume, 0), EXCLUDED.sell_volume),
-              average_price = COALESCE(NULLIF(hourly_volumes.average_price, 0), EXCLUDED.average_price),
-              usdc_fees = COALESCE(NULLIF(hourly_volumes.usdc_fees, 0), EXCLUDED.usdc_fees),
-              token_fees = COALESCE(NULLIF(hourly_volumes.token_fees, 0), EXCLUDED.token_fees),
-              token_fees_usdc = COALESCE(NULLIF(hourly_volumes.token_fees_usdc, 0), EXCLUDED.token_fees_usdc),
-              sell_volume_usdc = COALESCE(NULLIF(hourly_volumes.sell_volume_usdc, 0), EXCLUDED.sell_volume_usdc),
-              is_complete = CASE WHEN EXCLUDED.is_complete THEN true ELSE hourly_volumes.is_complete END,
-              updated_at = CURRENT_TIMESTAMP
-          `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] Hourly volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} hourly volume records (complete: ${markComplete})`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting hourly volumes:', error);
-        return 0;
-      }
-    },
-
-    async markHoursComplete(beforeHour: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `UPDATE hourly_volumes SET is_complete = true, updated_at = CURRENT_TIMESTAMP
-         WHERE hour < $1 AND is_complete = false`,
-          [beforeHour]
-        );
-        logger.info(`[Database] Marked hours before ${beforeHour} as complete`);
-      } catch (error: any) {
-        logger.error('[Database] Error marking hours complete:', error);
-      }
-    },
-
-    async getRolling24hMetrics(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        const cutoffTime = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
-
-        let whereClause = 'WHERE hour >= $1';
-        let params: any[] = [cutoffTime];
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${i + 2}`).join(', ');
-          whereClause += ` AND token IN (${placeholders})`;
-          params = [cutoffTime, ...tokens];
-        }
-
-        const result = await pool.query(
-          `SELECT 
-          token,
-          SUM(base_volume)::text as base_volume_24h,
-          SUM(target_volume)::text as target_volume_24h,
-          MAX(high)::text as high_24h,
-          MIN(CASE WHEN low > 0 THEN low END)::text as low_24h,
-          SUM(trade_count)::int as trade_count_24h
-         FROM hourly_volumes
-         ${whereClause}
-         GROUP BY token`,
-          params
-        );
-
-        const metricsMap = new Map<string, Rolling24hMetrics>();
-        for (const row of result.rows) {
-          metricsMap.set(row.token, {
-            token: row.token,
-            base_volume_24h: row.base_volume_24h || '0',
-            target_volume_24h: row.target_volume_24h || '0',
-            high_24h: row.high_24h || '0',
-            low_24h: row.low_24h || '0',
-            trade_count_24h: row.trade_count_24h || 0,
-          });
-        }
-        return metricsMap;
-      } catch (error: any) {
-        logger.error('[Database] Error getting rolling 24h metrics:', error);
-        return new Map();
-      }
-    },
-
-    async getHourlyVolumes(startHour: string, endHour?: string, tokens?: string[]): Promise<HourlyVolumeRecord[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        let whereClause = 'WHERE hour >= $1';
-        let params: any[] = [startHour];
-        let paramIndex = 2;
-
-        if (endHour) {
-          whereClause += ` AND hour <= $${paramIndex}`;
-          params.push(endHour);
-          paramIndex++;
-        }
-
-        if (tokens && tokens.length > 0) {
-          const placeholders = tokens.map((_, i) => `$${paramIndex + i}`).join(', ');
-          whereClause += ` AND token IN (${placeholders})`;
-          params = [...params, ...tokens];
-        }
-
-        const result = await pool.query(
-          `SELECT 
-          token,
-          hour::text,
-          base_volume::text,
-          target_volume::text,
-          high::text,
-          low::text,
-          trade_count
-         FROM hourly_volumes
-         ${whereClause}
-         ORDER BY token, hour ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting hourly volumes:', error);
-        return [];
-      }
-    },
-
-    async getHourlyRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM hourly_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting hourly record count:', error);
-        return 0;
-      }
-    },
-
-    async getHourlyTokenCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(DISTINCT token) as count FROM hourly_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting hourly token count:', error);
-        return 0;
-      }
-    },
-
-    async pruneOldHourlyData(keepHours: number = 48): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const cutoffTime = new Date(Date.now() - keepHours * 60 * 60 * 1000).toISOString();
-        const result = await pool.query(
-          'DELETE FROM hourly_volumes WHERE hour < $1 RETURNING id',
-          [cutoffTime]
-        );
-        const deletedCount = result.rowCount || 0;
-        if (deletedCount > 0) {
-          logger.info(`[Database] Pruned ${deletedCount} hourly records older than ${keepHours} hours`);
-        }
-        return deletedCount;
-      } catch (error: any) {
-        logger.error('[Database] Error pruning old hourly data:', error);
-        return 0;
-      }
-    },
-
-    // ============================================
-    // 10-MINUTE VOLUME METHODS
-    // ============================================
-
-    async upsertTenMinuteVolumes(records: TenMinuteVolumeRecord[], markComplete: boolean = false): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || records.length === 0) return 0;
-
-      const BATCH_SIZE = 500;
-      let totalUpserted = 0;
-
-      try {
-        const client = await pool.connect();
-
-        try {
-          await client.query('BEGIN');
-
-          for (let i = 0; i < records.length; i += BATCH_SIZE) {
-            const batch = records.slice(i, i + BATCH_SIZE);
-
-            const values: any[] = [];
-            const valuePlaceholders: string[] = [];
-
-            batch.forEach((record, idx) => {
-              const offset = idx * 14;
-              valuePlaceholders.push(
-                `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, $${offset + 10}, $${offset + 11}, $${offset + 12}, $${offset + 13}, $${offset + 14}, ${markComplete}, CURRENT_TIMESTAMP)`
-              );
-              values.push(
-                record.token,
-                record.bucket,
-                record.base_volume,
-                record.target_volume,
-                record.buy_volume || '0',
-                record.sell_volume || '0',
-                record.high,
-                record.low,
-                record.average_price || '0',
-                record.trade_count || 0,
-                record.usdc_fees || '0',
-                record.token_fees || '0',
-                record.token_fees_usdc || '0',
-                record.sell_volume_usdc || '0'
-              );
-            });
-
-            const batchSQL = `
-            INSERT INTO ten_minute_volumes (token, bucket, base_volume, target_volume, buy_volume, sell_volume, high, low, average_price, trade_count, usdc_fees, token_fees, token_fees_usdc, sell_volume_usdc, is_complete, updated_at)
-            VALUES ${valuePlaceholders.join(', ')}
-            ON CONFLICT (token, bucket) 
-            DO UPDATE SET 
-              base_volume = COALESCE(NULLIF(ten_minute_volumes.base_volume, 0), EXCLUDED.base_volume),
-              target_volume = COALESCE(NULLIF(ten_minute_volumes.target_volume, 0), EXCLUDED.target_volume),
-              high = GREATEST(COALESCE(ten_minute_volumes.high, 0), COALESCE(EXCLUDED.high, 0)),
-              low = LEAST(
-                CASE WHEN ten_minute_volumes.low > 0 THEN ten_minute_volumes.low ELSE EXCLUDED.low END,
-                CASE WHEN EXCLUDED.low > 0 THEN EXCLUDED.low ELSE ten_minute_volumes.low END
-              ),
-              buy_volume = COALESCE(NULLIF(ten_minute_volumes.buy_volume, 0), EXCLUDED.buy_volume),
-              sell_volume = COALESCE(NULLIF(ten_minute_volumes.sell_volume, 0), EXCLUDED.sell_volume),
-              average_price = COALESCE(NULLIF(ten_minute_volumes.average_price, 0), EXCLUDED.average_price),
-              trade_count = GREATEST(COALESCE(ten_minute_volumes.trade_count, 0), COALESCE(EXCLUDED.trade_count, 0)),
-              usdc_fees = COALESCE(NULLIF(ten_minute_volumes.usdc_fees, 0), EXCLUDED.usdc_fees),
-              token_fees = COALESCE(NULLIF(ten_minute_volumes.token_fees, 0), EXCLUDED.token_fees),
-              token_fees_usdc = COALESCE(NULLIF(ten_minute_volumes.token_fees_usdc, 0), EXCLUDED.token_fees_usdc),
-              sell_volume_usdc = COALESCE(NULLIF(ten_minute_volumes.sell_volume_usdc, 0), EXCLUDED.sell_volume_usdc),
-              is_complete = CASE WHEN EXCLUDED.is_complete THEN true ELSE ten_minute_volumes.is_complete END,
-              updated_at = CURRENT_TIMESTAMP
-          `;
-
-            await client.query(batchSQL, values);
-            totalUpserted += batch.length;
-
-            if (records.length > BATCH_SIZE) {
-              logger.info(`[Database] 10-min volume batch progress: ${totalUpserted}/${records.length}`);
-            }
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Upserted ${totalUpserted} 10-minute volume records (complete: ${markComplete})`);
-          return totalUpserted;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error upserting 10-minute volumes:', error);
-        return 0;
-      }
-    },
-
-    async markTenMinuteBucketsComplete(beforeBucket: string): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `UPDATE ten_minute_volumes SET is_complete = true, updated_at = CURRENT_TIMESTAMP
-         WHERE bucket < $1 AND is_complete = false`,
-          [beforeBucket]
-        );
-      } catch (error: any) {
-        logger.error('[Database] Error marking 10-min buckets complete:', error);
-      }
-    },
-
-    async backfillMissingFields(): Promise<{
-      tenMinuteUpdated: number;
-      hourlyUpdated: number;
-      dailyUpdated: number;
-    }> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) {
-        return { tenMinuteUpdated: 0, hourlyUpdated: 0, dailyUpdated: 0 };
-      }
-
-      logger.info('[Database] Starting backfill of missing extended fields using DB aggregation functions...');
-      const results = {
-        tenMinuteUpdated: 0,
-        hourlyUpdated: 0,
-        dailyUpdated: 0,
-      };
-
-      try {
-        // 1. Find all hours that have 10-minute data but missing/zero extended fields
-        logger.info('[Database] Finding hours with missing extended fields that have 10-minute data...');
-        const hoursToUpdate = await pool.query(`
-        SELECT DISTINCT 
-          hv.token,
-          hv.hour
-        FROM hourly_volumes hv
-        WHERE EXISTS (
-          SELECT 1 
-          FROM ten_minute_volumes tmv 
-          WHERE tmv.token = hv.token 
-            AND date_trunc('hour', tmv.bucket) = hv.hour
-        )
-        AND (
-          hv.average_price IS NULL OR hv.average_price = 0 OR
-          hv.usdc_fees IS NULL OR hv.usdc_fees = 0 OR
-          hv.sell_volume_usdc IS NULL OR hv.sell_volume_usdc = 0 OR
-          hv.buy_volume IS NULL OR hv.buy_volume = 0 OR
-          hv.sell_volume IS NULL OR hv.sell_volume = 0 OR
-          hv.token_fees IS NULL OR hv.token_fees = 0 OR
-          hv.token_fees_usdc IS NULL OR hv.token_fees_usdc = 0
-        )
-        ORDER BY hv.token, hv.hour
-      `);
-
-        logger.info(`[Database] Found ${hoursToUpdate.rows.length} hours to update from 10-minute data`);
-
-        if (hoursToUpdate.rows.length > 0) {
-          logger.info('[Database] Backfilling hourly records from 10-minute data using aggregate_10min_to_hourly function...');
-
-          for (const row of hoursToUpdate.rows) {
-            const tokenValue = String(row.token);
-            const hourValue = row.hour instanceof Date ? row.hour.toISOString() : String(row.hour);
-
-            try {
-              const client = await pool.connect();
-              try {
-                const escapedToken = client.escapeLiteral(tokenValue);
-                const escapedHour = client.escapeLiteral(hourValue);
-
-                const aggregated = await client.query(
-                  `SELECT * FROM aggregate_10min_to_hourly(${escapedToken}::VARCHAR, ${escapedHour}::TIMESTAMPTZ)`
-                );
-
-                if (aggregated.rows.length > 0) {
-                  const agg = aggregated.rows[0];
-
-                  if (agg.average_price != null || agg.usdc_fees != null || agg.sell_volume_usdc != null) {
-                    const buyVolume = agg.buy_volume != null ? Number(agg.buy_volume) : null;
-                    const sellVolume = agg.sell_volume != null ? Number(agg.sell_volume) : null;
-                    const averagePrice = agg.average_price != null ? Number(agg.average_price) : null;
-                    const usdcFees = agg.usdc_fees != null ? Number(agg.usdc_fees) : null;
-                    const tokenFees = agg.token_fees != null ? Number(agg.token_fees) : null;
-                    const tokenFeesUsdc = agg.token_fees_usdc != null ? Number(agg.token_fees_usdc) : null;
-                    const sellVolumeUsdc = agg.sell_volume_usdc != null ? Number(agg.sell_volume_usdc) : null;
-
-                    logger.debug(`[Database] Updating hour ${hourValue} for token ${tokenValue}`, {
-                      buyVolume, sellVolume, averagePrice, usdcFees, tokenFees, tokenFeesUsdc, sellVolumeUsdc,
-                      tokenValue, hourValue, rawAgg: agg
-                    });
-
-                    await client.query(
-                      `UPDATE hourly_volumes
-                    SET 
-                      buy_volume = CASE WHEN $1::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(buy_volume, 0), $1::NUMERIC) ELSE buy_volume END,
-                      sell_volume = CASE WHEN $2::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(sell_volume, 0), $2::NUMERIC) ELSE sell_volume END,
-                      average_price = CASE WHEN $3::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(average_price, 0), $3::NUMERIC) ELSE average_price END,
-                      usdc_fees = CASE WHEN $4::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(usdc_fees, 0), $4::NUMERIC) ELSE usdc_fees END,
-                      token_fees = CASE WHEN $5::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(token_fees, 0), $5::NUMERIC) ELSE token_fees END,
-                      token_fees_usdc = CASE WHEN $6::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(token_fees_usdc, 0), $6::NUMERIC) ELSE token_fees_usdc END,
-                      sell_volume_usdc = CASE WHEN $7::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(sell_volume_usdc, 0), $7::NUMERIC) ELSE sell_volume_usdc END,
-                      updated_at = CURRENT_TIMESTAMP
-                    WHERE token = $8::VARCHAR AND hour = $9::TIMESTAMPTZ
-                      AND (
-                        average_price IS NULL OR average_price = 0 OR
-                        usdc_fees IS NULL OR usdc_fees = 0 OR
-                        sell_volume_usdc IS NULL OR sell_volume_usdc = 0 OR
-                        buy_volume IS NULL OR buy_volume = 0 OR
-                        sell_volume IS NULL OR sell_volume = 0 OR
-                        token_fees IS NULL OR token_fees = 0 OR
-                        token_fees_usdc IS NULL OR token_fees_usdc = 0
-                      )`,
-                      [buyVolume, sellVolume, averagePrice, usdcFees, tokenFees, tokenFeesUsdc, sellVolumeUsdc, tokenValue, hourValue]
-                    );
-                    results.hourlyUpdated++;
-                  }
-                }
-              } finally {
-                client.release();
-              }
-            } catch (error: any) {
-              logger.error(`[Database] Error updating hour ${row.hour} for token ${row.token}:`, {
-                error: error.message, stack: error.stack,
-                token: row.token, hour: row.hour, tokenValue, hourValue,
-                tokenType: typeof row.token, hourType: typeof row.hour,
-                hourIsDate: row.hour instanceof Date, hourRawValue: row.hour,
-              });
-            }
-          }
-          logger.info(`[Database] Updated ${results.hourlyUpdated} hourly records with missing fields`);
-        }
-
-        // 2. Find all days that have hourly data but missing/zero extended fields
-        logger.info('[Database] Finding days with missing extended fields that have hourly data...');
-        const daysToUpdate = await pool.query(`
-        SELECT DISTINCT 
-          dv.token,
-          dv.date
-        FROM daily_volumes dv
-        WHERE EXISTS (
-          SELECT 1 
-          FROM hourly_volumes hv 
-          WHERE hv.token = dv.token 
-            AND date_trunc('day', hv.hour)::DATE = dv.date
-        )
-        AND (
-          dv.average_price IS NULL OR dv.average_price = 0 OR
-          dv.usdc_fees IS NULL OR dv.usdc_fees = 0 OR
-          dv.sell_volume_usdc IS NULL OR dv.sell_volume_usdc = 0 OR
-          dv.buy_volume IS NULL OR dv.buy_volume = 0 OR
-          dv.sell_volume IS NULL OR dv.sell_volume = 0 OR
-          dv.token_fees IS NULL OR dv.token_fees = 0 OR
-          dv.token_fees_usdc IS NULL OR dv.token_fees_usdc = 0
-        )
-        ORDER BY dv.token, dv.date
-      `);
-
-        logger.info(`[Database] Found ${daysToUpdate.rows.length} days to update from hourly data`);
-
-        if (daysToUpdate.rows.length > 0) {
-          logger.info('[Database] Backfilling daily records from hourly data using aggregate_hourly_to_daily function...');
-
-          for (const row of daysToUpdate.rows) {
-            const tokenValue = String(row.token);
-            const dateValue = row.date instanceof Date ? row.date.toISOString().split('T')[0] : String(row.date);
-
-            try {
-              const client = await pool.connect();
-              try {
-                const escapedToken = client.escapeLiteral(tokenValue);
-                const escapedDate = client.escapeLiteral(dateValue);
-
-                const aggregated = await client.query(
-                  `SELECT * FROM aggregate_hourly_to_daily(${escapedToken}::VARCHAR, ${escapedDate}::DATE)`
-                );
-
-                if (aggregated.rows.length > 0) {
-                  const agg = aggregated.rows[0];
-
-                  if (agg.average_price != null || agg.usdc_fees != null || agg.sell_volume_usdc != null) {
-                    const buyVolume = agg.buy_volume != null ? Number(agg.buy_volume) : null;
-                    const sellVolume = agg.sell_volume != null ? Number(agg.sell_volume) : null;
-                    const averagePrice = agg.average_price != null ? Number(agg.average_price) : null;
-                    const tradeCount = agg.trade_count != null ? Number(agg.trade_count) : null;
-                    const usdcFees = agg.usdc_fees != null ? Number(agg.usdc_fees) : null;
-                    const tokenFees = agg.token_fees != null ? Number(agg.token_fees) : null;
-                    const tokenFeesUsdc = agg.token_fees_usdc != null ? Number(agg.token_fees_usdc) : null;
-                    const sellVolumeUsdc = agg.sell_volume_usdc != null ? Number(agg.sell_volume_usdc) : null;
-                    const cumulativeUsdcFees = agg.cumulative_usdc_fees != null ? Number(agg.cumulative_usdc_fees) : null;
-                    const cumulativeTokenInUsdcFees = agg.cumulative_token_in_usdc_fees != null ? Number(agg.cumulative_token_in_usdc_fees) : null;
-                    const cumulativeTargetVolume = agg.cumulative_target_volume != null ? Number(agg.cumulative_target_volume) : null;
-                    const cumulativeTokenVolume = agg.cumulative_token_volume != null ? Number(agg.cumulative_token_volume) : null;
-
-                    logger.debug(`[Database] Updating day ${dateValue} for token ${tokenValue}`, {
-                      buyVolume, sellVolume, averagePrice, tradeCount, usdcFees, tokenFees, tokenFeesUsdc,
-                      sellVolumeUsdc, cumulativeUsdcFees, cumulativeTokenInUsdcFees, cumulativeTargetVolume,
-                      cumulativeTokenVolume, tokenValue, dateValue, rawAgg: agg
-                    });
-
-                    await client.query(
-                      `UPDATE daily_volumes
-                    SET 
-                      buy_volume = CASE WHEN $1::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(buy_volume, 0), $1::NUMERIC) ELSE buy_volume END,
-                      sell_volume = CASE WHEN $2::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(sell_volume, 0), $2::NUMERIC) ELSE sell_volume END,
-                      average_price = CASE WHEN $3::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(average_price, 0), $3::NUMERIC) ELSE average_price END,
-                      trade_count = CASE WHEN $4::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(trade_count, 0), $4::NUMERIC) ELSE trade_count END,
-                      usdc_fees = CASE WHEN $5::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(usdc_fees, 0), $5::NUMERIC) ELSE usdc_fees END,
-                      token_fees = CASE WHEN $6::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(token_fees, 0), $6::NUMERIC) ELSE token_fees END,
-                      token_fees_usdc = CASE WHEN $7::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(token_fees_usdc, 0), $7::NUMERIC) ELSE token_fees_usdc END,
-                      sell_volume_usdc = CASE WHEN $8::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(sell_volume_usdc, 0), $8::NUMERIC) ELSE sell_volume_usdc END,
-                      cumulative_usdc_fees = CASE WHEN $9::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(cumulative_usdc_fees, 0), $9::NUMERIC) ELSE cumulative_usdc_fees END,
-                      cumulative_token_in_usdc_fees = CASE WHEN $10::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(cumulative_token_in_usdc_fees, 0), $10::NUMERIC) ELSE cumulative_token_in_usdc_fees END,
-                      cumulative_target_volume = CASE WHEN $11::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(cumulative_target_volume, 0), $11::NUMERIC) ELSE cumulative_target_volume END,
-                      cumulative_token_volume = CASE WHEN $12::NUMERIC IS NOT NULL THEN COALESCE(NULLIF(cumulative_token_volume, 0), $12::NUMERIC) ELSE cumulative_token_volume END,
-                      updated_at = CURRENT_TIMESTAMP
-                    WHERE token = $13::VARCHAR AND date = $14::DATE
-                      AND (
-                        average_price IS NULL OR average_price = 0 OR
-                        usdc_fees IS NULL OR usdc_fees = 0 OR
-                        sell_volume_usdc IS NULL OR sell_volume_usdc = 0 OR
-                        buy_volume IS NULL OR buy_volume = 0 OR
-                        sell_volume IS NULL OR sell_volume = 0 OR
-                        token_fees IS NULL OR token_fees = 0 OR
-                        token_fees_usdc IS NULL OR token_fees_usdc = 0
-                      )`,
-                      [buyVolume, sellVolume, averagePrice, tradeCount, usdcFees, tokenFees, tokenFeesUsdc,
-                        sellVolumeUsdc, cumulativeUsdcFees, cumulativeTokenInUsdcFees, cumulativeTargetVolume,
-                        cumulativeTokenVolume, tokenValue, dateValue]
-                    );
-                    results.dailyUpdated++;
-                  }
-                }
-              } finally {
-                client.release();
-              }
-            } catch (error: any) {
-              logger.error(`[Database] Error updating day ${row.date} for token ${row.token}:`, {
-                error: error.message, stack: error.stack,
-                token: row.token, date: row.date, tokenValue, dateValue,
-                tokenType: typeof row.token, dateType: typeof row.date,
-                dateIsDate: row.date instanceof Date, dateRawValue: row.date,
-              });
-            }
-          }
-          logger.info(`[Database] Updated ${results.dailyUpdated} daily records with missing fields`);
-        }
-
-        logger.info('[Database] Backfill completed:', { results });
-        return results;
-      } catch (error: any) {
-        logger.error('[Database] Error during backfill:', error);
-        return results;
-      }
-    },
-
-    async getRolling24hFromTenMinute(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return new Map();
-
-      try {
-        const metricsMap = new Map<string, Rolling24hMetrics>();
-
-        if (tokens && tokens.length > 0) {
-          for (const token of tokens) {
-            const result = await pool.query(
-              `SELECT * FROM calculate_rolling_24h($1)`,
-              [token]
-            );
-
-            for (const row of result.rows) {
-              metricsMap.set(row.token, {
-                token: row.token,
-                base_volume_24h: row.base_volume_24h?.toString() || '0',
-                target_volume_24h: row.target_volume_24h?.toString() || '0',
-                high_24h: row.high_24h?.toString() || '0',
-                low_24h: row.low_24h?.toString() || '0',
-                trade_count_24h: row.trade_count_24h || 0,
-              });
-            }
-          }
-        } else {
-          const result = await pool.query(
-            `SELECT * FROM calculate_rolling_24h(NULL)`
-          );
-
-          for (const row of result.rows) {
-            metricsMap.set(row.token, {
-              token: row.token,
-              base_volume_24h: row.base_volume_24h?.toString() || '0',
-              target_volume_24h: row.target_volume_24h?.toString() || '0',
-              high_24h: row.high_24h?.toString() || '0',
-              low_24h: row.low_24h?.toString() || '0',
-              trade_count_24h: row.trade_count_24h || 0,
-            });
-          }
-        }
-
-        return metricsMap;
-      } catch (error: any) {
-        logger.error('[Database] Error getting rolling 24h from 10-min data:', error);
-        return new Map();
-      }
-    },
-
-    async aggregate10MinToHourly(token?: string, hour?: string): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query(
-          `SELECT * FROM aggregate_10min_to_hourly(CAST($1 AS VARCHAR), CAST($2 AS TIMESTAMPTZ))`,
-          [token || null, hour || null]
-        );
-
-        if (result.rows.length === 0) {
-          return 0;
-        }
-
-        const client = await pool.connect();
-        try {
-          await client.query('BEGIN');
-
-          for (const row of result.rows) {
-            await client.query(
-              `INSERT INTO hourly_volumes (
-              token, hour, base_volume, target_volume, buy_volume, sell_volume,
-              high, low, average_price, trade_count, usdc_fees, token_fees,
-              token_fees_usdc, sell_volume_usdc, is_complete, updated_at
-            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, true, CURRENT_TIMESTAMP)
-            ON CONFLICT (token, hour) DO UPDATE SET
-              base_volume = COALESCE(NULLIF(hourly_volumes.base_volume, 0), EXCLUDED.base_volume),
-              target_volume = COALESCE(NULLIF(hourly_volumes.target_volume, 0), EXCLUDED.target_volume),
-              high = GREATEST(COALESCE(hourly_volumes.high, 0), COALESCE(EXCLUDED.high, 0)),
-              low = LEAST(
-                CASE WHEN hourly_volumes.low > 0 THEN hourly_volumes.low ELSE EXCLUDED.low END,
-                CASE WHEN EXCLUDED.low > 0 THEN EXCLUDED.low ELSE hourly_volumes.low END
-              ),
-              trade_count = GREATEST(COALESCE(hourly_volumes.trade_count, 0), COALESCE(EXCLUDED.trade_count, 0)),
-              buy_volume = COALESCE(NULLIF(hourly_volumes.buy_volume, 0), EXCLUDED.buy_volume),
-              sell_volume = COALESCE(NULLIF(hourly_volumes.sell_volume, 0), EXCLUDED.sell_volume),
-              average_price = COALESCE(NULLIF(hourly_volumes.average_price, 0), EXCLUDED.average_price),
-              usdc_fees = COALESCE(NULLIF(hourly_volumes.usdc_fees, 0), EXCLUDED.usdc_fees),
-              token_fees = COALESCE(NULLIF(hourly_volumes.token_fees, 0), EXCLUDED.token_fees),
-              token_fees_usdc = COALESCE(NULLIF(hourly_volumes.token_fees_usdc, 0), EXCLUDED.token_fees_usdc),
-              sell_volume_usdc = COALESCE(NULLIF(hourly_volumes.sell_volume_usdc, 0), EXCLUDED.sell_volume_usdc),
-              is_complete = true,
-              updated_at = CURRENT_TIMESTAMP`,
-              [
-                row.token, row.hour, row.base_volume, row.target_volume,
-                row.buy_volume, row.sell_volume, row.high, row.low,
-                row.average_price, row.trade_count, row.usdc_fees, row.token_fees,
-                row.token_fees_usdc, row.sell_volume_usdc,
-              ]
-            );
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Aggregated ${result.rows.length} hourly records from 10-minute data`);
-          return result.rows.length;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error aggregating 10-min to hourly:', error);
-        return 0;
-      }
-    },
-
-    async aggregateHourlyToDaily(token?: string, date?: string): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query(
-          `SELECT * FROM aggregate_hourly_to_daily(CAST($1 AS VARCHAR), CAST($2 AS DATE))`,
-          [token || null, date || null]
-        );
-
-        if (result.rows.length === 0) {
-          return 0;
-        }
-
-        const client = await pool.connect();
-        try {
-          await client.query('BEGIN');
-
-          for (const row of result.rows) {
-            await client.query(
-              `INSERT INTO daily_volumes (
-              token, date, base_volume, target_volume, buy_volume, sell_volume,
-              high, low, average_price, trade_count, usdc_fees, token_fees,
-              token_fees_usdc, sell_volume_usdc, cumulative_usdc_fees,
-              cumulative_token_in_usdc_fees, cumulative_target_volume,
-              cumulative_token_volume, is_complete, updated_at
-            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, true, CURRENT_TIMESTAMP)
-            ON CONFLICT (token, date) DO UPDATE SET
-              base_volume = COALESCE(NULLIF(daily_volumes.base_volume, 0), EXCLUDED.base_volume),
-              target_volume = COALESCE(NULLIF(daily_volumes.target_volume, 0), EXCLUDED.target_volume),
-              high = GREATEST(COALESCE(daily_volumes.high, 0), COALESCE(EXCLUDED.high, 0)),
-              low = LEAST(
-                CASE WHEN daily_volumes.low > 0 THEN daily_volumes.low ELSE EXCLUDED.low END,
-                CASE WHEN EXCLUDED.low > 0 THEN EXCLUDED.low ELSE daily_volumes.low END
-              ),
-              trade_count = GREATEST(COALESCE(daily_volumes.trade_count, 0), COALESCE(EXCLUDED.trade_count, 0)),
-              buy_volume = COALESCE(NULLIF(daily_volumes.buy_volume, 0), EXCLUDED.buy_volume),
-              sell_volume = COALESCE(NULLIF(daily_volumes.sell_volume, 0), EXCLUDED.sell_volume),
-              average_price = COALESCE(NULLIF(daily_volumes.average_price, 0), EXCLUDED.average_price),
-              usdc_fees = COALESCE(NULLIF(daily_volumes.usdc_fees, 0), EXCLUDED.usdc_fees),
-              token_fees = COALESCE(NULLIF(daily_volumes.token_fees, 0), EXCLUDED.token_fees),
-              token_fees_usdc = COALESCE(NULLIF(daily_volumes.token_fees_usdc, 0), EXCLUDED.token_fees_usdc),
-              sell_volume_usdc = COALESCE(NULLIF(daily_volumes.sell_volume_usdc, 0), EXCLUDED.sell_volume_usdc),
-              cumulative_usdc_fees = COALESCE(NULLIF(daily_volumes.cumulative_usdc_fees, 0), EXCLUDED.cumulative_usdc_fees),
-              cumulative_token_in_usdc_fees = COALESCE(NULLIF(daily_volumes.cumulative_token_in_usdc_fees, 0), EXCLUDED.cumulative_token_in_usdc_fees),
-              cumulative_target_volume = COALESCE(NULLIF(daily_volumes.cumulative_target_volume, 0), EXCLUDED.cumulative_target_volume),
-              cumulative_token_volume = COALESCE(NULLIF(daily_volumes.cumulative_token_volume, 0), EXCLUDED.cumulative_token_volume),
-              is_complete = true,
-              updated_at = CURRENT_TIMESTAMP`,
-              [
-                row.token, row.date, row.base_volume, row.target_volume,
-                row.buy_volume, row.sell_volume, row.high, row.low,
-                row.average_price, row.trade_count, row.usdc_fees, row.token_fees,
-                row.token_fees_usdc, row.sell_volume_usdc, row.cumulative_usdc_fees,
-                row.cumulative_token_in_usdc_fees, row.cumulative_target_volume,
-                row.cumulative_token_volume,
-              ]
-            );
-          }
-
-          await client.query('COMMIT');
-          logger.info(`[Database] Aggregated ${result.rows.length} daily records from hourly data`);
-          return result.rows.length;
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error aggregating hourly to daily:', error);
-        return 0;
-      }
-    },
-
-    async getLatestTenMinuteBucket(): Promise<string | null> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return null;
-
-      try {
-        const result = await pool.query(
-          'SELECT MAX(bucket) as latest_bucket FROM ten_minute_volumes'
-        );
-        return result.rows[0]?.latest_bucket?.toISOString() || null;
-      } catch (error: any) {
-        logger.error('[Database] Error getting latest 10-min bucket:', error);
-        return null;
-      }
-    },
-
-    async getTenMinuteRecordCount(): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const result = await pool.query('SELECT COUNT(*) as count FROM ten_minute_volumes');
-        return parseInt(result.rows[0]?.count || '0');
-      } catch (error: any) {
-        logger.error('[Database] Error getting 10-min record count:', error);
-        return 0;
-      }
-    },
-
-    async pruneOldTenMinuteData(keepHours: number = 25): Promise<number> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return 0;
-
-      try {
-        const cutoffTime = new Date(Date.now() - keepHours * 60 * 60 * 1000).toISOString();
-        const result = await pool.query(
-          'DELETE FROM ten_minute_volumes WHERE bucket < $1 RETURNING id',
-          [cutoffTime]
-        );
-        const deletedCount = result.rowCount || 0;
-        if (deletedCount > 0) {
-          logger.info(`[Database] Pruned ${deletedCount} 10-minute records older than ${keepHours} hours`);
-        }
-        return deletedCount;
-      } catch (error: any) {
-        logger.error('[Database] Error pruning old 10-min data:', error);
-        return 0;
-      }
-    },
-  };
-}
-
-export type IntervalVolumesRepo = ReturnType<typeof createIntervalVolumesRepo>;
diff --git a/src/services/database/internal/repos/metricsRepo.ts b/src/services/database/internal/repos/metricsRepo.ts
deleted file mode 100644
index 54816f5..0000000
--- a/src/services/database/internal/repos/metricsRepo.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-
-export function createMetricsRepo(db: DbRuntime) {
-  return {
-    /**
-     * Insert a metrics snapshot
-     */
-    async insertMetric(metricName: string, value: number, labels: Record<string, string> = {}): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `INSERT INTO metrics_history (metric_name, metric_value, labels)
-         VALUES ($1, $2, $3)
-         ON CONFLICT (timestamp, metric_name, labels) DO UPDATE SET metric_value = $2`,
-          [metricName, value, JSON.stringify(labels)]
-        );
-      } catch (error: any) {
-        // Silently ignore metrics insert errors to not affect main operations
-        logger.error('[Database] Error inserting metric:', error);
-      }
-    },
-
-    /**
-     * Insert multiple metrics at once
-     */
-    async insertMetricsBatch(metrics: Array<{ name: string; value: number; labels?: Record<string, string> }>): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected() || metrics.length === 0) return;
-
-      try {
-        const client = await pool.connect();
-        try {
-          await client.query('BEGIN');
-
-          for (const metric of metrics) {
-            await client.query(
-              `INSERT INTO metrics_history (metric_name, metric_value, labels)
-             VALUES ($1, $2, $3)
-             ON CONFLICT DO NOTHING`,
-              [metric.name, metric.value, JSON.stringify(metric.labels || {})]
-            );
-          }
-
-          await client.query('COMMIT');
-        } catch (error) {
-          await client.query('ROLLBACK');
-          throw error;
-        } finally {
-          client.release();
-        }
-      } catch (error: any) {
-        logger.error('[Database] Error inserting metrics batch:', error);
-      }
-    },
-
-    /**
-     * Insert a service health snapshot
-     */
-    async insertServiceHealthSnapshot(
-      serviceName: string,
-      isHealthy: boolean,
-      lastRefreshTime?: Date,
-      recordCount?: number,
-      errorMessage?: string,
-      metadata?: Record<string, any>
-    ): Promise<void> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return;
-
-      try {
-        await pool.query(
-          `INSERT INTO service_health_snapshots 
-         (service_name, is_healthy, last_refresh_time, record_count, error_message, metadata)
-         VALUES ($1, $2, $3, $4, $5, $6)`,
-          [
-            serviceName,
-            isHealthy,
-            lastRefreshTime || null,
-            recordCount || null,
-            errorMessage || null,
-            JSON.stringify(metadata || {})
-          ]
-        );
-      } catch (error: any) {
-        logger.error('[Database] Error inserting service health snapshot:', error);
-      }
-    },
-
-    /**
-     * Get recent metrics for a specific metric name
-     */
-    async getRecentMetrics(
-      metricName: string,
-      hours: number = 24,
-      labels?: Record<string, string>
-    ): Promise<Array<{ timestamp: string; value: number; labels: Record<string, string> }>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const cutoff = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
-
-        let query = `
-        SELECT timestamp::text, metric_value::numeric as value, labels
-        FROM metrics_history
-        WHERE metric_name = $1 AND timestamp >= $2
-      `;
-        const params: any[] = [metricName, cutoff];
-
-        if (labels && Object.keys(labels).length > 0) {
-          query += ' AND labels @> $3';
-          params.push(JSON.stringify(labels));
-        }
-
-        query += ' ORDER BY timestamp DESC LIMIT 1000';
-
-        const result = await pool.query(query, params);
-        return result.rows.map(row => ({
-          timestamp: row.timestamp,
-          value: parseFloat(row.value),
-          labels: row.labels,
-        }));
-      } catch (error: any) {
-        logger.error('[Database] Error getting recent metrics:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Get service health history
-     */
-    async getServiceHealthHistory(
-      serviceName?: string,
-      hours: number = 24
-    ): Promise<Array<{
-      timestamp: string;
-      service_name: string;
-      is_healthy: boolean;
-      last_refresh_time: string | null;
-      record_count: number | null;
-      error_message: string | null;
-      metadata: Record<string, any>;
-    }>> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const cutoff = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
-
-        let query = `
-        SELECT 
-          timestamp::text,
-          service_name,
-          is_healthy,
-          last_refresh_time::text,
-          record_count,
-          error_message,
-          metadata
-        FROM service_health_snapshots
-        WHERE timestamp >= $1
-      `;
-        const params: any[] = [cutoff];
-
-        if (serviceName) {
-          query += ' AND service_name = $2';
-          params.push(serviceName);
-        }
-
-        query += ' ORDER BY timestamp DESC LIMIT 1000';
-
-        const result = await pool.query(query, params);
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting service health history:', error);
-        return [];
-      }
-    },
-
-    /**
-     * Prune old metrics data (keep last N days)
-     */
-    async pruneOldMetrics(keepDays: number = 30): Promise<{ metricsDeleted: number; healthDeleted: number }> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return { metricsDeleted: 0, healthDeleted: 0 };
-
-      try {
-        const cutoff = new Date(Date.now() - keepDays * 24 * 60 * 60 * 1000).toISOString();
-
-        const metricsResult = await pool.query(
-          'DELETE FROM metrics_history WHERE timestamp < $1 RETURNING id',
-          [cutoff]
-        );
-
-        const healthResult = await pool.query(
-          'DELETE FROM service_health_snapshots WHERE timestamp < $1 RETURNING id',
-          [cutoff]
-        );
-
-        const metricsDeleted = metricsResult.rowCount || 0;
-        const healthDeleted = healthResult.rowCount || 0;
-
-        if (metricsDeleted > 0 || healthDeleted > 0) {
-          logger.info(`[Database] Pruned ${metricsDeleted} metrics and ${healthDeleted} health snapshots older than ${keepDays} days`);
-        }
-
-        return { metricsDeleted, healthDeleted };
-      } catch (error: any) {
-        logger.error('[Database] Error pruning old metrics:', error);
-        return { metricsDeleted: 0, healthDeleted: 0 };
-      }
-    },
-  };
-}
-
-export type MetricsRepo = ReturnType<typeof createMetricsRepo>;
diff --git a/src/services/database/internal/repos/v06TradingActivityRepo.ts b/src/services/database/internal/repos/v06TradingActivityRepo.ts
deleted file mode 100644
index a11945d..0000000
--- a/src/services/database/internal/repos/v06TradingActivityRepo.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { logger } from '../../../../utils/logger.js';
-import type { DbRuntime } from '../dbRuntime.js';
-
-export function createV06TradingActivityRepo(db: DbRuntime) {
-  return {
-    /**
-     * Get daily trading activity from the v06_fee_volume_daily_aggregate table.
-     * Returns spot + conditional breakdown with a has_conditional_volume flag per row.
-     */
-    async getDailyTradingActivity(options?: {
-      token?: string;
-      tokens?: string[];
-      startDate?: string;
-      endDate?: string;
-    }): Promise<{
-      token: string;
-      date: string;
-      has_conditional_volume: boolean;
-      spot_buy_volume: string;
-      spot_sell_volume: string;
-      spot_base_volume: string;
-      spot_target_volume: string;
-      spot_trade_count: number;
-      spot_usdc_fees: string;
-      spot_token_fees: string;
-      spot_token_fees_usdc: string;
-      conditional_buy_volume: string | null;
-      conditional_sell_volume: string | null;
-      conditional_base_volume: string | null;
-      conditional_target_volume: string | null;
-      conditional_trade_count: number | null;
-      conditional_usdc_fees: string | null;
-      conditional_token_fees: string | null;
-      conditional_token_fees_usdc: string | null;
-      total_buy_volume: string;
-      total_sell_volume: string;
-      total_base_volume: string;
-      total_target_volume: string;
-      total_trade_count: number;
-      total_usdc_fees: string;
-      total_token_fees: string;
-      total_token_fees_usdc: string;
-      conditional_reconciled: boolean;
-      pending_open_proposals: number;
-    }[]> {
-      const pool = db.getPool();
-      if (!pool || !db.isConnected()) return [];
-
-      try {
-        const conditions: string[] = [];
-        const params: any[] = [];
-        let paramIndex = 1;
-
-        if (options?.tokens && options.tokens.length > 0) {
-          const placeholders = options.tokens.map((_, i) => `$${paramIndex + i}`).join(', ');
-          conditions.push(`token IN (${placeholders})`);
-          params.push(...options.tokens);
-          paramIndex += options.tokens.length;
-        } else if (options?.token) {
-          conditions.push(`token = $${paramIndex}`);
-          params.push(options.token);
-          paramIndex++;
-        }
-
-        if (options?.startDate) {
-          conditions.push(`date >= $${paramIndex}`);
-          params.push(options.startDate);
-          paramIndex++;
-        }
-
-        if (options?.endDate) {
-          conditions.push(`date <= $${paramIndex}`);
-          params.push(options.endDate);
-          paramIndex++;
-        }
-
-        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-
-        const result = await pool.query(
-          `SELECT
-          token,
-          date::text,
-          (conditional_buy_volume IS NOT NULL) AS has_conditional_volume,
-          (spot_buy_volume / 1e6)::text AS spot_buy_volume,
-          (spot_sell_volume / 1e6)::text AS spot_sell_volume,
-          (spot_base_volume / 1e6)::text AS spot_base_volume,
-          (spot_target_volume / 1e6)::text AS spot_target_volume,
-          spot_trade_count,
-          (spot_usdc_fees / 1e6)::text AS spot_usdc_fees,
-          (spot_token_fees / 1e6)::text AS spot_token_fees,
-          (spot_token_fees_usdc / 1e6)::text AS spot_token_fees_usdc,
-          (conditional_buy_volume / 1e6)::text AS conditional_buy_volume,
-          (conditional_sell_volume / 1e6)::text AS conditional_sell_volume,
-          (conditional_base_volume / 1e6)::text AS conditional_base_volume,
-          (conditional_target_volume / 1e6)::text AS conditional_target_volume,
-          conditional_trade_count,
-          (conditional_usdc_fees / 1e6)::text AS conditional_usdc_fees,
-          (conditional_token_fees / 1e6)::text AS conditional_token_fees,
-          (conditional_token_fees_usdc / 1e6)::text AS conditional_token_fees_usdc,
-          (total_buy_volume / 1e6)::text AS total_buy_volume,
-          (total_sell_volume / 1e6)::text AS total_sell_volume,
-          (total_base_volume / 1e6)::text AS total_base_volume,
-          (total_target_volume / 1e6)::text AS total_target_volume,
-          total_trade_count,
-          (total_usdc_fees / 1e6)::text AS total_usdc_fees,
-          (total_token_fees / 1e6)::text AS total_token_fees,
-          (total_token_fees_usdc / 1e6)::text AS total_token_fees_usdc,
-          conditional_reconciled,
-          pending_open_proposals
-         FROM v06_fee_volume_daily_aggregate
-         ${whereClause}
-         ORDER BY token, date ASC`,
-          params
-        );
-
-        return result.rows;
-      } catch (error: any) {
-        logger.error('[Database] Error getting daily trading activity:', error);
-        return [];
-      }
-    },
-  };
-}
-
-export type V06TradingActivityRepo = ReturnType<typeof createV06TradingActivityRepo>;
diff --git a/src/services/database/internal/schemaManager.ts b/src/services/database/internal/schemaManager.ts
deleted file mode 100644
index 5aaf18e..0000000
--- a/src/services/database/internal/schemaManager.ts
+++ /dev/null
@@ -1,650 +0,0 @@
-import { logger } from '../../../utils/logger.js';
-import type { DbRuntime } from './dbRuntime.js';
-
-export function createSchemaManager(db: DbRuntime) {
-  const manager = {
-    async createTables(): Promise<void> {
-      const pool = db.getPool();
-      if (!pool) return;
-
-      const createTableSQL = `
-      -- Daily volumes table (aggregated from hourly/10-min data, includes cumulative values)
-      CREATE TABLE IF NOT EXISTS daily_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL,
-        target_volume NUMERIC(40, 12) NOT NULL,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL,
-        low NUMERIC(40, 12) NOT NULL,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_token_in_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_token_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_daily_volumes_token ON daily_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_daily_volumes_date ON daily_volumes(date);
-      CREATE INDEX IF NOT EXISTS idx_daily_volumes_token_date ON daily_volumes(token, date);
-
-      -- Hourly volumes table for hourly aggregates (aggregated from 10-min data)
-      CREATE TABLE IF NOT EXISTS hourly_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        hour TIMESTAMPTZ NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL,
-        target_volume NUMERIC(40, 12) NOT NULL,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL,
-        low NUMERIC(40, 12) NOT NULL,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, hour)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_hourly_volumes_token ON hourly_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_hourly_volumes_hour ON hourly_volumes(hour);
-      CREATE INDEX IF NOT EXISTS idx_hourly_volumes_token_hour ON hourly_volumes(token, hour);
-      CREATE INDEX IF NOT EXISTS idx_hourly_volumes_recent ON hourly_volumes(hour DESC);
-
-      -- 10-minute volumes table for accurate rolling 24h calculations
-      -- Extended with buy/sell volumes and fees (single source of truth)
-      CREATE TABLE IF NOT EXISTS ten_minute_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        bucket TIMESTAMPTZ NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL,
-        target_volume NUMERIC(40, 12) NOT NULL,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL,
-        low NUMERIC(40, 12) NOT NULL,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, bucket)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_ten_minute_volumes_token ON ten_minute_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_ten_minute_volumes_bucket ON ten_minute_volumes(bucket);
-      CREATE INDEX IF NOT EXISTS idx_ten_minute_volumes_token_bucket ON ten_minute_volumes(token, bucket);
-      CREATE INDEX IF NOT EXISTS idx_ten_minute_volumes_recent ON ten_minute_volumes(bucket DESC);
-
-      -- Metadata table to track sync status
-      CREATE TABLE IF NOT EXISTS sync_metadata (
-        key VARCHAR(64) PRIMARY KEY,
-        value TEXT NOT NULL,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
-      );
-
-      -- Daily buy/sell volumes table for tracking directional volume
-      CREATE TABLE IF NOT EXISTS daily_buy_sell_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        buy_usdc_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_token_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_daily_buy_sell_volumes_token ON daily_buy_sell_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_daily_buy_sell_volumes_date ON daily_buy_sell_volumes(date);
-      CREATE INDEX IF NOT EXISTS idx_daily_buy_sell_volumes_token_date ON daily_buy_sell_volumes(token, date);
-
-      -- Daily fees volumes table for tracking fees and comprehensive volume metrics
-      CREATE TABLE IF NOT EXISTS daily_fees_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        trading_date DATE NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_token_in_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        cumulative_token_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, trading_date)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_daily_fees_volumes_token ON daily_fees_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_daily_fees_volumes_date ON daily_fees_volumes(trading_date);
-      CREATE INDEX IF NOT EXISTS idx_daily_fees_volumes_token_date ON daily_fees_volumes(token, trading_date);
-
-      -- Daily Meteora volumes table for tracking Meteora pool fees and volumes per owner
-      CREATE TABLE IF NOT EXISTS daily_meteora_volumes (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_per_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        ownership_share NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        earned_fee_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_daily_meteora_volumes_token ON daily_meteora_volumes(token);
-      CREATE INDEX IF NOT EXISTS idx_daily_meteora_volumes_date ON daily_meteora_volumes(date);
-      CREATE INDEX IF NOT EXISTS idx_daily_meteora_volumes_token_date ON daily_meteora_volumes(token, date);
-
-      -- Metrics history table for storing periodic snapshots of system metrics
-      CREATE TABLE IF NOT EXISTS metrics_history (
-        id SERIAL PRIMARY KEY,
-        timestamp TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        metric_name VARCHAR(128) NOT NULL,
-        metric_value NUMERIC(40, 12) NOT NULL,
-        labels JSONB DEFAULT '{}',
-        UNIQUE(timestamp, metric_name, labels)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_metrics_history_timestamp ON metrics_history(timestamp DESC);
-      CREATE INDEX IF NOT EXISTS idx_metrics_history_name ON metrics_history(metric_name);
-      CREATE INDEX IF NOT EXISTS idx_metrics_history_name_time ON metrics_history(metric_name, timestamp DESC);
-
-      -- Service health snapshots for historical analysis
-      CREATE TABLE IF NOT EXISTS service_health_snapshots (
-        id SERIAL PRIMARY KEY,
-        timestamp TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        service_name VARCHAR(64) NOT NULL,
-        is_healthy BOOLEAN NOT NULL,
-        last_refresh_time TIMESTAMPTZ,
-        record_count INT,
-        error_message TEXT,
-        metadata JSONB DEFAULT '{}'
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_service_health_timestamp ON service_health_snapshots(timestamp DESC);
-      CREATE INDEX IF NOT EXISTS idx_service_health_service ON service_health_snapshots(service_name);
-      CREATE INDEX IF NOT EXISTS idx_service_health_service_time ON service_health_snapshots(service_name, timestamp DESC);
-    `;
-
-      await pool.query(createTableSQL);
-      logger.info('[Database] Tables created/verified');
-
-      // Create v0.6 OHLCV + fee volume tables
-      await manager.createV06Tables();
-
-      // Run migration to add new columns to existing tables
-      await manager.migrateTables();
-    },
-
-    async createV06Tables(): Promise<void> {
-      const pool = db.getPool();
-      if (!pool) return;
-
-      const sql = `
-      -- Spot OHLCV 1-minute
-      CREATE TABLE IF NOT EXISTS v06_spot_ohlcv_1m (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        bucket TIMESTAMPTZ NOT NULL,
-        open NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        close NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, bucket)
-      );
-      CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1m_token_bucket ON v06_spot_ohlcv_1m(token, bucket DESC);
-      CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1m_bucket ON v06_spot_ohlcv_1m(bucket DESC);
-
-      -- Spot OHLCV daily
-      CREATE TABLE IF NOT EXISTS v06_spot_ohlcv_1d (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        bucket TIMESTAMPTZ NOT NULL,
-        open NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        high NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        low NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        close NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        is_complete BOOLEAN NOT NULL DEFAULT false,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, bucket)
-      );
-      CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1d_token_bucket ON v06_spot_ohlcv_1d(token, bucket DESC);
-      CREATE INDEX IF NOT EXISTS idx_v06_spot_ohlcv_1d_bucket ON v06_spot_ohlcv_1d(bucket DESC);
-
-      -- Fee breakdown: spot daily
-      CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_spot (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        trade_count INT NOT NULL DEFAULT 0,
-        usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_spot_token_date ON v06_fee_volume_daily_spot(token, date DESC);
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_spot_date ON v06_fee_volume_daily_spot(date DESC);
-
-      -- Fee breakdown: conditional daily (nullable until reconciled)
-      CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_conditional (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        buy_volume NUMERIC(40, 12),
-        sell_volume NUMERIC(40, 12),
-        base_volume NUMERIC(40, 12),
-        target_volume NUMERIC(40, 12),
-        trade_count INT,
-        usdc_fees NUMERIC(40, 12),
-        token_fees NUMERIC(40, 12),
-        token_fees_usdc NUMERIC(40, 12),
-        sell_volume_usdc NUMERIC(40, 12),
-        conditional_reconciled BOOLEAN NOT NULL DEFAULT false,
-        pending_open_proposals INT NOT NULL DEFAULT 0,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_cond_token_date ON v06_fee_volume_daily_conditional(token, date DESC);
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_cond_date ON v06_fee_volume_daily_conditional(date DESC);
-
-      -- Fee aggregate (accountant primary)
-      CREATE TABLE IF NOT EXISTS v06_fee_volume_daily_aggregate (
-        id SERIAL PRIMARY KEY,
-        token VARCHAR(64) NOT NULL,
-        date DATE NOT NULL,
-        spot_buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_trade_count INT NOT NULL DEFAULT 0,
-        spot_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        spot_token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        conditional_buy_volume NUMERIC(40, 12),
-        conditional_sell_volume NUMERIC(40, 12),
-        conditional_base_volume NUMERIC(40, 12),
-        conditional_target_volume NUMERIC(40, 12),
-        conditional_trade_count INT,
-        conditional_usdc_fees NUMERIC(40, 12),
-        conditional_token_fees NUMERIC(40, 12),
-        conditional_token_fees_usdc NUMERIC(40, 12),
-        total_buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_base_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_trade_count INT NOT NULL DEFAULT 0,
-        total_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        total_token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-        conditional_reconciled BOOLEAN NOT NULL DEFAULT false,
-        pending_open_proposals INT NOT NULL DEFAULT 0,
-        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
-        UNIQUE(token, date)
-      );
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_agg_token_date ON v06_fee_volume_daily_aggregate(token, date DESC);
-      CREATE INDEX IF NOT EXISTS idx_v06_fee_agg_date ON v06_fee_volume_daily_aggregate(date DESC);
-    `;
-
-      await pool.query(sql);
-      logger.info('[Database] v0.6 tables created/verified');
-    },
-
-    async migrateTables(): Promise<void> {
-      const pool = db.getPool();
-      if (!pool) return;
-
-      try {
-        const migrationSQL = `
-        -- Add extended columns to ten_minute_volumes
-        DO $$ 
-        BEGIN
-          IF NOT EXISTS (SELECT 1 FROM information_schema.columns 
-                         WHERE table_name = 'ten_minute_volumes' AND column_name = 'buy_volume') THEN
-            ALTER TABLE ten_minute_volumes 
-            ADD COLUMN buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0;
-            RAISE NOTICE 'Added extended columns to ten_minute_volumes';
-          END IF;
-        END $$;
-
-        -- Add extended columns to hourly_volumes
-        DO $$ 
-        BEGIN
-          IF NOT EXISTS (SELECT 1 FROM information_schema.columns 
-                         WHERE table_name = 'hourly_volumes' AND column_name = 'buy_volume') THEN
-            ALTER TABLE hourly_volumes 
-            ADD COLUMN buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0;
-            RAISE NOTICE 'Added extended columns to hourly_volumes';
-          END IF;
-        END $$;
-
-        -- Add extended columns to daily_volumes
-        DO $$ 
-        BEGIN
-          IF NOT EXISTS (SELECT 1 FROM information_schema.columns 
-                         WHERE table_name = 'daily_volumes' AND column_name = 'buy_volume') THEN
-            ALTER TABLE daily_volumes 
-            ADD COLUMN buy_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN average_price NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN trade_count INT NOT NULL DEFAULT 0,
-            ADD COLUMN usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN token_fees_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN sell_volume_usdc NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN cumulative_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN cumulative_token_in_usdc_fees NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN cumulative_target_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN cumulative_token_volume NUMERIC(40, 12) NOT NULL DEFAULT 0,
-            ADD COLUMN is_complete BOOLEAN NOT NULL DEFAULT false;
-            RAISE NOTICE 'Added extended columns to daily_volumes';
-          END IF;
-        END $$;
-      `;
-
-        await pool.query(migrationSQL);
-        logger.info('[Database] Migration completed - extended columns added if needed');
-      } catch (error: any) {
-        // Migration errors are non-fatal - tables might already have columns
-        logger.info('[Database] Migration check completed (columns may already exist)');
-      }
-    },
-
-    async createAggregationFunctions(): Promise<void> {
-      const pool = db.getPool();
-      if (!pool) return;
-
-      try {
-        const functionsSQL = `
-        -- Function to aggregate 10-minute buckets into hourly records
-        CREATE OR REPLACE FUNCTION aggregate_10min_to_hourly(
-          p_token VARCHAR DEFAULT NULL,
-          p_hour TIMESTAMPTZ DEFAULT NULL
-        )
-        RETURNS TABLE (
-          token VARCHAR,
-          hour TIMESTAMPTZ,
-          base_volume NUMERIC,
-          target_volume NUMERIC,
-          buy_volume NUMERIC,
-          sell_volume NUMERIC,
-          high NUMERIC,
-          low NUMERIC,
-          average_price NUMERIC,
-          trade_count INT,
-          usdc_fees NUMERIC,
-          token_fees NUMERIC,
-          token_fees_usdc NUMERIC,
-          sell_volume_usdc NUMERIC
-        ) AS $$
-        BEGIN
-          RETURN QUERY
-          SELECT
-            tmv.token,
-            date_trunc('hour', tmv.bucket) AS hour,
-            SUM(tmv.base_volume)::NUMERIC AS base_volume,
-            SUM(tmv.target_volume)::NUMERIC AS target_volume,
-            SUM(tmv.buy_volume)::NUMERIC AS buy_volume,
-            SUM(tmv.sell_volume)::NUMERIC AS sell_volume,
-            MAX(tmv.high)::NUMERIC AS high,
-            MIN(CASE WHEN tmv.low > 0 THEN tmv.low END)::NUMERIC AS low,
-            -- Weighted average price by volume
-            CASE 
-              WHEN SUM(tmv.base_volume) > 0 
-              THEN SUM(tmv.average_price * tmv.base_volume) / SUM(tmv.base_volume)
-              ELSE AVG(tmv.average_price)
-            END::NUMERIC AS average_price,
-            SUM(tmv.trade_count)::INT AS trade_count,
-            SUM(tmv.usdc_fees)::NUMERIC AS usdc_fees,
-            SUM(tmv.token_fees)::NUMERIC AS token_fees,
-            SUM(tmv.token_fees_usdc)::NUMERIC AS token_fees_usdc,
-            SUM(tmv.sell_volume_usdc)::NUMERIC AS sell_volume_usdc
-          FROM ten_minute_volumes tmv
-          WHERE 
-            (p_token IS NULL OR tmv.token = p_token)
-            AND (p_hour IS NULL OR date_trunc('hour', tmv.bucket) = p_hour)
-          GROUP BY tmv.token, date_trunc('hour', tmv.bucket)
-          ORDER BY tmv.token, hour;
-        END;
-        $$ LANGUAGE plpgsql;
-
-        -- Function to aggregate hourly records into daily records with cumulative values
-        CREATE OR REPLACE FUNCTION aggregate_hourly_to_daily(
-          p_token VARCHAR DEFAULT NULL,
-          p_date DATE DEFAULT NULL
-        )
-        RETURNS TABLE (
-          token VARCHAR,
-          date DATE,
-          base_volume NUMERIC,
-          target_volume NUMERIC,
-          buy_volume NUMERIC,
-          sell_volume NUMERIC,
-          high NUMERIC,
-          low NUMERIC,
-          average_price NUMERIC,
-          trade_count INT,
-          usdc_fees NUMERIC,
-          token_fees NUMERIC,
-          token_fees_usdc NUMERIC,
-          sell_volume_usdc NUMERIC,
-          cumulative_usdc_fees NUMERIC,
-          cumulative_token_in_usdc_fees NUMERIC,
-          cumulative_target_volume NUMERIC,
-          cumulative_token_volume NUMERIC
-        ) AS $$
-        BEGIN
-          RETURN QUERY
-          WITH daily_agg AS (
-            SELECT
-              hv.token,
-              date_trunc('day', hv.hour)::DATE AS date,
-              SUM(hv.base_volume)::NUMERIC AS base_volume,
-              SUM(hv.target_volume)::NUMERIC AS target_volume,
-              SUM(hv.buy_volume)::NUMERIC AS buy_volume,
-              SUM(hv.sell_volume)::NUMERIC AS sell_volume,
-              MAX(hv.high)::NUMERIC AS high,
-              MIN(CASE WHEN hv.low > 0 THEN hv.low END)::NUMERIC AS low,
-              -- Weighted average price by volume
-              CASE 
-                WHEN SUM(hv.base_volume) > 0 
-                THEN SUM(hv.average_price * hv.base_volume) / SUM(hv.base_volume)
-                ELSE AVG(hv.average_price)
-              END::NUMERIC AS average_price,
-              SUM(hv.trade_count)::INT AS trade_count,
-              SUM(hv.usdc_fees)::NUMERIC AS usdc_fees,
-              SUM(hv.token_fees)::NUMERIC AS token_fees,
-              SUM(hv.token_fees_usdc)::NUMERIC AS token_fees_usdc,
-              SUM(hv.sell_volume_usdc)::NUMERIC AS sell_volume_usdc
-            FROM hourly_volumes hv
-            WHERE 
-              (p_token IS NULL OR hv.token = p_token)
-              AND (p_date IS NULL OR date_trunc('day', hv.hour)::DATE = p_date)
-            GROUP BY hv.token, date_trunc('day', hv.hour)::DATE
-          )
-          SELECT
-            da.token,
-            da.date,
-            da.base_volume,
-            da.target_volume,
-            da.buy_volume,
-            da.sell_volume,
-            da.high,
-            da.low,
-            da.average_price,
-            da.trade_count,
-            da.usdc_fees,
-            da.token_fees,
-            da.token_fees_usdc,
-            da.sell_volume_usdc,
-            SUM(da.usdc_fees) OVER (
-              PARTITION BY da.token
-              ORDER BY da.date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::NUMERIC AS cumulative_usdc_fees,
-            SUM(da.token_fees_usdc) OVER (
-              PARTITION BY da.token
-              ORDER BY da.date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::NUMERIC AS cumulative_token_in_usdc_fees,
-            SUM(da.target_volume) OVER (
-              PARTITION BY da.token
-              ORDER BY da.date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::NUMERIC AS cumulative_target_volume,
-            SUM(da.base_volume) OVER (
-              PARTITION BY da.token
-              ORDER BY da.date
-              ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
-            )::NUMERIC AS cumulative_token_volume
-          FROM daily_agg da
-          ORDER BY da.token, da.date;
-        END;
-        $$ LANGUAGE plpgsql;
-
-        -- Function to calculate rolling 24h metrics from 10-minute data
-        CREATE OR REPLACE FUNCTION calculate_rolling_24h(
-          p_token VARCHAR DEFAULT NULL
-        )
-        RETURNS TABLE (
-          token VARCHAR,
-          base_volume_24h NUMERIC,
-          target_volume_24h NUMERIC,
-          buy_volume_24h NUMERIC,
-          sell_volume_24h NUMERIC,
-          high_24h NUMERIC,
-          low_24h NUMERIC,
-          average_price_24h NUMERIC,
-          trade_count_24h INT,
-          usdc_fees_24h NUMERIC,
-          token_fees_24h NUMERIC,
-          token_fees_usdc_24h NUMERIC,
-          sell_volume_usdc_24h NUMERIC
-        ) AS $$
-        BEGIN
-          RETURN QUERY
-          SELECT
-            tmv.token,
-            SUM(tmv.base_volume)::NUMERIC AS base_volume_24h,
-            SUM(tmv.target_volume)::NUMERIC AS target_volume_24h,
-            SUM(tmv.buy_volume)::NUMERIC AS buy_volume_24h,
-            SUM(tmv.sell_volume)::NUMERIC AS sell_volume_24h,
-            MAX(tmv.high)::NUMERIC AS high_24h,
-            MIN(CASE WHEN tmv.low > 0 THEN tmv.low END)::NUMERIC AS low_24h,
-            -- Weighted average price by volume
-            CASE 
-              WHEN SUM(tmv.base_volume) > 0 
-              THEN SUM(tmv.average_price * tmv.base_volume) / SUM(tmv.base_volume)
-              ELSE AVG(tmv.average_price)
-            END::NUMERIC AS average_price_24h,
-            SUM(tmv.trade_count)::INT AS trade_count_24h,
-            SUM(tmv.usdc_fees)::NUMERIC AS usdc_fees_24h,
-            SUM(tmv.token_fees)::NUMERIC AS token_fees_24h,
-            SUM(tmv.token_fees_usdc)::NUMERIC AS token_fees_usdc_24h,
-            SUM(tmv.sell_volume_usdc)::NUMERIC AS sell_volume_usdc_24h
-          FROM ten_minute_volumes tmv
-          WHERE 
-            tmv.bucket >= (CURRENT_TIMESTAMP - INTERVAL '24 hours')
-            AND (p_token IS NULL OR tmv.token = p_token)
-          GROUP BY tmv.token
-          ORDER BY tmv.token;
-        END;
-        $$ LANGUAGE plpgsql;
-      `;
-
-        await pool.query(functionsSQL);
-        logger.info('[Database] Aggregation functions created/updated');
-      } catch (error: any) {
-        logger.error('[Database] Error creating aggregation functions:', error);
-        throw error;
-      }
-    },
-  };
-
-  return manager;
-}
-
-export type SchemaManager = ReturnType<typeof createSchemaManager>;
diff --git a/src/services/databaseService.ts b/src/services/databaseService.ts
deleted file mode 100644
index 69661dd..0000000
--- a/src/services/databaseService.ts
+++ /dev/null
@@ -1,715 +0,0 @@
-import pg from 'pg';
-import { config } from '../config.js';
-import { logger } from '../utils/logger.js';
-import { sendAlert } from '../utils/alerts.js';
-import type { DbRuntime } from './database/internal/dbRuntime.js';
-import { createSchemaManager } from './database/internal/schemaManager.js';
-import { createDailyVolumesRepo } from './database/internal/repos/dailyVolumesRepo.js';
-import { createIntervalVolumesRepo } from './database/internal/repos/intervalVolumesRepo.js';
-import { createDailyBuySellVolumesRepo } from './database/internal/repos/dailyBuySellVolumesRepo.js';
-import { createDailyFeesVolumesRepo } from './database/internal/repos/dailyFeesVolumesRepo.js';
-import { createDailyMeteoraVolumesRepo } from './database/internal/repos/dailyMeteoraVolumesRepo.js';
-import { createMetricsRepo } from './database/internal/repos/metricsRepo.js';
-import { createV06TradingActivityRepo } from './database/internal/repos/v06TradingActivityRepo.js';
-
-// Force pg to serialize Date parameters as ISO-8601 UTC strings so PostgreSQL
-// doesn't receive un-parseable local-timezone names like "GMT-0700".
-pg.defaults.parseInputDatesAsUTC = true;
-
-const { Pool } = pg;
-
-export interface DailyVolumeRecord {
-  token: string;
-  date: string; // YYYY-MM-DD
-  base_volume: string;
-  target_volume: string;
-  buy_volume?: string;
-  sell_volume?: string;
-  high: string;
-  low: string;
-  average_price?: string;
-  trade_count?: number;
-  usdc_fees?: string;
-  token_fees?: string;
-  token_fees_usdc?: string;
-  sell_volume_usdc?: string;
-  cumulative_usdc_fees?: string;
-  cumulative_token_in_usdc_fees?: string;
-  cumulative_target_volume?: string;
-  cumulative_token_volume?: string;
-}
-
-export interface HourlyVolumeRecord {
-  token: string;
-  hour: string; // ISO timestamp (YYYY-MM-DD HH:00:00)
-  base_volume: string;
-  target_volume: string;
-  buy_volume?: string;
-  sell_volume?: string;
-  high: string;
-  low: string;
-  average_price?: string;
-  trade_count: number;
-  usdc_fees?: string;
-  token_fees?: string;
-  token_fees_usdc?: string;
-  sell_volume_usdc?: string;
-}
-
-export interface TenMinuteVolumeRecord {
-  token: string;
-  bucket: string; // ISO timestamp (YYYY-MM-DD HH:M0:00 where M is 0,1,2,3,4,5)
-  base_volume: string;
-  target_volume: string;
-  buy_volume?: string;
-  sell_volume?: string;
-  high: string;
-  low: string;
-  average_price?: string;
-  trade_count: number;
-  usdc_fees?: string;
-  token_fees?: string;
-  token_fees_usdc?: string;
-  sell_volume_usdc?: string;
-}
-
-export interface DailyBuySellVolumeRecord {
-  token: string;
-  date: string; // YYYY-MM-DD
-  base_volume: string;
-  target_volume: string;
-  buy_usdc_volume: string;
-  sell_token_volume: string;
-  high: string;
-  low: string;
-  trade_count: number;
-  average_price: string;
-  usdc_fees: string;
-  token_fees: string;
-  token_fees_usdc: string;
-  sell_volume_usdc: string;
-  sell_volume: string;
-  buy_volume: string;
-}
-
-export interface DailyFeesVolumeRecord {
-  token: string;
-  trading_date: string; // YYYY-MM-DD
-  base_volume: string;
-  target_volume: string;
-  usdc_fees: string;
-  token_fees_usdc: string;
-  token_fees: string;
-  buy_volume: string;
-  sell_volume: string;
-  sell_volume_usdc: string;
-  cumulative_usdc_fees: string;
-  cumulative_token_in_usdc_fees: string;
-  cumulative_target_volume: string;
-  cumulative_token_volume: string;
-  high: string;
-  average_price: string;
-  low: string;
-}
-
-export interface DailyMeteoraVolumeRecord {
-  token: string;  // mapped from owner
-  date: string;    // YYYY-MM-DD
-  base_volume: string;  // volume_usd_approx
-  target_volume: string;  // calculated from buy_volume + sell_volume
-  trade_count: number;  // num_swaps
-  buy_volume: string;
-  sell_volume: string;
-  usdc_fees: string;  // lp_fee_usdc
-  token_fees: string;  // lp_fee_token
-  token_fees_usdc: string;  // lp_fee_token_usdc
-  token_per_usdc: string;  // token_per_usdc_raw
-  average_price: string;  // token_price_usdc
-  ownership_share: string;  // ownership_share
-  earned_fee_usdc: string;  // earned_fee_usdc
-  is_complete: boolean;
-}
-
-export interface CumulativeVolumeData {
-  token: string;
-  date: string;
-  base_volume: string;
-  target_volume: string;
-  buy_usdc_volume: string;
-  sell_token_volume: string;
-  cumulative_target_volume: string;
-  cumulative_base_volume: string;
-  cumulative_buy_usdc_volume: string;
-  cumulative_sell_token_volume: string;
-  high: string;
-  low: string;
-}
-
-export interface Rolling24hMetrics {
-  token: string;
-  base_volume_24h: string;
-  target_volume_24h: string;
-  high_24h: string;
-  low_24h: string;
-  trade_count_24h: number;
-}
-
-export interface TokenVolumeAggregate {
-  token: string;
-  first_trade_date: string;
-  last_trade_date: string;
-  total_base_volume: string;
-  total_target_volume: string;
-  all_time_high: string;
-  all_time_low: string;
-  trading_days: number;
-  daily_data: DailyVolumeRecord[];
-}
-
-export class DatabaseService {
-  public pool: pg.Pool | null = null;
-  private isConnected: boolean = false;
-  private healthCheckInterval: NodeJS.Timeout | null = null;
-  private consecutiveFailures: number = 0;
-  private static readonly HEALTH_CHECK_INTERVAL_MS = 30_000;
-  private static readonly MAX_FAILURES_BEFORE_RECONNECT = 3;
-
-  private dbRuntime: DbRuntime = {
-    getPool: () => this.pool,
-    isConnected: () => this.isConnected,
-  };
-
-  private _schema = createSchemaManager(this.dbRuntime);
-  private _dailyVolumes = createDailyVolumesRepo(this.dbRuntime);
-  private _intervalVolumes = createIntervalVolumesRepo(this.dbRuntime);
-  private _dailyBuySellVolumes = createDailyBuySellVolumesRepo(this.dbRuntime);
-  private _dailyFeesVolumes = createDailyFeesVolumesRepo(this.dbRuntime);
-  private _dailyMeteoraVolumes = createDailyMeteoraVolumesRepo(this.dbRuntime);
-  private _metrics = createMetricsRepo(this.dbRuntime);
-  private _v06TradingActivity = createV06TradingActivityRepo(this.dbRuntime);
-
-  constructor() {
-    // Only initialize if database config is provided
-    if (config.database.connectionString || config.database.host) {
-      this.createPool();
-    }
-  }
-
-  private getPoolConfig(): pg.PoolConfig {
-    return {
-      connectionString: config.database.connectionString,
-      host: config.database.host,
-      port: config.database.port,
-      database: config.database.database,
-      user: config.database.user,
-      password: config.database.password,
-      ssl: config.database.ssl ? { rejectUnauthorized: false } : false,
-      max: 10,
-      idleTimeoutMillis: 30000,
-      connectionTimeoutMillis: 10000,
-    };
-  }
-
-  private createPool(): void {
-    this.pool = new Pool(this.getPoolConfig());
-
-    this.pool.on('error', (err: Error) => {
-      logger.error('[Database] Pool error — marking connection unhealthy', err);
-      this.isConnected = false;
-      sendAlert(
-        `DB Pool Error: ${err.message}`,
-        { cooldownKey: 'db-pool-error', cooldownMs: 5 * 60 * 1000 }
-      );
-    });
-  }
-
-  /**
-   * Initialize the database connection and create tables if needed
-   */
-  async initialize(): Promise<boolean> {
-    if (!this.pool) {
-      logger.info('[Database] No database configuration provided, volume history will use in-memory cache only');
-      return false;
-    }
-
-    try {
-      // Test connection
-      const client = await this.pool.connect();
-      logger.info('[Database] Connected to PostgreSQL');
-      client.release();
-
-      // Create tables
-      await this._schema.createTables();
-      
-      // Create aggregation functions
-      await this._schema.createAggregationFunctions();
-      
-      this.isConnected = true;
-      this.consecutiveFailures = 0;
-      this.startHealthCheck();
-      return true;
-    } catch (error: any) {
-      logger.error('[Database] Failed to connect:', error);
-      this.isConnected = false;
-      return false;
-    }
-  }
-
-  /**
-   * Periodic health check that pings the DB and manages connection state.
-   * If consecutive failures exceed threshold, destroys and recreates the pool.
-   */
-  private startHealthCheck(): void {
-    if (this.healthCheckInterval) return;
-
-    this.healthCheckInterval = setInterval(async () => {
-      try {
-        await this.pool!.query('SELECT 1');
-        if (!this.isConnected) {
-          logger.info('[Database] Connection recovered');
-        }
-        this.isConnected = true;
-        this.consecutiveFailures = 0;
-      } catch (error: any) {
-        this.consecutiveFailures++;
-        this.isConnected = false;
-        logger.error(`[Database] Health check failed (${this.consecutiveFailures}/${DatabaseService.MAX_FAILURES_BEFORE_RECONNECT})`, error);
-
-        sendAlert(
-          `DB Health Check Failed (${this.consecutiveFailures}/${DatabaseService.MAX_FAILURES_BEFORE_RECONNECT}): ${error.message || error}`,
-          { cooldownKey: 'db-health-check', cooldownMs: 5 * 60 * 1000 }
-        );
-
-        if (this.consecutiveFailures >= DatabaseService.MAX_FAILURES_BEFORE_RECONNECT) {
-          logger.error('[Database] Max consecutive failures reached — recreating connection pool');
-          await this.reconnect();
-        }
-      }
-    }, DatabaseService.HEALTH_CHECK_INTERVAL_MS);
-  }
-
-  /**
-   * Destroy the current pool and create a fresh one.
-   */
-  private async reconnect(): Promise<void> {
-    try {
-      if (this.pool) {
-        await this.pool.end().catch(() => {}); // best-effort cleanup
-      }
-    } catch {
-      // ignore — pool may already be dead
-    }
-
-    this.createPool();
-
-    try {
-      await this.pool!.query('SELECT 1');
-      this.isConnected = true;
-      this.consecutiveFailures = 0;
-      logger.info('[Database] Reconnected successfully after pool recreation');
-      sendAlert('DB Reconnected — pool recreated, connection healthy', { cooldownKey: 'db-reconnected' });
-    } catch (error: any) {
-      logger.error('[Database] Reconnection attempt failed — will retry on next health check', error);
-      sendAlert(
-        `DB Reconnection Failed — pool recreated but still can't connect: ${error.message || error}`,
-        { cooldownKey: 'db-reconnect-failed', cooldownMs: 5 * 60 * 1000 }
-      );
-    }
-  }
-
-  /**
-   * Check if database is available
-   */
-  isAvailable(): boolean {
-    return this.isConnected && this.pool !== null;
-  }
-
-  /**
-   * Close database connection
-   */
-  async close(): Promise<void> {
-    if (this.healthCheckInterval) {
-      clearInterval(this.healthCheckInterval);
-      this.healthCheckInterval = null;
-    }
-    if (this.pool) {
-      this.isConnected = false;
-      await this.pool.end();
-      this.pool = null;
-      logger.info('[Database] Connection closed');
-    }
-  }
-
-  // ============================================
-  // Schema management (delegated to SchemaManager)
-  // ============================================
-
-  async createAggregationFunctions(): Promise<void> {
-    return this._schema.createAggregationFunctions();
-  }
-
-  // ============================================
-  // Daily volumes (delegated to DailyVolumesRepo)
-  // ============================================
-
-  async getLatestDate(): Promise<string | null> {
-    return this._dailyVolumes.getLatestDate();
-  }
-
-  async getLatestDateForToken(token: string): Promise<string | null> {
-    return this._dailyVolumes.getLatestDateForToken(token);
-  }
-
-  async upsertDailyVolumes(records: DailyVolumeRecord[]): Promise<number> {
-    return this._dailyVolumes.upsertDailyVolumes(records);
-  }
-
-  async getDailyVolumesForToken(token: string): Promise<DailyVolumeRecord[]> {
-    return this._dailyVolumes.getDailyVolumesForToken(token);
-  }
-
-  async getDailyVolumesForTokens(tokens: string[]): Promise<Map<string, DailyVolumeRecord[]>> {
-    return this._dailyVolumes.getDailyVolumesForTokens(tokens);
-  }
-
-  async getAggregatedVolumes(tokens?: string[]): Promise<TokenVolumeAggregate[]> {
-    return this._dailyVolumes.getAggregatedVolumes(tokens);
-  }
-
-  async get24hVolumes(tokens?: string[]): Promise<Map<string, { base_volume: string; target_volume: string; high: string; low: string }>> {
-    return this._dailyVolumes.get24hVolumes(tokens);
-  }
-
-  async getRecordCount(): Promise<number> {
-    return this._dailyVolumes.getDailyRecordCount();
-  }
-
-  async getDailyRecordCount(): Promise<number> {
-    return this._dailyVolumes.getDailyRecordCount();
-  }
-
-  async getTokenCount(): Promise<number> {
-    return this._dailyVolumes.getTokenCount();
-  }
-
-  async getV06Rolling24hMetrics(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-    return this._dailyVolumes.getV06Rolling24hMetrics(tokens);
-  }
-
-  // ============================================
-  // Interval volumes (delegated to IntervalVolumesRepo)
-  // ============================================
-
-  async setSyncMetadata(key: string, value: string): Promise<void> {
-    return this._intervalVolumes.setSyncMetadata(key, value);
-  }
-
-  async getSyncMetadata(key: string): Promise<string | null> {
-    return this._intervalVolumes.getSyncMetadata(key);
-  }
-
-  async getLatestHour(): Promise<string | null> {
-    return this._intervalVolumes.getLatestHour();
-  }
-
-  async getLatestCompleteHour(): Promise<string | null> {
-    return this._intervalVolumes.getLatestCompleteHour();
-  }
-
-  async upsertHourlyVolumes(records: HourlyVolumeRecord[], markComplete: boolean = false): Promise<number> {
-    return this._intervalVolumes.upsertHourlyVolumes(records, markComplete);
-  }
-
-  async markHoursComplete(beforeHour: string): Promise<void> {
-    return this._intervalVolumes.markHoursComplete(beforeHour);
-  }
-
-  async getRolling24hMetrics(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-    return this._intervalVolumes.getRolling24hMetrics(tokens);
-  }
-
-  async getHourlyVolumes(startHour: string, endHour?: string, tokens?: string[]): Promise<HourlyVolumeRecord[]> {
-    return this._intervalVolumes.getHourlyVolumes(startHour, endHour, tokens);
-  }
-
-  async getHourlyRecordCount(): Promise<number> {
-    return this._intervalVolumes.getHourlyRecordCount();
-  }
-
-  async getHourlyTokenCount(): Promise<number> {
-    return this._intervalVolumes.getHourlyTokenCount();
-  }
-
-  async pruneOldHourlyData(keepHours: number = 48): Promise<number> {
-    return this._intervalVolumes.pruneOldHourlyData(keepHours);
-  }
-
-  async upsertTenMinuteVolumes(records: TenMinuteVolumeRecord[], markComplete: boolean = false): Promise<number> {
-    return this._intervalVolumes.upsertTenMinuteVolumes(records, markComplete);
-  }
-
-  async markTenMinuteBucketsComplete(beforeBucket: string): Promise<void> {
-    return this._intervalVolumes.markTenMinuteBucketsComplete(beforeBucket);
-  }
-
-  async backfillMissingFields(): Promise<{
-    tenMinuteUpdated: number;
-    hourlyUpdated: number;
-    dailyUpdated: number;
-  }> {
-    return this._intervalVolumes.backfillMissingFields();
-  }
-
-  async getRolling24hFromTenMinute(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-    return this._intervalVolumes.getRolling24hFromTenMinute(tokens);
-  }
-
-  async aggregate10MinToHourly(token?: string, hour?: string): Promise<number> {
-    return this._intervalVolumes.aggregate10MinToHourly(token, hour);
-  }
-
-  async aggregateHourlyToDaily(token?: string, date?: string): Promise<number> {
-    return this._intervalVolumes.aggregateHourlyToDaily(token, date);
-  }
-
-  async getLatestTenMinuteBucket(): Promise<string | null> {
-    return this._intervalVolumes.getLatestTenMinuteBucket();
-  }
-
-  async getTenMinuteRecordCount(): Promise<number> {
-    return this._intervalVolumes.getTenMinuteRecordCount();
-  }
-
-  async pruneOldTenMinuteData(keepHours: number = 25): Promise<number> {
-    return this._intervalVolumes.pruneOldTenMinuteData(keepHours);
-  }
-
-  // ============================================
-  // Daily buy/sell volumes (delegated to DailyBuySellVolumesRepo)
-  // ============================================
-
-  async getLatestBuySellDate(): Promise<string | null> {
-    return this._dailyBuySellVolumes.getLatestBuySellDate();
-  }
-
-  async upsertDailyBuySellVolumes(records: DailyBuySellVolumeRecord[], markComplete: boolean = false): Promise<number> {
-    return this._dailyBuySellVolumes.upsertDailyBuySellVolumes(records, markComplete);
-  }
-
-  async getDailyBuySellVolumesWithCumulative(token?: string): Promise<CumulativeVolumeData[]> {
-    return this._dailyBuySellVolumes.getDailyBuySellVolumesWithCumulative(token);
-  }
-
-  async getDailyBuySellVolumes(options?: {
-    token?: string;
-    tokens?: string[];
-    startDate?: string;
-    endDate?: string;
-  }): Promise<{
-    token: string;
-    date: string;
-    base_volume: string;
-    target_volume: string;
-    buy_usdc_volume: string;
-    sell_token_volume: string;
-    high: string;
-    low: string;
-    trade_count: number;
-    average_price: string;
-    usdc_fees: string;
-    token_fees: string;
-    token_fees_usdc: string;
-    sell_volume_usdc: string;
-    sell_volume: string;
-    buy_volume: string;
-  }[]> {
-    return this._dailyBuySellVolumes.getDailyBuySellVolumes(options);
-  }
-
-  async getBuySellAggregates(tokens?: string[]): Promise<Map<string, {
-    total_buy_usdc: string;
-    total_sell_token: string;
-    total_base_volume: string;
-    total_target_volume: string;
-    first_date: string;
-    last_date: string;
-    trading_days: number;
-  }>> {
-    return this._dailyBuySellVolumes.getBuySellAggregates(tokens);
-  }
-
-  async getFirstTradeDates(): Promise<Map<string, string>> {
-    return this._dailyBuySellVolumes.getFirstTradeDates();
-  }
-
-  async getBuySellRecordCount(): Promise<number> {
-    return this._dailyBuySellVolumes.getBuySellRecordCount();
-  }
-
-  async markBuySellDaysComplete(beforeDate: string): Promise<void> {
-    return this._dailyBuySellVolumes.markBuySellDaysComplete(beforeDate);
-  }
-
-  // ============================================
-  // Daily fees volumes (delegated to DailyFeesVolumesRepo)
-  // ============================================
-
-  async getLatestFeesDate(): Promise<string | null> {
-    return this._dailyFeesVolumes.getLatestFeesDate();
-  }
-
-  async upsertDailyFeesVolumes(records: DailyFeesVolumeRecord[], markComplete: boolean = false): Promise<number> {
-    return this._dailyFeesVolumes.upsertDailyFeesVolumes(records, markComplete);
-  }
-
-  async getDailyFeesVolumes(options?: {
-    token?: string;
-    startDate?: string;
-    endDate?: string;
-  }): Promise<DailyFeesVolumeRecord[]> {
-    return this._dailyFeesVolumes.getDailyFeesVolumes(options);
-  }
-
-  async markFeesDaysComplete(beforeDate: string): Promise<void> {
-    return this._dailyFeesVolumes.markFeesDaysComplete(beforeDate);
-  }
-
-  async getFeesRecordCount(): Promise<number> {
-    return this._dailyFeesVolumes.getFeesRecordCount();
-  }
-
-  // ============================================
-  // Daily Meteora volumes (delegated to DailyMeteoraVolumesRepo)
-  // ============================================
-
-  async getDailyMeteoraVolumes(options?: {
-    token?: string;
-    tokens?: string[];
-    startDate?: string;
-    endDate?: string;
-  }): Promise<{
-    token: string;
-    date: string;
-    base_volume: string;
-    target_volume: string;
-    buy_volume: string;
-    sell_volume: string;
-    trade_count: number;
-    average_price: string;
-    usdc_fees: string;
-    token_fees: string;
-    token_fees_usdc: string;
-    token_per_usdc: string;
-  }[]> {
-    return this._dailyMeteoraVolumes.getDailyMeteoraVolumes(options);
-  }
-
-  async getLatestMeteoraDate(): Promise<string | null> {
-    return this._dailyMeteoraVolumes.getLatestMeteoraDate();
-  }
-
-  async upsertDailyMeteoraVolumes(records: DailyMeteoraVolumeRecord[], markComplete: boolean = false): Promise<number> {
-    return this._dailyMeteoraVolumes.upsertDailyMeteoraVolumes(records, markComplete);
-  }
-
-  async markMeteoraDaysComplete(beforeDate: string): Promise<void> {
-    return this._dailyMeteoraVolumes.markMeteoraDaysComplete(beforeDate);
-  }
-
-  async getMeteoraRecordCount(): Promise<number> {
-    return this._dailyMeteoraVolumes.getMeteoraRecordCount();
-  }
-
-  // ============================================
-  // Metrics (delegated to MetricsRepo)
-  // ============================================
-
-  async insertMetric(metricName: string, value: number, labels: Record<string, string> = {}): Promise<void> {
-    return this._metrics.insertMetric(metricName, value, labels);
-  }
-
-  async insertMetricsBatch(metrics: Array<{ name: string; value: number; labels?: Record<string, string> }>): Promise<void> {
-    return this._metrics.insertMetricsBatch(metrics);
-  }
-
-  async insertServiceHealthSnapshot(
-    serviceName: string,
-    isHealthy: boolean,
-    lastRefreshTime?: Date,
-    recordCount?: number,
-    errorMessage?: string,
-    metadata?: Record<string, any>
-  ): Promise<void> {
-    return this._metrics.insertServiceHealthSnapshot(serviceName, isHealthy, lastRefreshTime, recordCount, errorMessage, metadata);
-  }
-
-  async getRecentMetrics(
-    metricName: string,
-    hours: number = 24,
-    labels?: Record<string, string>
-  ): Promise<Array<{ timestamp: string; value: number; labels: Record<string, string> }>> {
-    return this._metrics.getRecentMetrics(metricName, hours, labels);
-  }
-
-  async getServiceHealthHistory(
-    serviceName?: string,
-    hours: number = 24
-  ): Promise<Array<{
-    timestamp: string;
-    service_name: string;
-    is_healthy: boolean;
-    last_refresh_time: string | null;
-    record_count: number | null;
-    error_message: string | null;
-    metadata: Record<string, any>;
-  }>> {
-    return this._metrics.getServiceHealthHistory(serviceName, hours);
-  }
-
-  async pruneOldMetrics(keepDays: number = 30): Promise<{ metricsDeleted: number; healthDeleted: number }> {
-    return this._metrics.pruneOldMetrics(keepDays);
-  }
-
-  // ============================================
-  // V06 Trading Activity (delegated to V06TradingActivityRepo)
-  // ============================================
-
-  async getDailyTradingActivity(options?: {
-    token?: string;
-    tokens?: string[];
-    startDate?: string;
-    endDate?: string;
-  }): Promise<{
-    token: string;
-    date: string;
-    has_conditional_volume: boolean;
-    spot_buy_volume: string;
-    spot_sell_volume: string;
-    spot_base_volume: string;
-    spot_target_volume: string;
-    spot_trade_count: number;
-    spot_usdc_fees: string;
-    spot_token_fees: string;
-    spot_token_fees_usdc: string;
-    conditional_buy_volume: string | null;
-    conditional_sell_volume: string | null;
-    conditional_base_volume: string | null;
-    conditional_target_volume: string | null;
-    conditional_trade_count: number | null;
-    conditional_usdc_fees: string | null;
-    conditional_token_fees: string | null;
-    conditional_token_fees_usdc: string | null;
-    total_buy_volume: string;
-    total_sell_volume: string;
-    total_base_volume: string;
-    total_target_volume: string;
-    total_trade_count: number;
-    total_usdc_fees: string;
-    total_token_fees: string;
-    total_token_fees_usdc: string;
-    conditional_reconciled: boolean;
-    pending_open_proposals: number;
-  }[]> {
-    return this._v06TradingActivity.getDailyTradingActivity(options);
-  }
-}
diff --git a/src/services/duneCacheService.ts b/src/services/duneCacheService.ts
deleted file mode 100644
index 67372bf..0000000
--- a/src/services/duneCacheService.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { DuneService, DunePoolMetrics } from './duneService.js';
-import { FutarchyService } from './futarchyService.js';
-import { DatabaseService } from './databaseService.js';
-import { scheduleWithoutPileup, type ScheduledTask } from '../utils/scheduling.js';
-import { logger } from '../utils/logger.js';
-
-export interface CachedDuneData {
-  poolMetrics: Map<string, DunePoolMetrics>;
-  lastUpdated: Date;
-  isRefreshing: boolean;
-}
-
-export class DuneCacheService {
-  private duneService: DuneService;
-  private databaseService: DatabaseService;
-  private futarchyService: FutarchyService;
-  private cache: CachedDuneData;
-  private refreshTask: ScheduledTask | null = null;
-  private refreshIntervalMs: number;
-  private isInitialized: boolean = false;
-
-  constructor(duneService: DuneService, databaseService: DatabaseService, futarchyService: FutarchyService) {
-    this.duneService = duneService;
-    this.databaseService = databaseService;
-    this.futarchyService = futarchyService;
-    
-    // Default to 1 hour refresh interval, configurable via environment
-    this.refreshIntervalMs = parseInt(process.env.DUNE_CACHE_REFRESH_INTERVAL || '3600') * 1000;
-    
-    // Initialize empty cache
-    this.cache = {
-      poolMetrics: new Map(),
-      lastUpdated: new Date(0), // Epoch - indicates never updated
-      isRefreshing: false,
-    };
-  }
-
-  /**
-   * Start the cache refresh cron job
-   * Should be called when the server starts
-   */
-  async start(): Promise<void> {
-    logger.info(`[DuneCache] Starting cache service with ${this.refreshIntervalMs / 1000}s refresh interval`);
-    
-    this.isInitialized = true;
-    
-    this.refreshTask = scheduleWithoutPileup(
-      () => this.refreshCache(),
-      {
-        name: 'DuneCache',
-        intervalMs: this.refreshIntervalMs,
-        immediate: true,
-        onError: (error) => logger.error('[DuneCache] Refresh failed', error),
-      }
-    );
-    
-    logger.info(`[DuneCache] Cache service started with ${this.refreshIntervalMs / 1000}s interval`);
-  }
-
-  /**
-   * Stop the cache refresh cron job
-   */
-  stop(): void {
-    if (this.refreshTask) {
-      this.refreshTask.stop();
-      this.refreshTask = null;
-    }
-  }
-
-  /**
-   * Refresh the cache by fetching fresh data from Dune
-   */
-  async refreshCache(): Promise<void> {
-    if (this.cache.isRefreshing) {
-      logger.info('[DuneCache] Refresh already in progress, skipping');
-      return;
-    }
-
-    this.cache.isRefreshing = true;
-    logger.info('[DuneCache] Starting cache refresh...');
-    const startTime = Date.now();
-
-    try {
-      const allDaos = await this.futarchyService.getAllDaos();
-      const baseMintAddresses = allDaos.map(dao => dao.baseMint.toString());
-      
-      logger.info(`[DuneCache] Refreshing data for ${baseMintAddresses.length} tokens`);
-
-      try {
-        if (!this.databaseService.isAvailable()) {
-          logger.info('[DuneCache] Database not available, skipping 24h metrics refresh');
-        } else {
-          const rolling24hMetrics = await this.databaseService.getRolling24hFromTenMinute(baseMintAddresses);
-          
-          const tokenToDaoMap = new Map<string, string>();
-          for (const dao of allDaos) {
-            tokenToDaoMap.set(dao.baseMint.toString(), dao.daoAddress.toString());
-          }
-
-          const daoMetricsMap = new Map<string, DunePoolMetrics>();
-          for (const [tokenAddress, metrics] of rolling24hMetrics.entries()) {
-            const daoAddress = tokenToDaoMap.get(tokenAddress);
-            if (daoAddress) {
-              daoMetricsMap.set(daoAddress, {
-                pool_id: daoAddress,
-                base_volume_24h: metrics.base_volume_24h,
-                target_volume_24h: metrics.target_volume_24h,
-                high_24h: metrics.high_24h,
-                low_24h: metrics.low_24h,
-              });
-            }
-          }
-
-          this.cache.poolMetrics = daoMetricsMap;
-          logger.info(`[DuneCache] Refreshed pool metrics from DB aggregation for ${daoMetricsMap.size} DAOs`);
-        }
-      } catch (error: any) {
-        logger.error('[DuneCache] Error refreshing pool metrics', error);
-      }
-
-
-      this.cache.lastUpdated = new Date();
-      const duration = Date.now() - startTime;
-      logger.info(`[DuneCache] Cache refresh completed in ${duration}ms`);
-    } catch (error: any) {
-      logger.error('[DuneCache] Error during cache refresh', error);
-    } finally {
-      this.cache.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Force an immediate cache refresh
-   */
-  async forceRefresh(): Promise<void> {
-    logger.info('[DuneCache] Force refresh requested');
-    await this.refreshCache();
-  }
-
-  /**
-   * Get cached pool metrics
-   * Returns null if cache is empty and not yet initialized
-   */
-  getPoolMetrics(): Map<string, DunePoolMetrics> | null {
-    if (!this.isInitialized && this.cache.poolMetrics.size === 0) {
-      return null;
-    }
-    return this.cache.poolMetrics;
-  }
-
-  /**
-   * Get cache status information
-   */
-  getCacheStatus(): {
-    lastUpdated: Date;
-    isRefreshing: boolean;
-    poolMetricsCount: number;
-    cacheAgeMs: number;
-    isInitialized: boolean;
-  } {
-    return {
-      lastUpdated: this.cache.lastUpdated,
-      isRefreshing: this.cache.isRefreshing,
-      poolMetricsCount: this.cache.poolMetrics.size,
-      cacheAgeMs: Date.now() - this.cache.lastUpdated.getTime(),
-      isInitialized: this.isInitialized,
-    };
-  }
-
-  /**
-   * Check if cache has data
-   */
-  hasData(): boolean {
-    return this.cache.poolMetrics.size > 0;
-  }
-}
-
diff --git a/src/services/duneService.ts b/src/services/duneService.ts
deleted file mode 100644
index ab990fd..0000000
--- a/src/services/duneService.ts
+++ /dev/null
@@ -1,573 +0,0 @@
-import { config } from '../config.js';
-import { PublicKey } from '@solana/web3.js';
-import { withRetryAndTimeout, isTransientError, createRetryLogger } from '../utils/resilience.js';
-import { logger } from '../utils/logger.js';
-
-export interface DunePoolMetrics {
-  pool_id: string;
-  base_volume_24h: string;
-  target_volume_24h: string;
-  high_24h: string;
-  low_24h: string;
-}
-
-export interface DuneQueryResult {
-  rows: DunePoolMetrics[];
-  metadata: {
-    column_names: string[];
-    result_set_bytes: number;
-    total_row_count: number;
-    datapoint_count: number;
-    pending_time_millis: number;
-    execution_time_millis: number;
-  };
-}
-
-export interface DuneQuery {
-  query_id?: number;
-  name: string;
-  query_sql: string;
-  parameters?: Array<{
-    key: string;
-    type: string;
-    value?: any;
-  }>;
-}
-
-// Daily volume data for a single token on a specific date
-export interface DuneDailyVolume {
-  token: string;
-  date: string;
-  base_volume: string;
-  target_volume: string;
-  high: string;
-  low: string;
-}
-
-// Aggregate volume data for a single token (totals across all dates)
-export interface DuneAggregateTokenVolume {
-  token: string;
-  first_trade_date: string;
-  last_trade_date: string;
-  total_base_volume: string;
-  total_target_volume: string;
-  all_time_high: string;
-  all_time_low: string;
-  trading_days: number;
-  daily_data: DuneDailyVolume[];
-}
-
-// Complete aggregate volume response
-export interface DuneAggregateVolumeResponse {
-  tokens: DuneAggregateTokenVolume[];
-  query_metadata: {
-    since_start: boolean;
-    token_count: number;
-    total_trading_days: number;
-    execution_time_millis: number;
-  };
-}
-
-export class DuneService {
-  private apiKey: string;
-  // Deprecated query IDs removed - now using DB aggregation from 10-minute data
-  private baseUrl: string = 'https://api.dune.com/api/v1';
-  private cache: Map<string, { data: DunePoolMetrics | null; timestamp: number }>;
-  private batchCache: Map<string, { data: Map<string, DunePoolMetrics>; timestamp: number }>;
-  private aggregateVolumeCache: Map<string, { data: DuneAggregateVolumeResponse; timestamp: number }>;
-  private cacheTTL: number = 60000; // 1 minute cache for individual pools
-  private batchCacheTTL: number = 300000; // 5 minutes cache for batch queries (Dune queries are heavy)
-  private aggregateVolumeCacheTTL: number = 600000; // 10 minutes cache for aggregate volume (heavy historical query)
-  private fetchTimeout: number = 600000; // 10 minutes timeout for Dune API calls
-  private devMode: boolean;
-
-  constructor() {
-    this.apiKey = config.dune.apiKey;
-    // Deprecated query IDs removed - services now use DB aggregation
-    this.cache = new Map();
-    this.batchCache = new Map();
-    this.aggregateVolumeCache = new Map();
-    this.devMode = config.devMode;
-    
-    if (this.devMode) {
-      logger.info('[Dune] ⚠️  DEV_MODE enabled - external Dune API calls are disabled');
-    }
-    // Allow configurable cache TTLs from environment
-    if (process.env.DUNE_CACHE_TTL) {
-      this.cacheTTL = parseInt(process.env.DUNE_CACHE_TTL) * 1000; // Convert seconds to milliseconds
-    }
-    if (process.env.DUNE_BATCH_CACHE_TTL) {
-      this.batchCacheTTL = parseInt(process.env.DUNE_BATCH_CACHE_TTL) * 1000; // Convert seconds to milliseconds
-    }
-    if (process.env.DUNE_AGGREGATE_VOLUME_CACHE_TTL) {
-      this.aggregateVolumeCacheTTL = parseInt(process.env.DUNE_AGGREGATE_VOLUME_CACHE_TTL) * 1000;
-    }
-    if (process.env.DUNE_FETCH_TIMEOUT) {
-      this.fetchTimeout = parseInt(process.env.DUNE_FETCH_TIMEOUT) * 1000; // Convert seconds to milliseconds
-    }
-  }
-
-  /**
-   * Check if dev mode is enabled
-   */
-  isDevMode(): boolean {
-    return this.devMode;
-  }
-
-  /**
-   * Fetch with timeout and retry wrapper.
-   * Retries on transient errors (network issues, rate limits, 5xx).
-   * @param url The URL to fetch
-   * @param options Fetch options
-   * @returns Response promise
-   */
-  private async fetchWithTimeout(url: string, options: RequestInit = {}): Promise<Response> {
-    return withRetryAndTimeout(
-      async () => {
-        const response = await fetch(url, options);
-        // Throw on transient HTTP errors so they get retried
-        if (response.status === 429 || response.status >= 500) {
-          const errorText = await response.text();
-          const error = new Error(`Dune API error: ${response.status} - ${errorText}`);
-          (error as any).status = response.status;
-          throw error;
-        }
-        return response;
-      },
-      {
-        timeoutMs: this.fetchTimeout,
-        timeoutMessage: `Dune API request timed out after ${this.fetchTimeout}ms`,
-        maxRetries: 2,
-        initialDelayMs: 1000,
-        maxDelayMs: 5000,
-        isRetryable: isTransientError,
-        onRetry: createRetryLogger('[Dune]'),
-      }
-    );
-  }
-
-  /**
-   * Convert scientific notation to regular decimal notation
-   * Handles string, number, and other types from Dune API
-   * @param value Value that may be in scientific notation (e.g., "3.2259955052399996E5" or 322599.55)
-   * @returns String in regular decimal notation (e.g., "322599.55052399996")
-   */
-  private convertScientificNotation(value: unknown): string {
-    // Handle null, undefined, empty values
-    if (value === null || value === undefined || value === '' || value === 0 || value === '0') {
-      return '0';
-    }
-    
-    // Handle number type directly
-    if (typeof value === 'number') {
-      if (isNaN(value) || !isFinite(value)) {
-        return '0';
-      }
-      // Use toFixed with enough precision, then remove trailing zeros
-      return value.toFixed(20).replace(/\.?0+$/, '');
-    }
-    
-    // Handle string type
-    if (typeof value === 'string') {
-      // Check if it contains scientific notation (E or e)
-      if (value.includes('E') || value.includes('e')) {
-        try {
-          const num = parseFloat(value);
-          if (isNaN(num)) {
-            return '0';
-          }
-          return num.toFixed(20).replace(/\.?0+$/, '');
-        } catch (error) {
-          logger.warn(`[Dune] Failed to convert scientific notation: ${value}`, { error: String(error) });
-          return value;
-        }
-      }
-      return value;
-    }
-    
-    // Handle any other type (object, boolean, etc.) - convert to string first
-    try {
-      const strValue = String(value);
-      if (strValue === '[object Object]' || strValue === 'undefined' || strValue === 'null') {
-        return '0';
-      }
-      const num = parseFloat(strValue);
-      if (isNaN(num) || !isFinite(num)) {
-        return '0';
-      }
-      return num.toFixed(20).replace(/\.?0+$/, '');
-    } catch {
-      return '0';
-    }
-  }
-
-  
-  /**
-   * Create or update a Dune query
-   * @param query The query definition
-   * @returns The created/updated query ID
-   */
-  async createOrUpdateQuery(query: DuneQuery): Promise<number> {
-    const url = query.query_id
-      ? `${this.baseUrl}/query/${query.query_id}`
-      : `${this.baseUrl}/query`;
-
-    const method = query.query_id ? 'PATCH' : 'POST';
-
-    const response = await this.fetchWithTimeout(url, {
-      method,
-      headers: {
-        'X-Dune-API-Key': this.apiKey,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        name: query.name,
-        query_sql: query.query_sql,
-        parameters: query.parameters || [],
-      }),
-    });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`Dune API error: ${response.status} ${response.statusText} - ${errorText}`);
-    }
-
-    const result = await response.json() as any;
-    return result.query_id || result.query?.query_id;
-  }
-
-  /**
-   * Execute a Dune query and get execution ID
-   * Based on DefiLlama's implementation: https://github.com/DefiLlama/dimension-adapters/blob/master/helpers/dune.ts
-   * @param queryId The Dune query ID
-   * @param parameters Optional query parameters (e.g., token list, fullQuery)
-   */
-  private async executeQuery(
-    queryId: number,
-    parameters?: Record<string, any>
-  ): Promise<{ execution_id: string }> {
-    const executeUrl = `${this.baseUrl}/query/${queryId}/execute`;
-    
-    const requestBody: any = {};
-    if (parameters && Object.keys(parameters).length > 0) {
-      // Ensure all parameters are strings (Dune expects string parameters)
-      const stringParams: Record<string, string> = {};
-      for (const [key, value] of Object.entries(parameters)) {
-        stringParams[key] = String(value);
-      }
-      requestBody.query_parameters = stringParams;
-      logger.info('[Dune] Sending parameters:', { params: stringParams });
-    }
-    
-    const response = await this.fetchWithTimeout(executeUrl, {
-      method: 'POST',
-      headers: {
-        'X-Dune-API-Key': this.apiKey,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      if (response.status === 401) {
-        throw new Error('Dune API Key is invalid');
-      }
-      throw new Error(`Dune API error: ${response.status} ${response.statusText} - ${errorText}`);
-    }
-
-    const result = await response.json() as any;
-    
-    if (result?.execution_id) {
-      return { execution_id: result.execution_id };
-    }
-    
-    // DefiLlama pattern: log the query if it fails
-    if (parameters?.fullQuery) {
-      logger.info(`Dune query: ${parameters.fullQuery}`);
-    } else {
-      logger.info('Dune parameters', { parameters });
-    }
-    
-    throw new Error(`Error query data: ${JSON.stringify(result)}`);
-  }
-
-  /**
-   * Get the execution status
-   */
-  private async getExecutionStatus(executionId: string): Promise<any> {
-    const statusUrl = `${this.baseUrl}/execution/${executionId}/status`;
-    
-    const response = await this.fetchWithTimeout(statusUrl, {
-      method: 'GET',
-      headers: {
-        'X-Dune-API-Key': this.apiKey,
-      },
-    });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`Dune API error: ${response.status} ${response.statusText} - ${errorText}`);
-    }
-
-    const result = await response.json();
-    return result;
-  }
-
-  /**
-   * Fetch all paginated results from a URL
-   * Dune API returns next_uri when there are more results
-   */
-  private async fetchAllPaginatedResults(initialUrl: string): Promise<{ rows: any[], metadata: any }> {
-    const allRows: any[] = [];
-    let currentUrl: string | null = initialUrl;
-    let metadata: any = null;
-    let pageCount = 0;
-    
-    while (currentUrl) {
-      pageCount++;
-      logger.info(`[Dune] Fetching page ${pageCount}...`);
-      
-      const response = await this.fetchWithTimeout(currentUrl, {
-        method: 'GET',
-        headers: {
-          'X-Dune-API-Key': this.apiKey,
-        },
-      });
-
-      if (!response.ok) {
-        const errorText = await response.text();
-        throw new Error(`Dune API error: ${response.status} ${response.statusText} - ${errorText}`);
-      }
-
-      const result = await response.json() as any;
-      
-      // Extract rows from this page
-      const pageRows = result.result?.rows || result.rows || [];
-      allRows.push(...pageRows);
-      
-      // Store metadata from first page
-      if (!metadata && result.result?.metadata) {
-        metadata = result.result.metadata;
-      }
-      
-      logger.info(`[Dune] Page ${pageCount}: ${pageRows.length} rows (total: ${allRows.length})`);
-      
-      // Check for next page
-      if (result.next_uri) {
-        // next_uri can be relative or absolute - handle both cases
-        if (result.next_uri.startsWith('http')) {
-          currentUrl = result.next_uri;
-        } else {
-          currentUrl = `https://api.dune.com${result.next_uri}`;
-        }
-      } else {
-        currentUrl = null;
-      }
-    }
-    
-    if (pageCount > 1) {
-      logger.info(`[Dune] Fetched ${pageCount} pages, total rows: ${allRows.length}`);
-    }
-    
-    return { rows: allRows, metadata };
-  }
-
-  /**
-   * Get the execution results
-   * Based on DefiLlama's implementation: https://github.com/DefiLlama/dimension-adapters/blob/master/helpers/dune.ts
-   */
-  private async getQueryResults(executionId: string, limit: number = 100000): Promise<DuneQueryResult> {
-    const resultsUrl = `${this.baseUrl}/execution/${executionId}/results?limit=${limit}`;
-    
-    let attempts = 0;
-    const maxAttempts = 180; // Wait up to ~10 minutes (parameterized queries can take longer)
-    
-    while (attempts < maxAttempts) {
-      // Check execution status first
-      const status = await this.getExecutionStatus(executionId);
-      
-      if (status.state === 'QUERY_STATE_COMPLETED') {
-        // Query completed, fetch all paginated results
-        const { rows, metadata } = await this.fetchAllPaginatedResults(resultsUrl);
-        
-        return {
-          rows,
-          metadata: {
-            column_names: metadata?.column_names || [],
-            result_set_bytes: metadata?.result_set_bytes || 0,
-            total_row_count: metadata?.total_row_count || rows.length,
-            datapoint_count: metadata?.datapoint_count || 0,
-            pending_time_millis: metadata?.pending_time_millis || 0,
-            execution_time_millis: metadata?.execution_time_millis || 0,
-          },
-        };
-      } else if (status.state === 'QUERY_STATE_FAILED') {
-        // Status already contains error info, no need to fetch again
-        const errorObj = (status as any).error || {};
-        const errorMessage = typeof errorObj === 'string' 
-          ? errorObj 
-          : errorObj.message || errorObj.type || status.state;
-        const errorDetails = errorObj.metadata 
-          ? `Line ${errorObj.metadata.line}, Column ${errorObj.metadata.column}: ${errorMessage}`
-          : '';
-        
-        logger.error('[Dune] Query failed with state:', undefined, { state: status.state });
-        logger.error('[Dune] Error type:', undefined, { type: errorObj.type });
-        logger.error('[Dune] Error message:', undefined, { errorMessage });
-        if (errorDetails) {
-          logger.error('[Dune] Error details:', undefined, { errorDetails });
-        }
-        logger.error('[Dune] Full status response:', undefined, { status });
-        
-        const fullErrorMessage = errorDetails || errorMessage;
-        throw new Error(`Dune query failed: ${fullErrorMessage}`);
-      }
-      
-      // Query is still running, wait and retry with random delay (like DefiLlama)
-      const delay = Math.floor(Math.random() * 3) + 2; // 2-4 seconds
-      await new Promise(resolve => setTimeout(resolve, delay * 1000));
-      attempts++;
-    }
-    
-    throw new Error('Dune query execution timeout');
-  }
-
-  /**
-   * Get latest results for a query without executing (if results are recent)
-   * Based on DefiLlama's implementation
-   * Now with pagination support
-   */
-  private async getLatestResults(queryId: number, maxAgeHours: number = 3): Promise<DuneQueryResult | null> {
-    try {
-      const initialUrl = `${this.baseUrl}/query/${queryId}/results`;
-      const response = await this.fetchWithTimeout(initialUrl, {
-        method: 'GET',
-        headers: {
-          'X-Dune-API-Key': this.apiKey,
-        },
-      });
-
-      if (!response.ok) {
-        return null;
-      }
-
-      const result = await response.json() as any;
-      const submittedAt = result.submitted_at;
-      
-      if (!submittedAt) {
-        return null;
-      }
-
-      const submittedAtTimestamp = Math.trunc(new Date(submittedAt).getTime() / 1000);
-      const nowTimestamp = Math.trunc(Date.now() / 1000);
-      const diff = nowTimestamp - submittedAtTimestamp;
-      
-      // If results are older than maxAgeHours, return null to trigger new execution
-      if (diff >= maxAgeHours * 60 * 60) {
-        return null;
-      }
-
-      // Parse result format and handle pagination
-      if (result.result) {
-        const allRows = [...(result.result.rows || [])];
-        const metadata = result.result.metadata;
-        
-        // Check for more pages
-        let nextUri = result.next_uri;
-        let pageCount = 1;
-        
-        while (nextUri) {
-          pageCount++;
-          logger.info(`[Dune] Fetching latest results page ${pageCount}...`);
-          
-          // next_uri can be relative or absolute - handle both cases
-          const nextUrl = nextUri.startsWith('http') ? nextUri : `https://api.dune.com${nextUri}`;
-          const nextResponse = await this.fetchWithTimeout(nextUrl, {
-            method: 'GET',
-            headers: {
-              'X-Dune-API-Key': this.apiKey,
-            },
-          });
-          
-          if (!nextResponse.ok) {
-            break;
-          }
-          
-          const nextResult = await nextResponse.json() as any;
-          const pageRows = nextResult.result?.rows || nextResult.rows || [];
-          allRows.push(...pageRows);
-          
-          logger.info(`[Dune] Page ${pageCount}: ${pageRows.length} rows (total: ${allRows.length})`);
-          
-          nextUri = nextResult.next_uri;
-        }
-        
-        if (pageCount > 1) {
-          logger.info(`[Dune] Fetched ${pageCount} pages of latest results, total rows: ${allRows.length}`);
-        }
-        
-        return {
-          rows: allRows,
-          metadata: {
-            column_names: metadata?.column_names || [],
-            result_set_bytes: metadata?.result_set_bytes || 0,
-            total_row_count: metadata?.total_row_count || allRows.length,
-            datapoint_count: metadata?.datapoint_count || 0,
-            pending_time_millis: metadata?.pending_time_millis || 0,
-            execution_time_millis: metadata?.execution_time_millis || 0,
-          },
-        };
-      }
-
-      return null;
-    } catch (error) {
-      // If we can't get latest results, return null to trigger new execution
-      return null;
-    }
-  }
-
-  /**
-   * Manually execute a Dune query with custom parameters
-   * Useful for testing or one-off queries
-   * @param queryId The Dune query ID to execute
-   * @param parameters Optional query parameters
-   * @returns The raw query results
-   */
-  async executeQueryManually(
-    queryId: number,
-    parameters?: Record<string, any>
-  ): Promise<DuneQueryResult> {
-    // Skip external calls in dev mode
-    if (this.devMode) {
-      logger.info(`[Dune] DEV_MODE: Skipping query ${queryId} execution`);
-      return {
-        rows: [],
-        metadata: {
-          column_names: [],
-          result_set_bytes: 0,
-          total_row_count: 0,
-          datapoint_count: 0,
-          pending_time_millis: 0,
-          execution_time_millis: 0,
-        }
-      };
-    }
-
-    try {
-      // Execute the query with parameters
-      const executeResult = await this.executeQuery(queryId, parameters);
-      
-      // Wait for results using the execution_id
-      const queryResult = await this.getQueryResults(executeResult.execution_id);
-      
-      return queryResult;
-    } catch (error) {
-      logger.error(`Error executing Dune query ${queryId}:`, error);
-      throw error;
-    }
-  }
-
-}
-
-
diff --git a/src/services/externalDatabaseService.ts b/src/services/externalDatabaseService.ts
index 5f8cc83..c8d6563 100644
--- a/src/services/externalDatabaseService.ts
+++ b/src/services/externalDatabaseService.ts
@@ -8,10 +8,34 @@ pg.defaults.parseInputDatesAsUTC = true;
 
 const { Pool } = pg;
 
+export interface Rolling24hMetrics {
+  token: string;
+  base_volume_24h: string;
+  target_volume_24h: string;
+  high_24h: string;
+  low_24h: string;
+  trade_count_24h: number;
+}
+
+export interface ServedDataContractStatus {
+  ok: boolean;
+  checkedAt: string;
+  missing: string[];
+}
+
+export interface ServedDataFreshness {
+  /** ISO timestamp of the newest swap in the served DB, or null if the table is empty. */
+  latestSwapAt: string | null;
+  /** Age of that swap in seconds, or null if the table is empty. */
+  ageSeconds: number | null;
+}
+
 /**
- * Read-only connection pool to the external indexer database.
- * Used by v0.6 reconciliation to query v0_6_spot_swaps,
- * v0_6_conditional_swaps, v0_6_daos, and v0_6_proposals.
+ * Read-only connection pool to the served indexer database. ALL reads come from
+ * the unified user_pool ETL output here: user_pool_daily (futarchy + meteora
+ * daily), user_pool_spot_ohlcv (24h metrics), and user_pool_swaps (DEX Screener
+ * per-swap events + post-swap reserves). Single source of truth — no raw v0_6_*,
+ * no app-DB rollups, no futarchy.trades.
  */
 export class ExternalDatabaseService {
   private pool: pg.Pool | null = null;
@@ -24,7 +48,7 @@ export class ExternalDatabaseService {
 
   async initialize(): Promise<boolean> {
     if (!config.externalDatabase.connectionString) {
-      logger.info('[ExternalDB] No EXTERNAL_DATABASE_URL configured — v0.6 reconciliation disabled');
+      logger.info('[ExternalDB] No DATABASE_PG_URL configured');
       return false;
     }
 
@@ -55,6 +79,404 @@ export class ExternalDatabaseService {
     return this.pool.query(text, params);
   }
 
+  /**
+   * Rolling 24h spot-market metrics per token, aggregated from the unified ETL's
+   * 1-minute candles (`futarchy.user_pool_spot_ohlcv`, source='futarchy_amm') in
+   * the served DB. These candles are already in HUMAN units (price = USD/token,
+   * base_volume = token, target_volume = USD), so no decimal scaling is needed.
+   *
+   * Keyed by token (base mint); the /api/tickers caller maps token→dao. This is
+   * the SINGLE source for 24h metrics — it replaces both the old futarchy.trades
+   * read and the app-DB v06_spot_ohlcv_1m fallback. Everything now comes from the
+   * user_pool ETL output.
+   *
+   * Returns an empty Map if no spot candles exist in the window. Throws if the
+   * connection is down or the query fails (never masks a failure as empty).
+   */
+  async getSpotRolling24hMetrics(tokens: string[]): Promise<Map<string, Rolling24hMetrics>> {
+    if (tokens.length === 0) {
+      return new Map();
+    }
+    if (!this.pool || !this.isConnected) {
+      throw new Error('External database not connected');
+    }
+
+    const cutoff = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
+
+    try {
+      const result = await this.pool.query(
+        `SELECT
+           token,
+           SUM(base_volume)::text                        AS base_volume_24h,
+           SUM(target_volume)::text                      AS target_volume_24h,
+           MAX(high)::text                               AS high_24h,
+           (MIN(low) FILTER (WHERE low > 0))::text       AS low_24h,
+           SUM(trade_count)::int                         AS trade_count_24h
+         FROM futarchy.user_pool_spot_ohlcv
+         WHERE source = 'futarchy_amm'
+           AND "interval" = '1m'
+           AND bucket_start >= $1
+           AND token = ANY($2::text[])
+         GROUP BY token`,
+        [cutoff, tokens]
+      );
+
+      const metricsMap = new Map<string, Rolling24hMetrics>();
+      for (const row of result.rows) {
+        metricsMap.set(row.token, {
+          token: row.token,
+          base_volume_24h: row.base_volume_24h ?? '0',
+          target_volume_24h: row.target_volume_24h ?? '0',
+          high_24h: row.high_24h ?? '0',
+          low_24h: row.low_24h ?? '0',
+          trade_count_24h: row.trade_count_24h ?? 0,
+        });
+      }
+      return metricsMap;
+    } catch (error: any) {
+      // Surface query/schema failures (e.g. served-DB contract drift) instead of
+      // masking them as an empty map — an empty map must mean "genuinely no spot
+      // candles in the window", not "the query failed". The /api/tickers handler is
+      // wrapped in asyncHandler, so this propagates to a clean 5xx.
+      logger.error('[ExternalDB] Error getting spot rolling 24h metrics from user_pool_spot_ohlcv:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Daily Meteora volumes from the unified `futarchy.user_pool_daily` (source=
+   * 'meteora') in the served DB — the user_pool ETL output (a faithful, v0_6_daos-
+   * filtered map of the meteora accounting ETL's meteora_daily view). Reading the
+   * unified table (not meteora_daily directly) keeps every market-data read on the
+   * one ETL output; validated row-exact vs meteora_daily.
+   *
+   * Returns the SAME column contract so /api/market-data consumers are unchanged:
+   * token (base mint), date, base_volume, target_volume, buy_volume, sell_volume,
+   * trade_count, average_price, usdc_fees, token_fees, token_fees_usdc,
+   * token_per_usdc (derived = base_volume/target_volume = 1/average_price, since
+   * user_pool_daily doesn't store it). Throws on connection or query failure.
+   */
+  async getDailyMeteoraVolumes(options?: {
+    token?: string;
+    tokens?: string[];
+    startDate?: string;
+    endDate?: string;
+  }): Promise<Array<{
+    token: string; date: string; base_volume: string; target_volume: string;
+    buy_volume: string; sell_volume: string; trade_count: number; average_price: string;
+    usdc_fees: string; token_fees: string; token_fees_usdc: string; token_per_usdc: string | null;
+  }>> {
+    if (!this.pool || !this.isConnected) {
+      throw new Error('External database not connected');
+    }
+    const conditions: string[] = [];
+    const params: any[] = [];
+    let i = 1;
+    if (options?.tokens && options.tokens.length > 0) {
+      conditions.push(`token = ANY($${i}::text[])`);
+      params.push(options.tokens);
+      i++;
+    } else if (options?.token) {
+      conditions.push(`token = $${i}`);
+      params.push(options.token);
+      i++;
+    }
+    if (options?.startDate) {
+      conditions.push(`date >= $${i}`);
+      params.push(options.startDate);
+      i++;
+    }
+    if (options?.endDate) {
+      conditions.push(`date <= $${i}`);
+      params.push(options.endDate);
+      i++;
+    }
+    // source='meteora' is always applied; user-supplied filters are AND-ed after it.
+    const whereClause = `WHERE source = 'meteora'${conditions.length > 0 ? ' AND ' + conditions.join(' AND ') : ''}`;
+    try {
+      const result = await this.pool.query(
+        `SELECT
+           token,
+           date::text,
+           base_volume::text,
+           target_volume::text,
+           buy_volume::text,
+           sell_volume::text,
+           trade_count,
+           average_price::text,
+           usdc_fees::text,
+           token_fees::text,
+           token_fees_usdc::text,
+           (base_volume / nullif(target_volume, 0))::text AS token_per_usdc
+         FROM futarchy.user_pool_daily
+         ${whereClause}
+         ORDER BY token, date ASC`,
+        params
+      );
+      return result.rows;
+    } catch (error: any) {
+      // Surface query/schema failures — do NOT mask as empty. For a financial endpoint,
+      // an empty array must mean "genuinely no rows", never "the query failed". The caller
+      // (market route) guards `isAvailable()` for the connection-down case and lets a real
+      // failure propagate to a 5xx instead of returning 200 with zero volume.
+      logger.error('[ExternalDB] Error getting daily Meteora volumes from user_pool_daily:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Daily FutarchyAMM trading activity from `futarchy.user_pool_daily` (served DB) —
+   * the unified, ON-CHAIN-derived table that replaces the flat-0.5%
+   * `v06_fee_volume_daily_aggregate` (and the Dune-style `v06ReconciliationService`).
+   *
+   * user_pool_daily stores spot and conditional as SEPARATE rows (market_kind); we
+   * pivot them into the same spot / conditional / total column shape the old app-DB
+   * aggregate path returned, so /api/market-data consumers are unchanged.
+   * Values are already USD / token-UI (no /1e6). ADDS the protocol/LP fee split
+   * (collected-to-treasury vs retained), which the old flat-rate aggregate could not
+   * provide. Throws on connection or query failure (never masks as empty for a
+   * financial feed).
+   */
+  async getFutarchyAmmDailyActivity(options?: {
+    token?: string;
+    tokens?: string[];
+    startDate?: string;
+    endDate?: string;
+  }): Promise<any[]> {
+    if (!this.pool || !this.isConnected) {
+      throw new Error('External database not connected');
+    }
+    const conditions: string[] = [`source = 'futarchy_amm'`];
+    const params: any[] = [];
+    let i = 1;
+    if (options?.tokens && options.tokens.length > 0) {
+      conditions.push(`token = ANY($${i}::text[])`);
+      params.push(options.tokens);
+      i++;
+    } else if (options?.token) {
+      conditions.push(`token = $${i}`);
+      params.push(options.token);
+      i++;
+    }
+    if (options?.startDate) { conditions.push(`date >= $${i}`); params.push(options.startDate); i++; }
+    if (options?.endDate)   { conditions.push(`date <= $${i}`); params.push(options.endDate);   i++; }
+    const whereClause = `WHERE ${conditions.join(' AND ')}`;
+    try {
+      const result = await this.pool.query(
+        `WITH d AS (SELECT * FROM futarchy.user_pool_daily ${whereClause}),
+              spot AS (SELECT * FROM d WHERE market_kind = 'spot'),
+              cond AS (SELECT * FROM d WHERE market_kind = 'conditional')
+         SELECT
+           COALESCE(s.token, c.token)               AS token,
+           COALESCE(s.date,  c.date)::text          AS date,
+           (c.token IS NOT NULL)                    AS has_conditional_volume,
+           -- spot
+           COALESCE(s.buy_volume,0)::text           AS spot_buy_volume,
+           COALESCE(s.sell_volume,0)::text          AS spot_sell_volume,
+           COALESCE(s.base_volume,0)::text          AS spot_base_volume,
+           COALESCE(s.target_volume,0)::text        AS spot_target_volume,
+           COALESCE(s.trade_count,0)                AS spot_trade_count,
+           COALESCE(s.usdc_fees,0)::text            AS spot_usdc_fees,
+           COALESCE(s.token_fees,0)::text           AS spot_token_fees,
+           COALESCE(s.token_fees_usdc,0)::text      AS spot_token_fees_usdc,
+           COALESCE(s.futarchy_protocol_fee_usdc,0)::text AS spot_protocol_fee_usd,
+           COALESCE(s.futarchy_lp_fee_usdc,0)::text       AS spot_lp_fee_usd,
+           -- conditional (NULL when no conditional row for the day)
+           c.buy_volume::text                       AS conditional_buy_volume,
+           c.sell_volume::text                      AS conditional_sell_volume,
+           c.base_volume::text                      AS conditional_base_volume,
+           c.target_volume::text                    AS conditional_target_volume,
+           c.trade_count                            AS conditional_trade_count,
+           c.usdc_fees::text                        AS conditional_usdc_fees,
+           c.token_fees::text                       AS conditional_token_fees,
+           c.token_fees_usdc::text                  AS conditional_token_fees_usdc,
+           c.futarchy_protocol_fee_usdc::text       AS conditional_protocol_fee_usd,
+           c.futarchy_lp_fee_usdc::text             AS conditional_lp_fee_usd,
+           -- total = spot + conditional
+           (COALESCE(s.buy_volume,0)+COALESCE(c.buy_volume,0))::text       AS total_buy_volume,
+           (COALESCE(s.sell_volume,0)+COALESCE(c.sell_volume,0))::text     AS total_sell_volume,
+           (COALESCE(s.base_volume,0)+COALESCE(c.base_volume,0))::text     AS total_base_volume,
+           (COALESCE(s.target_volume,0)+COALESCE(c.target_volume,0))::text AS total_target_volume,
+           (COALESCE(s.trade_count,0)+COALESCE(c.trade_count,0))          AS total_trade_count,
+           (COALESCE(s.usdc_fees,0)+COALESCE(c.usdc_fees,0))::text         AS total_usdc_fees,
+           (COALESCE(s.token_fees,0)+COALESCE(c.token_fees,0))::text       AS total_token_fees,
+           (COALESCE(s.token_fees_usdc,0)+COALESCE(c.token_fees_usdc,0))::text AS total_token_fees_usdc,
+           (COALESCE(s.futarchy_protocol_fee_usdc,0)+COALESCE(c.futarchy_protocol_fee_usdc,0))::text AS total_protocol_fee_usd,
+           (COALESCE(s.futarchy_lp_fee_usdc,0)+COALESCE(c.futarchy_lp_fee_usdc,0))::text             AS total_lp_fee_usd,
+           COALESCE(c.conditional_reconciled, false) AS conditional_reconciled,
+           COALESCE(c.pending_open_proposals, 0)     AS pending_open_proposals
+         FROM spot s FULL OUTER JOIN cond c ON s.token = c.token AND s.date = c.date
+         ORDER BY token, date ASC`,
+        params
+      );
+      return result.rows;
+    } catch (error: any) {
+      logger.error('[ExternalDB] Error getting FutarchyAMM daily activity from user_pool_daily:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * First spot-trade date per token (base mint), from the unified ETL output
+   * `futarchy.user_pool_daily` (source='futarchy_amm', spot) — MIN(date) per token.
+   * Keeps every market-data read on the one ETL output. Returns
+   * Map<token(base mint), 'YYYY-MM-DD'>. Throws on connection or query failure.
+   */
+  async getFirstTradeDates(): Promise<Map<string, string>> {
+    if (!this.pool || !this.isConnected) {
+      throw new Error('External database not connected');
+    }
+    try {
+      const result = await this.pool.query(
+        `SELECT token, MIN(date)::text AS first_date
+           FROM futarchy.user_pool_daily
+          WHERE source = 'futarchy_amm' AND market_kind = 'spot'
+          GROUP BY token`
+      );
+      const m = new Map<string, string>();
+      for (const row of result.rows) m.set(row.token, row.first_date);
+      return m;
+    } catch (error: any) {
+      logger.error('[ExternalDB] Error getting first trade dates from user_pool_daily:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Freshness of the served pipeline: age of the newest row in
+   * futarchy.user_pool_swaps (any source). Used by the heartbeat and
+   * /api/health to distinguish "connected but stale ETL" from healthy.
+   * Throws on connection or query failure.
+   */
+  async getServedDataFreshness(): Promise<ServedDataFreshness> {
+    if (!this.pool || !this.isConnected) {
+      throw new Error('External database not connected');
+    }
+    const result = await this.pool.query(
+      `SELECT
+         MAX(block_time) AS latest_swap_at,
+         extract(epoch FROM now() - MAX(block_time))::bigint AS age_seconds
+       FROM futarchy.user_pool_swaps`
+    );
+    const row = result.rows[0];
+    if (!row || row.latest_swap_at == null) {
+      return { latestSwapAt: null, ageSeconds: null };
+    }
+    return {
+      latestSwapAt: new Date(row.latest_swap_at).toISOString(),
+      ageSeconds: Number(row.age_seconds),
+    };
+  }
+
+  async checkServedDataContract(): Promise<ServedDataContractStatus> {
+    const checkedAt = new Date().toISOString();
+    if (!this.pool || !this.isConnected) {
+      return {
+        ok: false,
+        checkedAt,
+        missing: ['connection'],
+      };
+    }
+
+    const requiredColumns = new Map<string, string[]>([
+      // Must cover EVERY column getFutarchyAmmDailyActivity + getDailyMeteoraVolumes
+      // + getFirstTradeDates actually SELECT — otherwise the health check reports
+      // ok:true while a dropped column makes every market-data query throw at runtime.
+      ['user_pool_daily', [
+        'source',
+        'market_kind',
+        'token',
+        'date',
+        'base_volume',
+        'target_volume',
+        'buy_volume',
+        'sell_volume',
+        'trade_count',
+        'usdc_fees',
+        'token_fees',
+        'token_fees_usdc',
+        'average_price',
+        'futarchy_protocol_fee_usdc',
+        'futarchy_lp_fee_usdc',
+        'conditional_reconciled',
+        'pending_open_proposals',
+      ]],
+      ['user_pool_spot_ohlcv', [
+        'source',
+        'interval',
+        'token',
+        'bucket_start',
+        'base_volume',
+        'target_volume',
+        'high',
+        'low',
+        'trade_count',
+      ]],
+      ['user_pool_swaps', [
+        'source',
+        'market_kind',
+        'dao_addr',
+        'base_mint',
+        'quote_mint',
+        'slot',
+        'block_time',
+        'signature',
+        'user_addr',
+        'side',
+        'base_amount',
+        'quote_amount',
+        'amm_base_reserves',
+        'amm_quote_reserves',
+        'inner_group',
+        'inner_ix',
+      ]],
+    ]);
+
+    try {
+      const result = await this.pool.query(
+        `SELECT table_name, column_name
+           FROM information_schema.columns
+          WHERE table_schema = 'futarchy'
+            AND table_name = ANY($1::text[])`,
+        [Array.from(requiredColumns.keys())]
+      );
+
+      const observed = new Map<string, Set<string>>();
+      for (const row of result.rows) {
+        const tableName = row.table_name as string;
+        if (!observed.has(tableName)) observed.set(tableName, new Set());
+        observed.get(tableName)!.add(row.column_name as string);
+      }
+
+      const missing: string[] = [];
+      for (const [tableName, columns] of requiredColumns.entries()) {
+        const observedColumns = observed.get(tableName);
+        if (!observedColumns) {
+          missing.push(`futarchy.${tableName}`);
+          continue;
+        }
+        for (const column of columns) {
+          if (!observedColumns.has(column)) {
+            missing.push(`futarchy.${tableName}.${column}`);
+          }
+        }
+      }
+
+      return {
+        ok: missing.length === 0,
+        checkedAt,
+        missing,
+      };
+    } catch (error: any) {
+      logger.error('[ExternalDB] Error checking served ETL contract:', error);
+      return {
+        ok: false,
+        checkedAt,
+        missing: ['contract-check-query'],
+      };
+    }
+  }
+
   async close(): Promise<void> {
     if (this.healthCheckInterval) {
       clearInterval(this.healthCheckInterval);
@@ -116,9 +538,27 @@ export class ExternalDatabaseService {
   }
 
   private createPool(): void {
+    // SSL verifies the server certificate by default (system CAs, or
+    // DATABASE_PG_CA_CERT for a private CA). The unverified mode — which
+    // permits MITM on the financial source of truth — requires the explicit
+    // DATABASE_PG_SSL_NO_VERIFY opt-out and logs loudly.
+    let ssl: pg.PoolConfig['ssl'] = false;
+    if (config.externalDatabase.caCert) {
+      ssl = { ca: config.externalDatabase.caCert, rejectUnauthorized: true };
+    } else if (config.externalDatabase.ssl) {
+      if (config.externalDatabase.sslNoVerify) {
+        logger.warn(
+          '[ExternalDB] DATABASE_PG_SSL_NO_VERIFY is set — TLS is encrypted but the server is NOT authenticated. Provide DATABASE_PG_CA_CERT to enable verification.'
+        );
+        ssl = { rejectUnauthorized: false };
+      } else {
+        ssl = { rejectUnauthorized: true };
+      }
+    }
+
     this.pool = new Pool({
       connectionString: config.externalDatabase.connectionString,
-      ssl: config.externalDatabase.ssl ? { rejectUnauthorized: false } : false,
+      ssl,
       max: 5,
       idleTimeoutMillis: 30_000,
       connectionTimeoutMillis: 10_000,
diff --git a/src/services/futarchyService.ts b/src/services/futarchyService.ts
index f097366..8a1b2b4 100644
--- a/src/services/futarchyService.ts
+++ b/src/services/futarchyService.ts
@@ -239,15 +239,15 @@ export class FutarchyService {
     const cached = this.getCached<number>(cacheKey, config.cache.tickersTTL * 10); // Cache decimals longer
     if (cached !== null) return cached;
 
-    try {
-      const mintInfo = await this.retryWithBackoff(() => getMint(this.connection, mintAddress));
-      const decimals = mintInfo.decimals;
-      this.setCache(cacheKey, decimals);
-      return decimals;
-    } catch (error: any) {
-      // Default to 9 decimals if we can't fetch (common for Solana tokens)
-      return 9;
-    }
+    // No fallback default: a wrong decimals value silently scales price by
+    // 10^(±n) (e.g. assuming 9 for a 6-decimal token makes the served price 1000x
+    // wrong). On an RPC failure this MUST throw so the caller drops/fails rather
+    // than serving a mispriced ticker. Decimals are immutable, so the long cache
+    // above already shields the steady state from RPC blips.
+    const mintInfo = await this.retryWithBackoff(() => getMint(this.connection, mintAddress));
+    const decimals = mintInfo.decimals;
+    this.setCache(cacheKey, decimals);
+    return decimals;
   }
 
   private async findMetadataPDA(mintAddress: PublicKey): Promise<PublicKey> {
@@ -361,6 +361,18 @@ export class FutarchyService {
     const cached = this.getCached<DaoTickerData[]>(cacheKey, config.cache.tickersTTL);
     if (cached) return cached;
 
+    // Single-flight: concurrent callers after cache expiry share one scan instead
+    // of each launching a full DAO+RPC sweep (cache stampede against the RPC).
+    if (this.allDaosInFlight) return this.allDaosInFlight;
+    this.allDaosInFlight = this.fetchAllDaos(cacheKey).finally(() => {
+      this.allDaosInFlight = null;
+    });
+    return this.allDaosInFlight;
+  }
+
+  private allDaosInFlight: Promise<DaoTickerData[]> | null = null;
+
+  private async fetchAllDaos(cacheKey: string): Promise<DaoTickerData[]> {
     try {
       // Fetch all DAO accounts with retry logic
       let daoAccounts: any[];
@@ -378,7 +390,8 @@ export class FutarchyService {
       
       // Process DAOs sequentially with delays to avoid rate limiting
       const validDaoData: DaoTickerData[] = [];
-      
+      let perDaoErrors = 0;
+
       for (let i = 0; i < daoAccounts.length; i++) {
         const daoAccount = daoAccounts[i];
         if (!daoAccount) continue;
@@ -459,6 +472,10 @@ export class FutarchyService {
             treasuryVaultAddress,
           });
         } catch (error: any) {
+          // A per-DAO fetch failed (RPC/decimals/pool/metadata). Skip THIS dao so
+          // one flaky account doesn't take down the whole feed — but count it, so
+          // we can refuse to serve a silently-shrunken list below (see guard).
+          perDaoErrors++;
           const isRateLimited = this.isRateLimitError(error);
           if (isRateLimited) {
             // Wait longer if rate limited
@@ -467,11 +484,22 @@ export class FutarchyService {
           // Continue processing other DAOs
         }
       }
-      
+
       if (this.rateLimitErrors > 0) {
         logger.warn(`⚠️  Encountered ${this.rateLimitErrors} rate limit errors during processing`);
       }
-      
+
+      // Don't serve an empty (or all-failed) ticker set as if it were real: if we
+      // had DAOs to process and produced ZERO results while errors occurred, that's
+      // an infrastructure problem (RPC degraded), not a genuinely empty market.
+      // Throw so /api/tickers returns an error the poller retries — never an empty
+      // 200 that reads as "everything delisted / zero volume".
+      if (validDaoData.length === 0 && daoAccounts.length > 0 && perDaoErrors > 0) {
+        throw new Error(
+          `getAllDaos produced 0 tickers from ${daoAccounts.length} DAOs with ${perDaoErrors} fetch errors — refusing to serve an empty set`,
+        );
+      }
+
       this.setCache(cacheKey, validDaoData);
       return validDaoData;
     } catch (error) {
@@ -480,12 +508,4 @@ export class FutarchyService {
     }
   }
 
-  async getTotalLiquidity(daoAddress?: PublicKey): Promise<BN> {
-    const daoPubkey = daoAddress;
-    if (!daoPubkey) {
-      throw new Error('DAO address is required. Provide daoAddress parameter or set DAO_PUBLIC_KEY environment variable.');
-    }
-    const dao = await this.client.getDao(daoPubkey);
-    return new BN(dao.amm.totalLiquidity);
-  }
 }
\ No newline at end of file
diff --git a/src/services/hourlyAggregationService.ts b/src/services/hourlyAggregationService.ts
deleted file mode 100644
index 92b97ba..0000000
--- a/src/services/hourlyAggregationService.ts
+++ /dev/null
@@ -1,464 +0,0 @@
-import { DatabaseService, HourlyVolumeRecord, Rolling24hMetrics } from './databaseService.js';
-import { DuneService } from './duneService.js';
-import { FutarchyService } from './futarchyService.js';
-import { config } from '../config.js';
-import { logger } from '../utils/logger.js';
-
-// The timestamp when Futarchy trading data begins
-const FUTARCHY_START_TIME = '2025-10-09 00:00:00';
-
-export interface HourlyAggregationStatus {
-  isInitialized: boolean;
-  databaseConnected: boolean;
-  latestHour: string | null;
-  latestCompleteHour: string | null;
-  tokenCount: number;
-  recordCount: number;
-  lastRefreshTime: Date | null;
-  isRefreshing: boolean;
-  hourlyQueryId: number | null;
-  schedule: {
-    hourlyRefresh: string;  // ":01 past each hour"
-    tenMinRefresh: string;  // "every 10 minutes"
-    queriesPerDay: number;  // 24 + 144 = 168
-  };
-}
-
-export class HourlyAggregationService {
-  private databaseService: DatabaseService;
-  private duneService: DuneService;
-  private futarchyService: FutarchyService;
-  private _isInitialized: boolean = false;
-  private isRefreshing: boolean = false;
-  private lastRefreshTime: Date | null = null;
-  
-  // Scheduled timers
-  private hourlyTimer: ReturnType<typeof setTimeout> | null = null;
-  private tenMinTimer: ReturnType<typeof setTimeout> | null = null;
-
-  // In-memory cache for when DB is unavailable
-  private inMemoryHourlyCache: Map<string, HourlyVolumeRecord[]> = new Map();
-
-  constructor(databaseService: DatabaseService, duneService: DuneService, futarchyService: FutarchyService) {
-    this.databaseService = databaseService;
-    this.duneService = duneService;
-    this.futarchyService = futarchyService;
-  }
-
-  get isInitialized(): boolean {
-    return this._isInitialized;
-  }
-
-  isDatabaseConnected(): boolean {
-    return this.databaseService.isAvailable();
-  }
-
-  /**
-   * Initialize the service
-   */
-  async initialize(): Promise<void> {
-    logger.info('[HourlyAggregation] Initializing service...');
-
-    if (this.databaseService.isAvailable()) {
-      const recordCount = await this.databaseService.getHourlyRecordCount();
-      const latestHour = await this.databaseService.getLatestHour();
-
-      if (recordCount > 0) {
-        logger.info(`[HourlyAggregation] Found ${recordCount} existing hourly records, latest: ${latestHour}`);
-      } else {
-        logger.info('[HourlyAggregation] No existing hourly data, will backfill on first refresh');
-      }
-    } else {
-      logger.info('[HourlyAggregation] Database not available, will use in-memory cache');
-    }
-
-    this._isInitialized = true;
-    logger.info('[HourlyAggregation] Service initialized');
-  }
-
-  /**
-   * Start the scheduled refresh jobs
-   * - Hourly: runs at :01 past each hour (fetches complete hours)
-   * - 10-min: runs at :00, :10, :20, :30, :40, :50 (fetches current incomplete hour)
-   */
-  async start(): Promise<void> {
-    if (!this._isInitialized) {
-      await this.initialize();
-    }
-
-    if (this.databaseService.isAvailable()) {
-      const recordCount = await this.databaseService.getHourlyRecordCount();
-      if (recordCount > 0) {
-        logger.info(`[HourlyAggregation] Ready to serve ${recordCount} cached hourly records`);
-      }
-    }
-
-    logger.info('[HourlyAggregation] Starting scheduled refresh jobs...');
-    logger.info('[HourlyAggregation] - Hourly refresh: :01 past each hour (24 queries/day)');
-    logger.info('[HourlyAggregation] - 10-min refresh: every 10 minutes (144 queries/day)');
-
-    this.scheduleHourlyRefresh();
-    this.scheduleTenMinRefresh();
-
-    logger.info('[HourlyAggregation] Scheduled refresh jobs started');
-
-    logger.info('[HourlyAggregation] Starting background refresh...');
-    this.refresh().catch(err => {
-      logger.error('[HourlyAggregation] Background refresh failed', err);
-    });
-  }
-
-  /**
-   * Schedule the next hourly refresh at :01 past the hour
-   */
-  private scheduleHourlyRefresh(): void {
-    const now = new Date();
-    const nextHour = new Date(now);
-    nextHour.setHours(nextHour.getHours() + 1);
-    nextHour.setMinutes(1, 0, 0); // :01:00
-
-    // If we're past :01, schedule for next hour
-    if (now.getMinutes() >= 1) {
-      // Already past :01, next run is in the calculated time
-    } else {
-      // Before :01, run at :01 this hour
-      nextHour.setHours(now.getHours());
-    }
-
-    const msUntilNext = nextHour.getTime() - now.getTime();
-    logger.info(`[HourlyAggregation] Next hourly refresh at ${nextHour.toISOString()} (in ${Math.round(msUntilNext / 1000)}s)`);
-
-    this.hourlyTimer = setTimeout(async () => {
-      await this.refreshCompleteHours();
-      this.scheduleHourlyRefresh(); // Schedule next
-    }, msUntilNext);
-  }
-
-  /**
-   * Schedule the next 10-minute refresh at the next 10-minute mark
-   */
-  private scheduleTenMinRefresh(): void {
-    const now = new Date();
-    const currentMinute = now.getMinutes();
-    const nextTenMin = Math.ceil((currentMinute + 1) / 10) * 10;
-    
-    const nextRun = new Date(now);
-    if (nextTenMin >= 60) {
-      nextRun.setHours(nextRun.getHours() + 1);
-      nextRun.setMinutes(0, 30, 0); // :00:30 of next hour (30 sec buffer)
-    } else {
-      nextRun.setMinutes(nextTenMin, 30, 0); // 30 sec buffer after the mark
-    }
-
-    const msUntilNext = nextRun.getTime() - now.getTime();
-    logger.info(`[HourlyAggregation] Next 10-min refresh at ${nextRun.toISOString()} (in ${Math.round(msUntilNext / 1000)}s)`);
-
-    this.tenMinTimer = setTimeout(async () => {
-      await this.refreshCurrentHour();
-      this.scheduleTenMinRefresh(); // Schedule next
-    }, msUntilNext);
-  }
-
-  /**
-   * Stop the scheduled refresh jobs
-   */
-  stop(): void {
-    if (this.hourlyTimer) {
-      clearTimeout(this.hourlyTimer);
-      this.hourlyTimer = null;
-    }
-    if (this.tenMinTimer) {
-      clearTimeout(this.tenMinTimer);
-      this.tenMinTimer = null;
-    }
-    logger.info('[HourlyAggregation] Scheduled refresh jobs stopped');
-  }
-
-  /**
-   * Refresh only complete hours (called at :01 past each hour)
-   * Aggregates from 10-minute data using database function
-   */
-  private async refreshCompleteHours(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[HourlyAggregation] Refresh already in progress, skipping hourly refresh');
-      return;
-    }
-
-    this.isRefreshing = true;
-    logger.info('[HourlyAggregation] Hourly refresh - aggregating last complete hour from 10-min data...');
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[HourlyAggregation] Database not available, skipping aggregation');
-        return;
-      }
-
-      const lastCompleteHour = new Date();
-      lastCompleteHour.setMinutes(0, 0, 0);
-      lastCompleteHour.setHours(lastCompleteHour.getHours() - 1);
-      const hourISO = lastCompleteHour.toISOString();
-
-      const recordsAggregated = await this.databaseService.aggregate10MinToHourly(undefined, hourISO);
-
-      if (recordsAggregated > 0) {
-        logger.info(`[HourlyAggregation] Hourly refresh complete - aggregated ${recordsAggregated} hourly records from 10-min data`);
-      } else {
-        logger.info('[HourlyAggregation] No 10-minute data available for aggregation');
-      }
-
-      this.lastRefreshTime = new Date();
-    } catch (error: any) {
-      logger.error('[HourlyAggregation] Error in hourly refresh', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Refresh only the current incomplete hour (called every 10 minutes)
-   * Aggregates from 10-minute data using database function
-   */
-  private async refreshCurrentHour(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[HourlyAggregation] Refresh already in progress, skipping 10-min refresh');
-      return;
-    }
-
-    this.isRefreshing = true;
-    logger.info('[HourlyAggregation] 10-min refresh - aggregating current hour from 10-min data...');
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[HourlyAggregation] Database not available, skipping aggregation');
-        return;
-      }
-
-      const currentHourStart = new Date();
-      currentHourStart.setMinutes(0, 0, 0);
-      const hourISO = currentHourStart.toISOString();
-
-      const recordsAggregated = await this.databaseService.aggregate10MinToHourly(undefined, hourISO);
-
-      if (recordsAggregated > 0) {
-        await this.databaseService.pool?.query(
-          `UPDATE hourly_volumes SET is_complete = false WHERE hour = $1`,
-          [hourISO]
-        );
-        logger.info(`[HourlyAggregation] 10-min refresh complete - aggregated ${recordsAggregated} hourly records (incomplete)`);
-      } else {
-        logger.info('[HourlyAggregation] No 10-minute data available for current hour aggregation');
-      }
-
-      this.lastRefreshTime = new Date();
-    } catch (error: any) {
-      logger.error('[HourlyAggregation] Error in 10-min refresh', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Full refresh / backfill hourly data by aggregating from 10-minute data
-   * Used for:
-   * - Initial backfill when no data exists
-   * - Manual force refresh
-   * Strategy:
-   * - Aggregates all incomplete hours from 10-minute data
-   */
-  async refresh(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[HourlyAggregation] Refresh already in progress, skipping');
-      return;
-    }
-
-    this.isRefreshing = true;
-    const startTime = Date.now();
-    logger.info('[HourlyAggregation] Starting full refresh/backfill from 10-min data...');
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[HourlyAggregation] Database not available, skipping aggregation');
-        return;
-      }
-
-      const currentHourStart = this.getCurrentHourStart();
-      await this.databaseService.markHoursComplete(currentHourStart);
-
-      const recordsAggregated = await this.databaseService.aggregate10MinToHourly();
-
-      if (recordsAggregated > 0) {
-        await this.databaseService.pool?.query(
-          `UPDATE hourly_volumes SET is_complete = true 
-           WHERE hour < $1 AND is_complete = false`,
-          [currentHourStart]
-        );
-        logger.info(`[HourlyAggregation] Aggregated ${recordsAggregated} hourly records from 10-min data`);
-      } else {
-        logger.info('[HourlyAggregation] No 10-minute data available for aggregation');
-      }
-
-      this.lastRefreshTime = new Date();
-      const duration = Date.now() - startTime;
-      logger.info(`[HourlyAggregation] Refresh completed in ${duration}ms`);
-    } catch (error: any) {
-      logger.error('[HourlyAggregation] Error during refresh', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-
-  /**
-   * Normalize hour timestamp to consistent ISO format
-   */
-  private normalizeHourTimestamp(hour: string): string {
-    // Dune may return different formats, normalize to ISO
-    const date = new Date(hour);
-    return date.toISOString();
-  }
-
-  /**
-   * Get the start of the current hour as ISO string
-   */
-  private getCurrentHourStart(): string {
-    const now = new Date();
-    now.setMinutes(0, 0, 0);
-    return now.toISOString();
-  }
-
-  /**
-   * Update in-memory cache with hourly data
-   */
-  private updateInMemoryCache(records: HourlyVolumeRecord[]): void {
-    for (const record of records) {
-      let tokenRecords = this.inMemoryHourlyCache.get(record.token);
-      
-      if (!tokenRecords) {
-        tokenRecords = [];
-        this.inMemoryHourlyCache.set(record.token, tokenRecords);
-      }
-
-      // Find and update or add
-      const existingIndex = tokenRecords.findIndex(r => r.hour === record.hour);
-      if (existingIndex >= 0) {
-        tokenRecords[existingIndex] = record;
-      } else {
-        tokenRecords.push(record);
-      }
-    }
-
-    // Prune old data from in-memory cache (keep 48 hours)
-    const cutoffTime = new Date(Date.now() - 48 * 60 * 60 * 1000).toISOString();
-    for (const [token, records] of this.inMemoryHourlyCache.entries()) {
-      const filtered = records.filter(r => r.hour >= cutoffTime);
-      this.inMemoryHourlyCache.set(token, filtered);
-    }
-  }
-
-  /**
-   * Get rolling 24h metrics for tokens
-   * Primary method for serving /api/tickers
-   */
-  async getRolling24hMetrics(tokens?: string[]): Promise<Map<string, Rolling24hMetrics>> {
-    // Try database first
-    if (this.databaseService.isAvailable()) {
-      const dbMetrics = await this.databaseService.getRolling24hMetrics(tokens);
-      if (dbMetrics.size > 0) {
-        return dbMetrics;
-      }
-    }
-
-    // Fall back to in-memory cache
-    return this.calculateRolling24hFromCache(tokens);
-  }
-
-  /**
-   * Calculate rolling 24h from in-memory cache
-   */
-  private calculateRolling24hFromCache(tokens?: string[]): Map<string, Rolling24hMetrics> {
-    const metricsMap = new Map<string, Rolling24hMetrics>();
-    const cutoffTime = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
-
-    const tokensToCheck = tokens
-      ? tokens
-      : Array.from(this.inMemoryHourlyCache.keys());
-
-    for (const tokenLower of tokensToCheck) {
-      const records = this.inMemoryHourlyCache.get(tokenLower);
-      if (!records) continue;
-
-      const recent = records.filter(r => r.hour >= cutoffTime);
-      if (recent.length === 0) continue;
-
-      let baseVolume = 0;
-      let targetVolume = 0;
-      let high = 0;
-      let low = Infinity;
-      let tradeCount = 0;
-
-      for (const record of recent) {
-        baseVolume += parseFloat(record.base_volume) || 0;
-        targetVolume += parseFloat(record.target_volume) || 0;
-        const recordHigh = parseFloat(record.high) || 0;
-        const recordLow = parseFloat(record.low) || Infinity;
-        if (recordHigh > high) high = recordHigh;
-        if (recordLow > 0 && recordLow < low) low = recordLow;
-        tradeCount += record.trade_count || 0;
-      }
-
-      metricsMap.set(tokenLower, {
-        token: tokenLower,
-        base_volume_24h: baseVolume.toFixed(8),
-        target_volume_24h: targetVolume.toFixed(8),
-        high_24h: high > 0 ? high.toFixed(12) : '0',
-        low_24h: low < Infinity ? low.toFixed(12) : '0',
-        trade_count_24h: tradeCount,
-      });
-    }
-
-    return metricsMap;
-  }
-
-  /**
-   * Force an immediate refresh
-   */
-  async forceRefresh(): Promise<void> {
-    logger.info('[HourlyAggregation] Force refresh requested');
-    await this.refresh();
-  }
-
-  /**
-   * Get service status
-   */
-  async getStatus(): Promise<HourlyAggregationStatus> {
-    const latestHour = this.databaseService.isAvailable()
-      ? await this.databaseService.getLatestHour()
-      : null;
-    const latestCompleteHour = this.databaseService.isAvailable()
-      ? await this.databaseService.getLatestCompleteHour()
-      : null;
-    const tokenCount = this.databaseService.isAvailable()
-      ? await this.databaseService.getHourlyTokenCount()
-      : this.inMemoryHourlyCache.size;
-    const recordCount = this.databaseService.isAvailable()
-      ? await this.databaseService.getHourlyRecordCount()
-      : Array.from(this.inMemoryHourlyCache.values()).reduce((sum, records) => sum + records.length, 0);
-
-    return {
-      isInitialized: this._isInitialized,
-      databaseConnected: this.databaseService.isAvailable(),
-      latestHour,
-      latestCompleteHour,
-      tokenCount,
-      recordCount,
-      lastRefreshTime: this.lastRefreshTime,
-      isRefreshing: this.isRefreshing,
-      hourlyQueryId: null, // Deprecated - now uses DB aggregation from 10-minute data
-      schedule: {
-        hourlyRefresh: ':01 past each hour',
-        tenMinRefresh: 'every 10 minutes (:00, :10, :20, :30, :40, :50)',
-        queriesPerDay: 24 + 144, // 168 queries/day
-      },
-    };
-  }
-}
diff --git a/src/services/launchpadService.ts b/src/services/launchpadService.ts
index 7ae5fee..8b297dd 100644
--- a/src/services/launchpadService.ts
+++ b/src/services/launchpadService.ts
@@ -1,5 +1,5 @@
 import { Connection, PublicKey, Keypair } from '@solana/web3.js';
-import { AnchorProvider, Wallet, Program } from '@coral-xyz/anchor';
+import { AnchorProvider, Wallet } from '@coral-xyz/anchor';
 import {
   LaunchpadClient as LaunchpadClientV06,
   getLaunchSignerAddr,
@@ -16,6 +16,7 @@ import {
   LAUNCHPAD_V0_7_MAINNET_METEORA_CONFIG as MAINNET_METEORA_CONFIG_V07,
 } from "@metadaoproject/programs";
 import { getAccount, getAssociatedTokenAddress } from '@solana/spl-token';
+import { isTokenAccountAbsent } from '../utils/solanaErrors.js';
 import { config } from '../config.js';
 import BN from 'bn.js';
 import { logger } from '../utils/logger.js';
@@ -84,27 +85,13 @@ export interface LaunchData {
   additionalTokensClaimed?: boolean;
 }
 
-export type LaunchState = 
+export type LaunchState =
   | { initialized: Record<string, never> }
   | { active: Record<string, never> }
   | { closed: Record<string, never> }
   | { completed: Record<string, never> }
   | { cancelled: Record<string, never> };
 
-export interface PerformancePackageData {
-  performancePackageAddress: PublicKey;
-  totalTokenAmount: BN;
-  alreadyUnlockedAmount: BN;
-  recipient: PublicKey;
-  tokenMint: PublicKey;
-  state: PerformancePackageState;
-}
-
-export type PerformancePackageState = 
-  | { locked: Record<string, never> }
-  | { unlocking: { startAggregator: BN; startTimestamp: BN } }
-  | { unlocked: Record<string, never> };
-
 export class LaunchpadService {
   private connection: Connection;
   private clientV06: LaunchpadClientV06;
@@ -134,18 +121,6 @@ export class LaunchpadService {
     this.cache = new Map();
   }
 
-  /**
-   * Detect the launchpad version for a launch based on account fields.
-   * v0.7 launches have additionalTokensAmount field.
-   */
-  private detectLaunchVersion(launch: any): LaunchpadVersion {
-    // v0.7 has additionalTokensAmount and additionalTokensRecipient fields
-    if ('additionalTokensAmount' in launch || 'additionalTokensRecipient' in launch) {
-      return 'v0.7';
-    }
-    return 'v0.6';
-  }
-
   private getCached<T>(key: string, ttl: number): T | null {
     const cached = this.cache.get(key);
     if (cached && Date.now() - cached.timestamp < ttl) {
@@ -188,59 +163,21 @@ export class LaunchpadService {
         return { launch, version };
       }
     } catch (error: any) {
+      // ONLY a genuinely-absent account means "no launch of this version" → null
+      // (the caller then tries the other version, and a token with no launch at all
+      // correctly gets an empty allocation breakdown). ANY OTHER error (RPC /
+      // network / timeout) MUST propagate: a silent null here makes
+      // getTokenAllocationBreakdown treat a launched token as un-launched → ZERO
+      // locked allocations → circulating supply = total supply (hugely overstated
+      // market cap on a transient RPC blip).
       if (!error.message?.includes('Account does not exist')) {
         logger.info(`[Launchpad] Error fetching ${version} launch at ${launchAddress.toString()}: ${error.message}`);
+        throw error;
       }
     }
     return null;
   }
 
-  /**
-   * Fetch a Launch account by its address
-   * Tries v0.7 first, falls back to v0.6 for older launches
-   */
-  async getLaunch(launchAddress: PublicKey): Promise<LaunchData | null> {
-    const cacheKey = `launch_${launchAddress.toString()}`;
-    const cached = this.getCached<LaunchData>(cacheKey, config.cache.tickersTTL * 10);
-    if (cached) return cached;
-
-    try {
-      // Try v0.7 first, then v0.6
-      let result = await this.fetchLaunchFromProgram(launchAddress, 'v0.7');
-      if (!result) {
-        result = await this.fetchLaunchFromProgram(launchAddress, 'v0.6');
-      }
-      
-      if (!result) {
-        return null;
-      }
-
-      const { launch, version } = result;
-
-      const launchData: LaunchData = {
-        launchAddress,
-        baseMint: launch.baseMint,
-        performancePackageGrantee: launch.performancePackageGrantee,
-        performancePackageTokenAmount: new BN(launch.performancePackageTokenAmount.toString()),
-        state: launch.state as LaunchState,
-        dao: launch.dao || undefined,
-        version,
-        // v0.7 specific fields
-        additionalTokensAmount: launch.additionalTokensAmount 
-          ? new BN(launch.additionalTokensAmount.toString()) 
-          : undefined,
-        additionalTokensRecipient: launch.additionalTokensRecipient || undefined,
-        additionalTokensClaimed: launch.additionalTokensClaimed || undefined,
-      };
-
-      this.setCache(cacheKey, launchData);
-      return launchData;
-    } catch (error) {
-      logger.error(`Error fetching launch ${launchAddress.toString()}`, error);
-      return null;
-    }
-  }
-
   /**
    * Fetch a Launch account by the token's base mint address
    * Tries v0.7 program first (newer launches), then falls back to v0.6
@@ -292,108 +229,6 @@ export class LaunchpadService {
     return launchData;
   }
 
-  /**
-   * Fetch all Launch accounts from both v0.6 and v0.7 programs
-   */
-  async getAllLaunches(): Promise<LaunchData[]> {
-    const cacheKey = 'all_launches';
-    const cached = this.getCached<LaunchData[]>(cacheKey, config.cache.tickersTTL);
-    if (cached) return cached;
-
-    try {
-      const launches: LaunchData[] = [];
-      const seenAddresses = new Set<string>();
-
-      // Fetch from v0.7 program first (includes all fields)
-      try {
-        const v07Accounts = await this.clientV07.launchpad.account.launch.all();
-        for (const account of v07Accounts) {
-          const launch = account.account;
-          const version = this.detectLaunchVersion(launch);
-          seenAddresses.add(account.publicKey.toString());
-          launches.push({
-            launchAddress: account.publicKey,
-            baseMint: launch.baseMint,
-            performancePackageGrantee: launch.performancePackageGrantee,
-            performancePackageTokenAmount: new BN(launch.performancePackageTokenAmount.toString()),
-            state: launch.state as LaunchState,
-            dao: launch.dao || undefined,
-            version,
-            additionalTokensAmount: (launch as any).additionalTokensAmount 
-              ? new BN((launch as any).additionalTokensAmount.toString()) 
-              : undefined,
-            additionalTokensRecipient: (launch as any).additionalTokensRecipient || undefined,
-            additionalTokensClaimed: (launch as any).additionalTokensClaimed || undefined,
-          });
-        }
-      } catch (error) {
-        logger.warn('[Launchpad] Error fetching v0.7 launches', { error: error instanceof Error ? error.message : String(error) });
-      }
-
-      // Fetch from v0.6 program (older launches)
-      try {
-        const v06Accounts = await this.clientV06.launchpad.account.launch.all();
-        for (const account of v06Accounts) {
-          // Skip if already seen from v0.7
-          if (seenAddresses.has(account.publicKey.toString())) {
-            continue;
-          }
-          const launch = account.account;
-          launches.push({
-            launchAddress: account.publicKey,
-            baseMint: launch.baseMint,
-            performancePackageGrantee: launch.performancePackageGrantee,
-            performancePackageTokenAmount: new BN(launch.performancePackageTokenAmount.toString()),
-            state: launch.state as LaunchState,
-            dao: launch.dao || undefined,
-            version: 'v0.6',
-          });
-        }
-      } catch (error) {
-        logger.warn('[Launchpad] Error fetching v0.6 launches', { error: error instanceof Error ? error.message : String(error) });
-      }
-
-      this.setCache(cacheKey, launches);
-      return launches;
-    } catch (error) {
-      logger.error('[Launchpad] Error fetching all launches', error);
-      return [];
-    }
-  }
-
-  /**
-   * Fetch a PerformancePackage account by its address
-   */
-  async getPerformancePackage(performancePackageAddress: PublicKey): Promise<PerformancePackageData | null> {
-    const cacheKey = `performance_package_${performancePackageAddress.toString()}`;
-    const cached = this.getCached<PerformancePackageData>(cacheKey, config.cache.tickersTTL * 10);
-    if (cached) return cached;
-
-    try {
-      // Try v0.7 first, then v0.6
-      const pkgV07 = await this.clientV07.priceBasedUnlock.getPerformancePackage(performancePackageAddress);
-      const pkg = pkgV07 ?? await this.clientV06.priceBasedUnlock.getPerformancePackage(performancePackageAddress);
-      if (!pkg) {
-        return null;
-      }
-
-      const packageData: PerformancePackageData = {
-        performancePackageAddress,
-        totalTokenAmount: pkg.totalTokenAmount,
-        alreadyUnlockedAmount: pkg.alreadyUnlockedAmount,
-        recipient: pkg.recipient,
-        tokenMint: pkg.tokenMint,
-        state: pkg.state as PerformancePackageState,
-      };
-
-      this.setCache(cacheKey, packageData);
-      return packageData;
-    } catch (error) {
-      logger.error(`[Launchpad] Error fetching performance package ${performancePackageAddress.toString()}`, error);
-      return null;
-    }
-  }
-
   /**
    * Derive the performance package address for a given launch (v0.6 style).
    * The createKey used during completeLaunch is the launch signer.
@@ -507,7 +342,10 @@ export class LaunchpadService {
 
       return { amount, vaultAddress };
     } catch (error) {
-      logger.error(`[Launchpad] Error fetching FutarchyAMM liquidity for DAO ${daoAddress.toString()}`, error);
+      // Only treat a genuinely-absent vault as 0 liquidity. An RPC failure here
+      // would UNDERCOUNT locked AMM liquidity → OVERSTATE circulating supply →
+      // wrong market cap, so it must propagate (the supply endpoint errors out).
+      if (!isTokenAccountAbsent(error)) throw error;
       return { amount: new BN(0) };
     }
   }
@@ -545,9 +383,10 @@ export class LaunchpadService {
       logger.info(`[Meteora] Found ${amount.toString()} tokens in Meteora ${version} pool`);
       return { amount, poolAddress, vaultAddress };
     } catch (error: any) {
-      logger.info(`[Meteora] ${version} pool lookup failed for ${baseMint.toString()}: ${error.message || 'Unknown error'}`);
-      
-      // If we tried v0.7 and failed, don't try v0.6 as fallback - the version is determined by the launch
+      // Genuinely-absent pool vault → 0 LP is correct. An RPC failure must NOT be
+      // read as 0 (it would overstate circulating supply / market cap) → propagate.
+      if (!isTokenAccountAbsent(error)) throw error;
+      logger.info(`[Meteora] ${version} pool not present for ${baseMint.toString()} — 0 LP`);
       return { amount: new BN(0) };
     }
   }
@@ -576,242 +415,146 @@ export class LaunchpadService {
       totalNonCirculating: new BN(0),
     };
 
-    try {
-      const launch = await this.getLaunchByBaseMint(baseMint);
-      if (!launch) {
-        // Token was not launched via launchpad
-        return emptyBreakdown;
-      }
+    // No catch-all below: an empty breakdown is returned ONLY for the two
+    // genuinely-empty cases (token never launched / launch not completed).
+    // Every infrastructure failure (RPC, network, timeout) propagates to the
+    // caller — swallowing it here would zero out every locked allocation and
+    // serve circulating supply = total supply on a transient outage, which is
+    // the exact mispricing the isTokenAccountAbsent contract exists to prevent.
+    const launch = await this.getLaunchByBaseMint(baseMint);
+    if (!launch) {
+      // Token was not launched via launchpad
+      return emptyBreakdown;
+    }
 
-      if (!launch.dao) {
-        // Launch not yet completed
-        return {
-          ...emptyBreakdown,
-          version: launch.version,
-          launchAddress: launch.launchAddress,
-        };
-      }
+    if (!launch.dao) {
+      // Launch not yet completed
+      return {
+        ...emptyBreakdown,
+        version: launch.version,
+        launchAddress: launch.launchAddress,
+      };
+    }
+
+    // Get DAO to find quote mint
+    const dao = await this.futarchyClient.fetchDao(launch.dao);
+    const quoteMint = dao?.quoteMint;
+
+    // Derive the performance package address and fetch its actual on-chain token balance
+    // We use the live balance rather than launch.performancePackageTokenAmount because
+    // tokens may have been unlocked/claimed (e.g. ZKFG, Loyal), making the configured
+    // amount stale and over-subtracting from circulating supply.
+    const performancePackageAddress = this.getPerformancePackageAddress(
+      launch.launchAddress, 
+      launch.version
+    );
 
-      // Get DAO to find quote mint
-      const dao = await this.futarchyClient.fetchDao(launch.dao);
-      const quoteMint = dao?.quoteMint;
-
-      // Derive the performance package address and fetch its actual on-chain token balance
-      // We use the live balance rather than launch.performancePackageTokenAmount because
-      // tokens may have been unlocked/claimed (e.g. ZKFG, Loyal), making the configured
-      // amount stale and over-subtracting from circulating supply.
-      const performancePackageAddress = this.getPerformancePackageAddress(
-        launch.launchAddress, 
-        launch.version
+    let performancePackageLockedAmount = new BN(0);
+    try {
+      const ppAta = await getAssociatedTokenAddress(
+        baseMint,
+        performancePackageAddress,
+        true
       );
+      const ppTokenAccount = await getAccount(this.connection, ppAta);
+      performancePackageLockedAmount = new BN(ppTokenAccount.amount.toString());
+      logger.info(`[Launchpad] Performance package at ${performancePackageAddress.toString()} holds ${performancePackageLockedAmount.toString()} tokens (configured: ${launch.performancePackageTokenAmount.toString()})`);
+    } catch (error: any) {
+      // Account genuinely absent → all tokens unlocked/claimed → 0 locked (correct).
+      // An RPC failure must propagate: treating it as 0 locked would OVERSTATE
+      // circulating supply (the live-balance approach exists precisely to avoid
+      // mis-subtracting — so a silent 0 on outage is the exact failure to avoid).
+      if (!isTokenAccountAbsent(error)) throw error;
+      logger.info(`[Launchpad] Performance package token account not found for ${performancePackageAddress.toString()}, 0 locked`);
+    }
+
+    // Get FutarchyAMM liquidity
+    const futarchyAmm = await this.getFutarchyAmmLiquidity(launch.dao);
 
-      let performancePackageLockedAmount = new BN(0);
+    // Get Meteora LP liquidity (if quote mint is available)
+    // Use the correct Meteora config based on launch version
+    let meteoraLp: { amount: BN; poolAddress?: PublicKey; vaultAddress?: PublicKey } = { amount: new BN(0) };
+    if (quoteMint) {
+      meteoraLp = await this.getMeteoraLpLiquidity(baseMint, quoteMint, launch.version);
+    }
+
+    // Handle additional token allocation (v0.7+ only)
+    let additionalTokenAllocation: AdditionalTokenAllocation | undefined;
+    if (launch.version === 'v0.7' && launch.additionalTokensRecipient && launch.additionalTokensAmount) {
+      // Get the token account address for the additional tokens recipient
+      let tokenAccountAddress: PublicKey | undefined;
       try {
-        const ppAta = await getAssociatedTokenAddress(
+        tokenAccountAddress = await getAssociatedTokenAddress(
           baseMint,
-          performancePackageAddress,
-          true
+          launch.additionalTokensRecipient
         );
-        const ppTokenAccount = await getAccount(this.connection, ppAta);
-        performancePackageLockedAmount = new BN(ppTokenAccount.amount.toString());
-        logger.info(`[Launchpad] Performance package at ${performancePackageAddress.toString()} holds ${performancePackageLockedAmount.toString()} tokens (configured: ${launch.performancePackageTokenAmount.toString()})`);
-      } catch (error: any) {
-        // Token account doesn't exist or is empty — all tokens unlocked/claimed
-        logger.info(`[Launchpad] Performance package token account not found for ${performancePackageAddress.toString()}, assuming 0 locked: ${error.message}`);
+      } catch (error) {
+        logger.warn(`[Launchpad] Could not derive additional tokens account for ${launch.additionalTokensRecipient.toString()}`);
       }
 
-      // Get FutarchyAMM liquidity
-      const futarchyAmm = await this.getFutarchyAmmLiquidity(launch.dao);
-
-      // Get Meteora LP liquidity (if quote mint is available)
-      // Use the correct Meteora config based on launch version
-      let meteoraLp: { amount: BN; poolAddress?: PublicKey; vaultAddress?: PublicKey } = { amount: new BN(0) };
-      if (quoteMint) {
-        meteoraLp = await this.getMeteoraLpLiquidity(baseMint, quoteMint, launch.version);
-      }
+      additionalTokenAllocation = {
+        recipient: launch.additionalTokensRecipient,
+        amount: launch.additionalTokensAmount,
+        claimed: launch.additionalTokensClaimed || false,
+        tokenAccountAddress,
+      };
+    }
 
-      // Handle additional token allocation (v0.7+ only)
-      let additionalTokenAllocation: AdditionalTokenAllocation | undefined;
-      if (launch.version === 'v0.7' && launch.additionalTokensRecipient && launch.additionalTokensAmount) {
-        // Get the token account address for the additional tokens recipient
-        let tokenAccountAddress: PublicKey | undefined;
-        try {
-          tokenAccountAddress = await getAssociatedTokenAddress(
-            baseMint,
-            launch.additionalTokensRecipient
-          );
-        } catch (error) {
-          logger.warn(`[Launchpad] Could not derive additional tokens account for ${launch.additionalTokensRecipient.toString()}`);
-        }
-
-        additionalTokenAllocation = {
-          recipient: launch.additionalTokensRecipient,
-          amount: launch.additionalTokensAmount,
-          claimed: launch.additionalTokensClaimed || false,
-          tokenAccountAddress,
+    // Get DAO treasury base token balance (tokens held by the squads vault)
+    let daoTreasuryTokens: { amount: BN; vaultAddress?: PublicKey } = { amount: new BN(0) };
+    if (dao && (dao as any).squadsMultisigVault) {
+      try {
+        const vaultAddress = new PublicKey((dao as any).squadsMultisigVault);
+        const vaultAta = await getAssociatedTokenAddress(baseMint, vaultAddress, true);
+        const tokenAccount = await getAccount(this.connection, vaultAta);
+        daoTreasuryTokens = {
+          amount: new BN(tokenAccount.amount.toString()),
+          vaultAddress,
         };
+        logger.info(`[Launchpad] DAO treasury holds ${daoTreasuryTokens.amount.toString()} base tokens in vault ${vaultAddress.toString()}`);
+      } catch (error: any) {
+        // Genuinely-absent treasury ATA → 0 treasury tokens (correct). An RPC
+        // failure must propagate (a silent 0 here overstates circulating supply).
+        if (!isTokenAccountAbsent(error)) throw error;
+        logger.info(`[Launchpad] No base token account in DAO treasury vault`);
       }
-
-      // Get DAO treasury base token balance (tokens held by the squads vault)
-      let daoTreasuryTokens: { amount: BN; vaultAddress?: PublicKey } = { amount: new BN(0) };
-      if (dao && (dao as any).squadsMultisigVault) {
-        try {
-          const vaultAddress = new PublicKey((dao as any).squadsMultisigVault);
-          const vaultAta = await getAssociatedTokenAddress(baseMint, vaultAddress, true);
-          const tokenAccount = await getAccount(this.connection, vaultAta);
-          daoTreasuryTokens = {
-            amount: new BN(tokenAccount.amount.toString()),
-            vaultAddress,
-          };
-          logger.info(`[Launchpad] DAO treasury holds ${daoTreasuryTokens.amount.toString()} base tokens in vault ${vaultAddress.toString()}`);
-        } catch (error: any) {
-          logger.info(`[Launchpad] No base token account in DAO treasury vault: ${error.message}`);
-        }
-      }
-
-      // Calculate total non-circulating supply using live on-chain balance
-      let totalNonCirculating = performancePackageLockedAmount;
-      
-      // Add additional tokens if not yet claimed (they're still locked)
-      if (additionalTokenAllocation && !additionalTokenAllocation.claimed) {
-        totalNonCirculating = totalNonCirculating.add(additionalTokenAllocation.amount);
-      }
-
-      // Add DAO treasury tokens (protocol-controlled, not circulating)
-      totalNonCirculating = totalNonCirculating.add(daoTreasuryTokens.amount);
-
-      const breakdown: TokenAllocationBreakdown = {
-        version: launch.version,
-        teamPerformancePackage: {
-          amount: performancePackageLockedAmount,
-          address: performancePackageAddress,
-        },
-        futarchyAmmLiquidity: {
-          amount: futarchyAmm.amount,
-          vaultAddress: futarchyAmm.vaultAddress,
-        },
-        meteoraLpLiquidity: {
-          amount: meteoraLp.amount,
-          poolAddress: meteoraLp.poolAddress,
-          vaultAddress: meteoraLp.vaultAddress,
-        },
-        additionalTokenAllocation,
-        daoTreasuryTokens,
-        daoAddress: launch.dao,
-        launchAddress: launch.launchAddress,
-        totalNonCirculating,
-      };
-
-      this.setCache(cacheKey, breakdown);
-      return breakdown;
-    } catch (error) {
-      logger.error(`Error getting token allocation breakdown for ${baseMint.toString()}`, error);
-      return emptyBreakdown;
     }
-  }
-
 
-  /**
-   * Build a map of baseMint -> lockedAmount for all launched tokens
-   * Includes performance package + unclaimed additional tokens
-   * More efficient when you need to check multiple tokens
-   */
-  async buildLockedAmountsMap(): Promise<Map<string, BN>> {
-    const cacheKey = 'locked_amounts_map';
-    const cached = this.getCached<Map<string, BN>>(cacheKey, config.cache.tickersTTL);
-    if (cached) return cached;
-
-    const lockedAmountsMap = new Map<string, BN>();
+    // Calculate total non-circulating supply using live on-chain balance
+    let totalNonCirculating = performancePackageLockedAmount;
     
-    try {
-      const allLaunches = await this.getAllLaunches();
-      
-      for (const launch of allLaunches) {
-        // Only include completed launches (those with a DAO set)
-        if (launch.dao) {
-          let totalLocked = launch.performancePackageTokenAmount;
-          
-          // Add unclaimed additional tokens (v0.7+ only)
-          if (launch.version === 'v0.7' && 
-              launch.additionalTokensAmount && 
-              !launch.additionalTokensClaimed) {
-            totalLocked = totalLocked.add(launch.additionalTokensAmount);
-          }
-          
-          lockedAmountsMap.set(
-            launch.baseMint.toString(),
-            totalLocked
-          );
-        }
-      }
-
-      this.setCache(cacheKey, lockedAmountsMap);
-      return lockedAmountsMap;
-    } catch (error) {
-      logger.error('Error building locked amounts map', error);
-      return lockedAmountsMap;
+    // Add additional tokens if not yet claimed (they're still locked)
+    if (additionalTokenAllocation && !additionalTokenAllocation.claimed) {
+      totalNonCirculating = totalNonCirculating.add(additionalTokenAllocation.amount);
     }
-  }
 
-  /**
-   * Get detailed locked amounts breakdown including additional token allocations
-   */
-  async buildLockedAmountsDetailedMap(): Promise<Map<string, {
-    performancePackage: BN;
-    additionalTokens?: {
-      amount: BN;
-      recipient: PublicKey;
-      claimed: boolean;
+    // Add DAO treasury tokens (protocol-controlled, not circulating)
+    totalNonCirculating = totalNonCirculating.add(daoTreasuryTokens.amount);
+
+    const breakdown: TokenAllocationBreakdown = {
+      version: launch.version,
+      teamPerformancePackage: {
+        amount: performancePackageLockedAmount,
+        address: performancePackageAddress,
+      },
+      futarchyAmmLiquidity: {
+        amount: futarchyAmm.amount,
+        vaultAddress: futarchyAmm.vaultAddress,
+      },
+      meteoraLpLiquidity: {
+        amount: meteoraLp.amount,
+        poolAddress: meteoraLp.poolAddress,
+        vaultAddress: meteoraLp.vaultAddress,
+      },
+      additionalTokenAllocation,
+      daoTreasuryTokens,
+      daoAddress: launch.dao,
+      launchAddress: launch.launchAddress,
+      totalNonCirculating,
     };
-    totalLocked: BN;
-    version: LaunchpadVersion;
-  }>> {
-    const cacheKey = 'locked_amounts_detailed_map';
-    const cached = this.getCached<Map<string, any>>(cacheKey, config.cache.tickersTTL);
-    if (cached) return cached;
 
-    const detailedMap = new Map<string, any>();
-    
-    try {
-      const allLaunches = await this.getAllLaunches();
-      
-      for (const launch of allLaunches) {
-        // Only include completed launches (those with a DAO set)
-        if (launch.dao) {
-          let totalLocked = launch.performancePackageTokenAmount;
-          
-          const entry: any = {
-            performancePackage: launch.performancePackageTokenAmount,
-            version: launch.version,
-          };
-          
-          // Add additional tokens info (v0.7+ only)
-          if (launch.version === 'v0.7' && 
-              launch.additionalTokensAmount && 
-              launch.additionalTokensRecipient) {
-            entry.additionalTokens = {
-              amount: launch.additionalTokensAmount,
-              recipient: launch.additionalTokensRecipient,
-              claimed: launch.additionalTokensClaimed || false,
-            };
-            
-            // Only add to locked total if not claimed
-            if (!launch.additionalTokensClaimed) {
-              totalLocked = totalLocked.add(launch.additionalTokensAmount);
-            }
-          }
-          
-          entry.totalLocked = totalLocked;
-          detailedMap.set(launch.baseMint.toString(), entry);
-        }
-      }
-
-      this.setCache(cacheKey, detailedMap);
-      return detailedMap;
-    } catch (error) {
-      logger.error('Error building detailed locked amounts map', error);
-      return detailedMap;
-    }
+  this.setCache(cacheKey, breakdown);
+  return breakdown;
   }
 }
 
diff --git a/src/services/meteoraService.ts b/src/services/meteoraService.ts
deleted file mode 100644
index 7ce707d..0000000
--- a/src/services/meteoraService.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Meteora Service
- * 
- * Provides mapping from Meteora pool owner addresses to token (baseMint) addresses.
- * This mapping is used to normalize Meteora pool data to match existing table structures.
- *
- * Keep `src/schema/dune-meteora-volumes.sql` in sync: every tracked pool must appear in
- * `target_pools` + `pool_map` there, or Dune will never return rows for that LP.
- *
- * DAMM v2 pool addresses for base/USDC use the v0.6 Meteora config (same as existing
- * tracked launches in the Dune query); v0.7 config yields a different pool PDA.
- */
-
-/**
- * Mapping from Meteora pool owner addresses to token (baseMint) addresses
- * 
- * The owner addresses correspond to the DAOs that have Meteora LP positions:
- * - Umbra, Ranger, Paystream, Loyal, Avici, ZKFG, Solomon, Superclaw, Futardio cult, Omnipair
- * 
- */
-export const METEORA_OWNER_TO_TOKEN_MAP: Map<string, string> = new Map([
-  // Umbra
-  ['6vsc8pukkxm5xo54c2vbraasfqipkpghqnuktxxfysx6', 'PRVT6TB7uss3FrUd2D9xs2zqDBsa3GbMJMwCQsgmeta'],
-  // Ranger
-  ['55h1q1yrhjq93uhg4jqrbbhx3a8h7tcm8kvf2um2g5q3', 'RNGRtJMbCveqCp7AC6U95KmrdKecFckaJZiWbPGmeta'],
-  // Paystream
-  ['bpxtb2asf2tft97ewtd8payxcqfq6wqod33qrwwfk9vz', 'PAYZP1W3UmdEsNLJwmH61TNqACYJTvhXy8SCN4Tmeta'],
-  // Loyal
-  ['aqyytwckemeemu8zpzfxrxmbvwaytsbbhi1w4pbrhvye', 'LYLikzBQtpa9ZgVrJsqYGQpR3cC1WMJrBHaXGrQmeta'],
-  // Avici
-  ['dggyoucu1adzt4gel5nqiducwhrgbkmwsuzsxh2j622g', 'BANKJmvhT8tiJRsBSS1n2HryMBPvT5Ze4HU95DUAmeta'],
-  // ZKFG
-  ['bnvdfxyg2faybdyd71xr9ghke18mbmhtjslkscuxho6z', 'ZKFHiLAfAFMTcDAuCtjNW54VzpERvoe7PBF9mYgmeta'],
-  // Solomon
-  ['98spcyuz2rqm2dgjcqqsxs4gjrntlsnuaavcf38xyj9u', 'SoLo9oxzLDpcq1dpqAgMwgce5WqkRDtNXK7EPnbmeta'],
-  // Omnipair
-  ['8s6Jdoh7tgUqmU3D2EmpNJHSvuN5U4NybpLAdsiMitwB', 'omfgRBnxHsNJh6YeGbGAmWenNkenzsXyBXm3WDhmeta'],
-  // Superclaw
-  ['5ZPnwQDU7dEKdMGqaY5oCQkiuQpwjtYSJNMNpiStTNvU', '5TbDn1dFEcUTJp69Fxnu5wbwNec6LmoK42Sr5mmNmeta'],
-  // Futardio cult
-  ['FeMyhpB3LJuuuA1oLzXFDuZ48EJz46gyyk3w2xuQA8uw', 'Cbjr1Nvcay3QWDriyRKtokJ7V4PMknesGxeK8z7Zmeta'],
-  // P2P Protocol
-  ['9Rykf7i9fxUaXD8iD6GSGpRaoWQQP51Uiq1oxSE9oDzx', 'P2PXup1ZvMpCDkJn3PQxtBYgxeCSfH39SFeurGSmeta'],
-]);
-
-/** Distinct base mints we attribute Meteora fee rows to (one per tracked LP owner). */
-export function getAllMappedTokens(): string[] {
-  return [...new Set(METEORA_OWNER_TO_TOKEN_MAP.values())];
-}
-
-/**
- * Get token address (baseMint) for a given Meteora owner address
- * @param ownerAddress The Meteora pool owner address
- * @returns The token (baseMint) address, or null if not found
- */
-export function getTokenForOwner(ownerAddress: string): string | null {
-  const normalizedOwner = ownerAddress.toLowerCase();
-  const token = Array.from(METEORA_OWNER_TO_TOKEN_MAP.entries()).find(([owner, _]) => owner.toLowerCase() === normalizedOwner)?.[1];
-  return token || null;
-}
-
-/**
- * Get all known owner addresses
- * @returns Array of owner addresses
- */
-export function getAllOwners(): string[] {
-  return Array.from(METEORA_OWNER_TO_TOKEN_MAP.keys()).map(owner => owner.toLowerCase());
-}
-
-/**
- * Check if an owner address is known
- * @param ownerAddress The owner address to check
- * @returns True if the owner is in the mapping
- */
-export function isKnownOwner(ownerAddress: string): boolean {
-  return Array.from(METEORA_OWNER_TO_TOKEN_MAP.entries()).find(([owner, _]) => owner.toLowerCase() === ownerAddress.toLowerCase()) !== undefined;
-}
diff --git a/src/services/meteoraVolumeFetcherService.ts b/src/services/meteoraVolumeFetcherService.ts
deleted file mode 100644
index b65443f..0000000
--- a/src/services/meteoraVolumeFetcherService.ts
+++ /dev/null
@@ -1,419 +0,0 @@
-/**
- * MeteoraVolumeFetcherService
- * 
- * Fetches daily Meteora pool fees and volumes from Dune API per owner (mapped to token).
- * Stores data in PostgreSQL.
- * Cumulative values are calculated in the database, not from Dune.
- * 
- * Schedule: Daily at 00:00 UTC (midnight)
- */
-
-import { config } from '../config.js';
-import { DuneService } from './duneService.js';
-import { DatabaseService, DailyMeteoraVolumeRecord } from './databaseService.js';
-import { getTokenForOwner } from './meteoraService.js';
-import { logger } from '../utils/logger.js';
-
-export class MeteoraVolumeFetcherService {
-  private duneService: DuneService;
-  private databaseService: DatabaseService;
-  private initialized: boolean = false;
-  private refreshTimer: NodeJS.Timeout | null = null;
-  private isRefreshing: boolean = false;
-
-  constructor(
-    duneService: DuneService,
-    databaseService: DatabaseService
-  ) {
-    this.duneService = duneService;
-    this.databaseService = databaseService;
-  }
-
-  /**
-   * Initialize the service - check database for existing data
-   */
-  async initialize(): Promise<void> {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[MeteoraVolume] Database not connected - service disabled');
-      return;
-    }
-
-    logger.info('[MeteoraVolume] Initializing daily Meteora volume service...');
-
-    try {
-      const recordCount = await this.databaseService.getMeteoraRecordCount();
-      logger.info(`[MeteoraVolume] Current record count in database: ${recordCount}`);
-
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Service initialized with existing database records.');
-      } else {
-        logger.info('[MeteoraVolume] No existing data - performing initial backfill...');
-        await this.backfillFromStart();
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Initialization complete with backfill.');
-      }
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Error during initialization:', error);
-      const recordCount = await this.databaseService.getMeteoraRecordCount();
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[MeteoraVolume] Serving existing data despite initialization error.');
-      }
-    }
-  }
-
-  /**
-   * Start the scheduled refresh process
-   */
-  start(): void {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[MeteoraVolume] Service not starting - database not available');
-      return;
-    }
-
-    logger.info('[MeteoraVolume] Starting daily Meteora volume service...');
-    this.refresh().catch(err => {
-      logger.error('[MeteoraVolume] Background refresh error', err);
-    });
-
-    this.scheduleDailyRefresh();
-    logger.info('[MeteoraVolume] Service started - will refresh daily at 00:00 UTC');
-  }
-
-  /**
-   * Stop the service
-   */
-  stop(): void {
-    if (this.refreshTimer) {
-      clearTimeout(this.refreshTimer);
-      this.refreshTimer = null;
-    }
-    logger.info('[MeteoraVolume] Service stopped');
-  }
-
-  /**
-   * Schedule the next refresh at 00:00 UTC (midnight)
-   */
-  private scheduleDailyRefresh(): void {
-    const now = new Date();
-    const nextRefresh = new Date(now);
-    
-    // Set to 00:00 UTC (midnight)
-    nextRefresh.setUTCHours(0, 0, 0, 0);
-    
-    // If we're past midnight today, schedule for tomorrow
-    if (now >= nextRefresh) {
-      nextRefresh.setUTCDate(nextRefresh.getUTCDate() + 1);
-    }
-
-    const msUntilRefresh = nextRefresh.getTime() - now.getTime();
-    logger.info(`[MeteoraVolume] Next refresh scheduled for ${nextRefresh.toISOString()} (in ${Math.round(msUntilRefresh / 60000)} minutes)`);
-
-    this.refreshTimer = setTimeout(async () => {
-      await this.refresh();
-      // Re-schedule for the next day
-      this.scheduleDailyRefresh();
-    }, msUntilRefresh);
-  }
-
-  /**
-   * Perform incremental refresh - fetch data from Dune
-   */
-  async refresh(): Promise<void> {
-    if (this.isRefreshing) {
-      logger.info('[MeteoraVolume] Refresh already in progress, skipping...');
-      return;
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      if (!this.databaseService.isAvailable()) {
-        logger.info('[MeteoraVolume] Database not available, skipping refresh');
-        return;
-      }
-
-      const lastCompleteDate = await this.databaseService.getLatestMeteoraDate();
-      
-      const startDate = lastCompleteDate 
-        ? this.addDays(lastCompleteDate, 1)
-        : '2025-10-09';
-      
-      // Constrain to today for daily fetches
-      const today = new Date().toISOString().split('T')[0]!;
-      const recordsUpserted = await this.fetchAndStore(startDate, today);
-      
-      await this.databaseService.markMeteoraDaysComplete(today);
-
-      logger.info(`[MeteoraVolume] Refresh completed successfully - ${recordsUpserted} records`);
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Refresh error', error);
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Force a full refresh (useful for manual triggering)
-   */
-  async forceRefresh(): Promise<{ success: boolean; message: string; recordsUpserted?: number }> {
-    if (this.isRefreshing) {
-      return { success: false, message: 'Refresh already in progress' };
-    }
-
-    this.isRefreshing = true;
-
-    try {
-      const lastCompleteDate = await this.databaseService.getLatestMeteoraDate();
-      const startDate = lastCompleteDate 
-        ? this.addDays(lastCompleteDate, 1)
-        : '2025-10-09';
-      
-      // Constrain to today for force refresh
-      const today = new Date().toISOString().split('T')[0]!;
-      const recordsUpserted = await this.fetchAndStore(startDate, today);
-      
-      await this.databaseService.markMeteoraDaysComplete(today);
-
-      this.initialized = true;
-      return { 
-        success: true, 
-        message: `Refresh completed, fetched from ${startDate}`,
-        recordsUpserted 
-      };
-    } catch (error: any) {
-      return { success: false, message: error.message };
-    } finally {
-      this.isRefreshing = false;
-    }
-  }
-
-  /**
-   * Backfill from the very beginning (2025-10-09)
-   */
-  private async backfillFromStart(): Promise<void> {
-    logger.info('[MeteoraVolume] Starting full backfill from Dune...');
-    try {
-      // For full backfill, don't constrain end date - fetch all available data
-      const recordsUpserted = await this.fetchAndStore('2025-10-09');
-      logger.info(`[MeteoraVolume] Backfill complete, upserted ${recordsUpserted} records`);
-      
-      const today = new Date().toISOString().split('T')[0]!;
-      await this.databaseService.markMeteoraDaysComplete(today);
-    } catch (error: any) {
-      logger.error('[MeteoraVolume] Backfill failed', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Public method to fetch data for a specific date range (for chunked backfills)
-   */
-  async fetchDateRange(startDate: string, endDate: string): Promise<number> {
-    return this.fetchAndStore(startDate, endDate);
-  }
-
-  /**
-   * Fetch data from Dune and store in database
-   */
-  private async fetchAndStore(startDate: string, endDate?: string): Promise<number> {
-    if (!config.dune.meteoraVolumeQueryId) {
-      throw new Error('No DUNE_METEORA_VOLUME_QUERY_ID configured');
-    }
-
-    const params: Record<string, any> = {
-      start_date: startDate,
-    };
-    
-    // Only include end_date if it's explicitly provided
-    // If not provided, use sentinel value '9999-12-31' to indicate unconstrained query
-    if (endDate !== undefined) {
-      params.end_date = endDate;
-    } else {
-      params.end_date = '9999-12-31'; // Sentinel value means no constraint
-    }
-
-    logger.info(`[MeteoraVolume] Fetching from Dune query ${config.dune.meteoraVolumeQueryId}`);
-    logger.info(`[MeteoraVolume] Parameters: start_date=${startDate}, end_date=${endDate || '(unconstrained)'}`);
-
-    let result;
-    try {
-      result = await (this.duneService as any).executeQueryManually(
-        config.dune.meteoraVolumeQueryId,
-        params
-      );
-    } catch (duneError: any) {
-      logger.error('[MeteoraVolume] Dune query execution failed', duneError);
-      throw duneError;
-    }
-
-    if (!result) {
-      logger.info('[MeteoraVolume] Dune returned null result');
-      return 0;
-    }
-
-    if (!result.rows) {
-      logger.info('[MeteoraVolume] Dune result has no rows property:', { preview: JSON.stringify(result).slice(0, 500) });
-      return 0;
-    }
-
-    if (result.rows.length === 0) {
-      logger.info('[MeteoraVolume] No data returned from Dune (empty rows array)');
-      return 0;
-    }
-
-    logger.info(`[MeteoraVolume] Received ${result.rows.length} rows from Dune`);
-    
-    try {
-      if (result.rows.length > 0 && result.rows[0]) {
-        const sampleRow = result.rows[0] as unknown as Record<string, unknown>;
-        logger.debug('[MeteoraVolume] Sample row fields:', { fields: Object.keys(sampleRow) });
-        logger.debug('[MeteoraVolume] Sample row:', { row: JSON.stringify(sampleRow) });
-      }
-    } catch (logError: any) {
-      logger.error('[MeteoraVolume] Error logging sample row', logError);
-    }
-
-    logger.info('[MeteoraVolume] Transforming rows to database records...');
-    let records: DailyMeteoraVolumeRecord[];
-    try {
-      records = result.rows.map((row: any) => {
-        // Parse date - extract YYYY-MM-DD from various formats
-        let rawDate = row.day || row.date || '';
-        let dateStr = '';
-        
-        if (rawDate instanceof Date) {
-          dateStr = rawDate.toISOString().substring(0, 10);
-        } else if (typeof rawDate === 'string') {
-          dateStr = rawDate.substring(0, 10);
-        }
-        
-        // Map owner to token
-        const owner = row.owner || '';
-        const token = getTokenForOwner(owner);
-        
-        if (!token) {
-          logger.warn(`[MeteoraVolume] No token mapping found for owner: ${owner}`);
-        }
-        
-        // Convert scientific notation for all numeric fields
-        const convertValue = (value: unknown): string => {
-          if (value === null || value === undefined || value === '' || value === 0 || value === '0') {
-            return '0';
-          }
-          if (typeof value === 'number') {
-            if (isNaN(value) || !isFinite(value)) {
-              return '0';
-            }
-            return value.toFixed(20).replace(/\.?0+$/, '');
-          }
-          if (typeof value === 'string') {
-            if (value.includes('E') || value.includes('e')) {
-              try {
-                const num = parseFloat(value);
-                if (isNaN(num)) {
-                  return '0';
-                }
-                return num.toFixed(20).replace(/\.?0+$/, '');
-              } catch {
-                return value;
-              }
-            }
-            return value;
-          }
-          return String(value);
-        };
-        
-        // Calculate target_volume from buy_volume + sell_volume if not provided
-        const buyVolume = parseFloat(convertValue(row.buy_volume || 0)) || 0;
-        const sellVolume = parseFloat(convertValue(row.sell_volume || 0)) || 0;
-        const targetVolume = buyVolume + sellVolume;
-        
-        return {
-          token: token || owner, // Use owner as fallback if mapping not found
-          date: dateStr,
-          base_volume: convertValue(row.volume_usd_approx || 0),
-          target_volume: String(targetVolume),
-          trade_count: parseInt(String(row.num_swaps || 0)) || 0,
-          buy_volume: convertValue(row.buy_volume || 0),
-          sell_volume: convertValue(row.sell_volume || 0),
-          usdc_fees: convertValue(row.lp_fee_usdc || 0),
-          token_fees: convertValue(row.lp_fee_token || 0),
-          token_fees_usdc: convertValue(row.lp_fee_token_usdc || 0),
-          token_per_usdc: convertValue(row.token_per_usdc_raw || 0),
-          average_price: convertValue(row.token_price_usdc || 0),
-          ownership_share: convertValue(row.ownership_share || 0),
-          earned_fee_usdc: convertValue(row.earned_fee_usdc || 0),
-          is_complete: false,
-        };
-      });
-    } catch (transformError: any) {
-      logger.error('[MeteoraVolume] Error transforming rows', transformError);
-      throw transformError;
-    }
-
-    const validRecords = records.filter(r => r.token && r.date);
-    const invalidCount = records.length - validRecords.length;
-    
-    logger.info(`[MeteoraVolume] Transformed ${records.length} rows, ${validRecords.length} valid, ${invalidCount} invalid`);
-    
-    if (invalidCount > 0 && records.length > 0) {
-      const invalidSample = records.find(r => !r.token || !r.date);
-      if (invalidSample) {
-        logger.info('[MeteoraVolume] Sample invalid record:', { record: JSON.stringify(invalidSample) });
-      }
-    }
-    
-    if (validRecords.length === 0) {
-      logger.info('[MeteoraVolume] No valid records to insert');
-      return 0;
-    }
-
-    const today = new Date().toISOString().split('T')[0]!;
-    const markComplete = true;
-
-    logger.info(`[MeteoraVolume] Upserting ${validRecords.length} records to database...`);
-    try {
-      const upserted = await this.databaseService.upsertDailyMeteoraVolumes(validRecords, markComplete);
-      logger.info(`[MeteoraVolume] Upsert complete: ${upserted} records`);
-      return upserted;
-    } catch (upsertError: any) {
-      logger.error('[MeteoraVolume] Error upserting to database', upsertError);
-      throw upsertError;
-    }
-  }
-
-  /**
-   * Helper to add days to a date string
-   */
-  private addDays(dateStr: string, days: number): string {
-    const date = new Date(dateStr);
-    date.setDate(date.getDate() + days);
-    return date.toISOString().split('T')[0]!;
-  }
-
-  /**
-   * Check if service is ready
-   */
-  isReady(): boolean {
-    return this.initialized && this.databaseService.isAvailable();
-  }
-
-  /**
-   * Get service status
-   */
-  getStatus(): {
-    initialized: boolean;
-    databaseConnected: boolean;
-    queryIdConfigured: boolean;
-    isRefreshing: boolean;
-  } {
-    return {
-      initialized: this.initialized,
-      databaseConnected: this.databaseService.isAvailable(),
-      queryIdConfigured: !!config.dune.meteoraVolumeQueryId,
-      isRefreshing: this.isRefreshing,
-    };
-  }
-}
diff --git a/src/services/metricsService.ts b/src/services/metricsService.ts
index 7b84464..f419571 100644
--- a/src/services/metricsService.ts
+++ b/src/services/metricsService.ts
@@ -1,12 +1,11 @@
 /**
  * Prometheus Metrics Service
- * 
- * Exports metrics for monitoring service health, performance, and cache status.
- * Accessible via GET /metrics endpoint.
+ *
+ * Exports metrics for monitoring service health, performance, and the served
+ * ETL database (the API's only data dependency). Accessible via GET /metrics.
  */
 
 import client from 'prom-client';
-import { logger } from '../utils/logger.js';
 
 // Create a Registry to hold all metrics
 const register = new client.Registry();
@@ -15,94 +14,30 @@ const register = new client.Registry();
 client.collectDefaultMetrics({ register });
 
 // ============================================
-// SERVICE HEALTH METRICS
+// SERVED (EXTERNAL) DATABASE METRICS
 // ============================================
 
-// Service status gauges (1 = healthy, 0 = unhealthy)
-export const serviceStatus = new client.Gauge({
-  name: 'futarchy_service_status',
-  help: 'Service status (1 = initialized/healthy, 0 = not initialized)',
-  labelNames: ['service'],
+export const servedDbConnected = new client.Gauge({
+  name: 'futarchy_served_db_connected',
+  help: 'Served (external) ETL database connection status (1 = connected, 0 = disconnected)',
   registers: [register],
 });
 
-// Last refresh timestamp for each service
-export const lastRefreshTime = new client.Gauge({
-  name: 'futarchy_last_refresh_timestamp_seconds',
-  help: 'Unix timestamp of the last successful refresh for each service',
-  labelNames: ['service'],
+export const servedContractOk = new client.Gauge({
+  name: 'futarchy_served_contract_ok',
+  help: 'Served ETL data contract check status (1 = all required tables/columns present)',
   registers: [register],
 });
 
-// Time since last refresh (useful for alerting on stale data)
-export const timeSinceLastRefresh = new client.Gauge({
-  name: 'futarchy_time_since_last_refresh_seconds',
-  help: 'Seconds since the last successful refresh for each service',
-  labelNames: ['service'],
+export const servedDataAgeSeconds = new client.Gauge({
+  name: 'futarchy_served_data_age_seconds',
+  help: 'Age in seconds of the newest swap row in the served ETL DB (pipeline freshness)',
   registers: [register],
 });
 
-// Refresh in progress
-export const refreshInProgress = new client.Gauge({
-  name: 'futarchy_refresh_in_progress',
-  help: 'Whether a refresh is currently in progress (1 = yes, 0 = no)',
-  labelNames: ['service'],
-  registers: [register],
-});
-
-// ============================================
-// DATABASE METRICS
-// ============================================
-
-export const databaseConnected = new client.Gauge({
-  name: 'futarchy_database_connected',
-  help: 'Database connection status (1 = connected, 0 = disconnected)',
-  registers: [register],
-});
-
-export const databaseRecordCount = new client.Gauge({
-  name: 'futarchy_database_record_count',
-  help: 'Number of records in each database table',
-  labelNames: ['table'],
-  registers: [register],
-});
-
-export const databaseTokenCount = new client.Gauge({
-  name: 'futarchy_database_token_count',
-  help: 'Number of unique tokens in each database table',
-  labelNames: ['table'],
-  registers: [register],
-});
-
-export const databaseLatestDate = new client.Gauge({
-  name: 'futarchy_database_latest_date_timestamp_seconds',
-  help: 'Unix timestamp of the latest date/time in each table',
-  labelNames: ['table'],
-  registers: [register],
-});
-
-// ============================================
-// CACHE METRICS
-// ============================================
-
-export const cacheSize = new client.Gauge({
-  name: 'futarchy_cache_size',
-  help: 'Number of items in each cache',
-  labelNames: ['cache'],
-  registers: [register],
-});
-
-export const cacheHits = new client.Counter({
-  name: 'futarchy_cache_hits_total',
-  help: 'Total number of cache hits',
-  labelNames: ['cache'],
-  registers: [register],
-});
-
-export const cacheMisses = new client.Counter({
-  name: 'futarchy_cache_misses_total',
-  help: 'Total number of cache misses',
-  labelNames: ['cache'],
+export const heartbeatLastRun = new client.Gauge({
+  name: 'futarchy_heartbeat_last_run_timestamp_seconds',
+  help: 'Unix timestamp of the last heartbeat self-check run',
   registers: [register],
 });
 
@@ -131,57 +66,6 @@ export const httpRequestsInFlight = new client.Gauge({
   registers: [register],
 });
 
-// ============================================
-// DUNE API METRICS
-// ============================================
-
-export const duneQueriesTotal = new client.Counter({
-  name: 'futarchy_dune_queries_total',
-  help: 'Total number of Dune API queries executed',
-  labelNames: ['query_type', 'status'],
-  registers: [register],
-});
-
-export const duneQueryDuration = new client.Histogram({
-  name: 'futarchy_dune_query_duration_seconds',
-  help: 'Dune query execution duration in seconds',
-  labelNames: ['query_type'],
-  buckets: [1, 5, 10, 30, 60, 120, 300, 600],
-  registers: [register],
-});
-
-export const duneCreditsUsed = new client.Counter({
-  name: 'futarchy_dune_credits_used_total',
-  help: 'Total Dune API credits used',
-  registers: [register],
-});
-
-export const duneRowsFetched = new client.Counter({
-  name: 'futarchy_dune_rows_fetched_total',
-  help: 'Total number of rows fetched from Dune',
-  labelNames: ['query_type'],
-  registers: [register],
-});
-
-// ============================================
-// SOLANA RPC METRICS
-// ============================================
-
-export const solanaRpcCallsTotal = new client.Counter({
-  name: 'futarchy_solana_rpc_calls_total',
-  help: 'Total number of Solana RPC calls',
-  labelNames: ['method', 'status'],
-  registers: [register],
-});
-
-export const solanaRpcDuration = new client.Histogram({
-  name: 'futarchy_solana_rpc_duration_seconds',
-  help: 'Solana RPC call duration in seconds',
-  labelNames: ['method'],
-  buckets: [0.1, 0.5, 1, 2, 5, 10, 30],
-  registers: [register],
-});
-
 // ============================================
 // BUSINESS METRICS
 // ============================================
@@ -192,20 +76,11 @@ export const activeDaosCount = new client.Gauge({
   registers: [register],
 });
 
-export const totalVolumeUsd = new client.Gauge({
-  name: 'futarchy_total_volume_usd',
-  help: 'Total 24h volume in USD across all pools',
-  registers: [register],
-});
-
 // ============================================
 // METRICS SERVICE CLASS
 // ============================================
 
 export class MetricsService {
-  private updateInterval: NodeJS.Timeout | null = null;
-  private lastUpdateTime: number = 0;
-
   /**
    * Get the Prometheus registry
    */
@@ -227,74 +102,24 @@ export class MetricsService {
     return register.contentType;
   }
 
-  /**
-   * Update service status metric
-   */
-  setServiceStatus(service: string, isHealthy: boolean): void {
-    serviceStatus.labels(service).set(isHealthy ? 1 : 0);
-  }
-
-  /**
-   * Update last refresh time for a service
-   */
-  setLastRefreshTime(service: string, timestamp?: Date): void {
-    const ts = timestamp || new Date();
-    lastRefreshTime.labels(service).set(ts.getTime() / 1000);
-  }
-
-  /**
-   * Update time since last refresh
-   */
-  updateTimeSinceLastRefresh(service: string, lastRefreshTimestamp: number): void {
-    const now = Date.now();
-    const secondsSince = (now - lastRefreshTimestamp) / 1000;
-    timeSinceLastRefresh.labels(service).set(secondsSince);
-  }
-
-  /**
-   * Set refresh in progress status
-   */
-  setRefreshInProgress(service: string, inProgress: boolean): void {
-    refreshInProgress.labels(service).set(inProgress ? 1 : 0);
-  }
+  // Served DB / heartbeat gauges
 
-  /**
-   * Update database metrics
-   */
-  setDatabaseConnected(connected: boolean): void {
-    databaseConnected.set(connected ? 1 : 0);
-  }
-
-  setDatabaseRecordCount(table: string, count: number): void {
-    databaseRecordCount.labels(table).set(count);
+  setServedDbConnected(connected: boolean): void {
+    servedDbConnected.set(connected ? 1 : 0);
   }
 
-  setDatabaseTokenCount(table: string, count: number): void {
-    databaseTokenCount.labels(table).set(count);
+  setServedContractOk(ok: boolean): void {
+    servedContractOk.set(ok ? 1 : 0);
   }
 
-  setDatabaseLatestDate(table: string, date: Date | string | null): void {
-    if (!date) {
-      databaseLatestDate.labels(table).set(0);
-      return;
+  setServedDataAgeSeconds(ageSeconds: number | null): void {
+    if (ageSeconds !== null) {
+      servedDataAgeSeconds.set(ageSeconds);
     }
-    const timestamp = typeof date === 'string' ? new Date(date).getTime() : date.getTime();
-    databaseLatestDate.labels(table).set(timestamp / 1000);
   }
 
-  /**
-   * Update cache metrics
-   */
-  setCacheSize(cache: string, size: number): void {
-    cacheSize.labels(cache).set(size);
-  }
-
-  incrementCacheHit(cache: string): void {
-    cacheHits.labels(cache).inc();
-  }
-
-  incrementCacheMiss(cache: string): void {
-    cacheMisses.labels(cache).inc();
+  markHeartbeatRun(): void {
+    heartbeatLastRun.set(Date.now() / 1000);
   }
 
   /**
@@ -320,28 +145,6 @@ export class MetricsService {
     httpRequestsInFlight.dec();
   }
 
-  /**
-   * Record Dune API query
-   */
-  recordDuneQuery(queryType: string, success: boolean, durationSeconds: number, rowCount: number = 0, credits: number = 0): void {
-    duneQueriesTotal.labels(queryType, success ? 'success' : 'error').inc();
-    duneQueryDuration.labels(queryType).observe(durationSeconds);
-    if (rowCount > 0) {
-      duneRowsFetched.labels(queryType).inc(rowCount);
-    }
-    if (credits > 0) {
-      duneCreditsUsed.inc(credits);
-    }
-  }
-
-  /**
-   * Record Solana RPC call
-   */
-  recordSolanaRpcCall(method: string, success: boolean, durationSeconds: number): void {
-    solanaRpcCallsTotal.labels(method, success ? 'success' : 'error').inc();
-    solanaRpcDuration.labels(method).observe(durationSeconds);
-  }
-
   /**
    * Update business metrics
    */
@@ -349,10 +152,6 @@ export class MetricsService {
     activeDaosCount.set(count);
   }
 
-  setTotalVolumeUsd(volume: number): void {
-    totalVolumeUsd.set(volume);
-  }
-
   /**
    * Normalize API path for metrics (remove dynamic segments)
    */
@@ -363,32 +162,6 @@ export class MetricsService {
       .replace(/\/\d+/g, '/:id') // Numeric IDs
       .replace(/\?.*$/, ''); // Remove query params
   }
-
-  /**
-   * Start periodic metrics updates
-   */
-  startPeriodicUpdates(intervalMs: number = 30000): void {
-    if (this.updateInterval) {
-      clearInterval(this.updateInterval);
-    }
-    
-    this.updateInterval = setInterval(() => {
-      this.lastUpdateTime = Date.now();
-    }, intervalMs);
-    
-    logger.info(`[Metrics] Started periodic updates every ${intervalMs}ms`);
-  }
-
-  /**
-   * Stop periodic updates
-   */
-  stop(): void {
-    if (this.updateInterval) {
-      clearInterval(this.updateInterval);
-      this.updateInterval = null;
-    }
-    logger.info('[Metrics] Stopped');
-  }
 }
 
 // Export singleton instance
diff --git a/src/services/priceService.ts b/src/services/priceService.ts
index 63c0d33..dde0807 100644
--- a/src/services/priceService.ts
+++ b/src/services/priceService.ts
@@ -83,60 +83,4 @@ export class PriceService {
     return liquidity.toFixed(2);
   }
 
-  calculateVolumeFromFees(
-    baseProtocolFees: BN,
-    quoteProtocolFees: BN,
-    baseDecimals: number,
-    quoteDecimals: number,
-    feeRate: number
-  ): { baseVolume: string; targetVolume: string } | null {
-    if (feeRate <= 0) {
-      return null;
-    }
-
-    // Convert BN to numbers, handling null/undefined
-    // Check if BN exists and is not zero before converting
-    const baseFeesNum = (baseProtocolFees && !baseProtocolFees.isZero()) 
-      ? baseProtocolFees.toNumber() 
-      : 0;
-    const quoteFeesNum = (quoteProtocolFees && !quoteProtocolFees.isZero())
-      ? quoteProtocolFees.toNumber()
-      : 0;
-
-    // Validate fees - at least one must have a value
-    if ((!isFinite(baseFeesNum) || isNaN(baseFeesNum) || baseFeesNum < 0) &&
-        (!isFinite(quoteFeesNum) || isNaN(quoteFeesNum) || quoteFeesNum < 0)) {
-      return null;
-    }
-
-    // If both fees are zero, return null
-    if (baseFeesNum === 0 && quoteFeesNum === 0) {
-      return null;
-    }
-
-    // Volume = Fees / Fee Rate
-    // Adjust for decimals
-    // Calculate volume for whichever fees exist (can be zero if that fee doesn't exist)
-    const baseVolume = baseFeesNum > 0 
-      ? (baseFeesNum / feeRate) / Math.pow(10, baseDecimals)
-      : 0;
-    
-    const targetVolume = quoteFeesNum > 0
-      ? (quoteFeesNum / feeRate) / Math.pow(10, quoteDecimals)
-      : 0;
-
-    // Validate results - check if calculated values are valid
-    const baseVolumeValid = baseVolume === 0 || (isFinite(baseVolume) && !isNaN(baseVolume) && baseVolume >= 0);
-    const targetVolumeValid = targetVolume === 0 || (isFinite(targetVolume) && !isNaN(targetVolume) && targetVolume >= 0);
-
-    if (!baseVolumeValid || !targetVolumeValid) {
-      return null;
-    }
-
-    return {
-      baseVolume: baseVolume.toFixed(8),
-      targetVolume: targetVolume.toFixed(8),
-    };
-  }
-
 }
\ No newline at end of file
diff --git a/src/services/solanaService.ts b/src/services/solanaService.ts
index 1e3f394..7ce0467 100644
--- a/src/services/solanaService.ts
+++ b/src/services/solanaService.ts
@@ -159,46 +159,6 @@ export class SolanaService {
     }
   }
 
-  /**
-   * Get the circulating supply of a token
-   * Circulating supply = Total supply - Locked amounts (performance packages, etc.)
-   * 
-   * @param mintAddress - The mint address of the token
-   * @param lockedAmount - Optional BN of locked tokens to subtract (e.g., performance package)
-   * @returns Promise<string> - The circulating supply with proper decimals
-   */
-  async getCirculatingSupply(mintAddress: string, lockedAmount?: BN): Promise<string> {
-    const lockedKey = lockedAmount ? lockedAmount.toString() : 'none';
-    const cacheKey = `circulating_supply_${mintAddress}_${lockedKey}`;
-    const cached = this.getCached<string>(cacheKey, config.cache.tickersTTL);
-    if (cached !== null) return cached;
-
-    try {
-      const mintPubkey = new PublicKey(mintAddress);
-      const mintInfo = await this.withRetry(() => getMint(this.connection, mintPubkey));
-      let supply = new BN(mintInfo.supply.toString());
-      const decimals = mintInfo.decimals;
-
-      // Subtract locked amounts (performance package tokens, etc.)
-      if (lockedAmount && lockedAmount.gt(new BN(0))) {
-        supply = supply.sub(lockedAmount);
-        // Ensure we don't go negative
-        if (supply.isNeg()) {
-          supply = new BN(0);
-        }
-      }
-
-      const circulatingSupply = Number(supply.toString()) / Math.pow(10, decimals);
-      const result = circulatingSupply.toString();
-
-      this.setCache(cacheKey, result);
-      return result;
-    } catch (error) {
-      logger.error(`Error fetching circulating supply for ${mintAddress}:`, error);
-      throw new Error(`Failed to fetch circulating supply for token: ${mintAddress}`);
-    }
-  }
-
   /**
    * Get complete supply information for a token with detailed allocation breakdown
    * @param mintAddress - The mint address of the token
diff --git a/src/services/tenMinuteVolumeFetcherService.ts b/src/services/tenMinuteVolumeFetcherService.ts
deleted file mode 100644
index b795ac9..0000000
--- a/src/services/tenMinuteVolumeFetcherService.ts
+++ /dev/null
@@ -1,495 +0,0 @@
-/**
- * TenMinuteVolumeFetcherService
- * 
- * Fetches 10-minute granularity volume data from Dune API for accurate rolling 24h calculations.
- * This is the PRIMARY service for /api/tickers 24h volume data.
- * 
- * Schedule:
- * - Every 10 minutes: Fetch current incomplete bucket + update complete buckets
- * - Stores last 25 hours of data (150 buckets per token)
- * - Prunes data older than 25 hours
- * 
- * 10-minute buckets: :00, :10, :20, :30, :40, :50
- */
-
-import { config } from '../config';
-import { DuneService } from './duneService';
-import { DatabaseService, TenMinuteVolumeRecord, Rolling24hMetrics } from './databaseService';
-import { FutarchyService } from './futarchyService';
-import { scheduleAtBoundary, type ScheduledTask } from '../utils/scheduling';
-import { logger } from '../utils/logger.js';
-
-export class TenMinuteVolumeFetcherService {
-  private duneService: DuneService;
-  private databaseService: DatabaseService;
-  private futarchyService: FutarchyService;
-  private refreshTask: ScheduledTask | null = null;
-  private isRunning: boolean = false;
-  private initialized: boolean = false;
-  private lastRefreshTime: Date | null = null;
-  private refreshInProgress: boolean = false;
-
-  // 10-minute refresh interval (default)
-  private readonly REFRESH_INTERVAL_MS = 10 * 60 * 1000; // 10 minutes
-
-  constructor(
-    duneService: DuneService,
-    databaseService: DatabaseService,
-    futarchyService: FutarchyService
-  ) {
-    this.duneService = duneService;
-    this.databaseService = databaseService;
-    this.futarchyService = futarchyService;
-  }
-
-  get isInitialized(): boolean {
-    return this.initialized;
-  }
-
-  isDatabaseConnected(): boolean {
-    return this.databaseService.isAvailable();
-  }
-
-  /**
-   * Initialize the service - check database and optionally backfill
-   */
-  async initialize(): Promise<void> {
-    if (!this.databaseService.isAvailable()) {
-      logger.info('[TenMinVolume] Database not connected - service disabled');
-      return;
-    }
-
-    logger.info('[TenMinVolume] Initializing 10-minute volume service...');
-
-    try {
-      const recordCount = await this.databaseService.getTenMinuteRecordCount();
-      logger.info(`[TenMinVolume] Current record count in database: ${recordCount}`);
-
-      const latestBucket = await this.databaseService.getLatestTenMinuteBucket();
-      if (latestBucket) {
-        logger.info(`[TenMinVolume] Latest bucket in DB: ${latestBucket}`);
-      }
-
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info(`[TenMinVolume] Service initialized with ${recordCount} existing records`);
-      }
-
-      if (config.dune.tenMinuteVolumeQueryId) {
-        const now = new Date();
-        const twentyFourHoursAgo = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-
-        let startTime: Date;
-        if (latestBucket) {
-          const latestDate = new Date(latestBucket);
-          startTime = new Date(Math.min(latestDate.getTime(), twentyFourHoursAgo.getTime()));
-        } else {
-          startTime = twentyFourHoursAgo;
-          logger.info('[TenMinVolume] No existing data - will backfill last 24 hours');
-        }
-
-        logger.info(`[TenMinVolume] Backfilling from ${startTime.toISOString()}`);
-        await this.fetchAndStore(startTime, true);
-
-        this.initialized = true;
-        logger.info('[TenMinVolume] Initialization complete');
-      } else if (!this.initialized) {
-        logger.info('[TenMinVolume] No DUNE_TEN_MINUTE_VOLUME_QUERY_ID configured - cannot fetch new data');
-        logger.info('[TenMinVolume] Service will not be available until query ID is set or data exists in DB');
-      }
-    } catch (error: any) {
-      logger.error('[TenMinVolume] Error during initialization', error);
-      const recordCount = await this.databaseService.getTenMinuteRecordCount();
-      if (recordCount > 0) {
-        this.initialized = true;
-        logger.info('[TenMinVolume] Serving existing data despite initialization error');
-      }
-    }
-  }
-
-  /**
-   * Start the background refresh loop
-   */
-  async start(): Promise<void> {
-    if (this.isRunning) {
-      logger.info('[TenMinVolume] Service already running');
-      return;
-    }
-
-    await this.initialize();
-
-    if (!config.dune.tenMinuteVolumeQueryId) {
-      if (this.initialized) {
-        logger.info('[TenMinVolume] Serving existing DB data (no refresh loop - set DUNE_TEN_MINUTE_VOLUME_QUERY_ID to enable)');
-      }
-      return;
-    }
-
-    this.isRunning = true;
-
-    this.refreshTask = scheduleAtBoundary(
-      () => this.refresh(),
-      {
-        name: 'TenMinVolume',
-        boundaryMinutes: 10,
-        bufferSeconds: 5,
-        onError: (error) => logger.error('[TenMinVolume] Refresh error', error),
-      }
-    );
-    
-    logger.info('[TenMinVolume] Started with non-pileup scheduling at 10-minute boundaries');
-  }
-
-  /**
-   * Stop the background refresh loop
-   */
-  stop(): void {
-    if (this.refreshTask) {
-      this.refreshTask.stop();
-      this.refreshTask = null;
-    }
-    this.isRunning = false;
-  }
-
-  /**
-   * Perform a refresh - fetch recent 10-minute data
-   */
-  async refresh(): Promise<void> {
-    if (this.refreshInProgress) {
-      logger.info('[TenMinVolume] Refresh already in progress, skipping');
-      return;
-    }
-
-    this.refreshInProgress = true;
-    logger.info('[TenMinVolume] Starting refresh...');
-
-    try {
-      const startTime = new Date(Date.now() - 20 * 60 * 1000);
-      await this.fetchAndStore(startTime, false);
-
-      const currentBucket = this.getCurrentBucketStart();
-      await this.databaseService.markTenMinuteBucketsComplete(currentBucket.toISOString());
-
-      this.lastRefreshTime = new Date();
-      logger.info('[TenMinVolume] Refresh complete');
-    } catch (error: any) {
-      logger.error('[TenMinVolume] Error during refresh', error);
-    } finally {
-      this.refreshInProgress = false;
-    }
-  }
-
-  /**
-   * Force a full refresh (backfill last 24h)
-   */
-  async forceRefresh(): Promise<void> {
-    logger.info('[TenMinVolume] Force refresh requested - backfilling last 24h');
-    const startTime = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    await this.fetchAndStore(startTime, true);
-    this.lastRefreshTime = new Date();
-  }
-
-  /**
-   * Get the start of the current 10-minute bucket
-   */
-  private getCurrentBucketStart(): Date {
-    const now = new Date();
-    const bucketMinute = Math.floor(now.getMinutes() / 10) * 10;
-    return new Date(
-      now.getFullYear(),
-      now.getMonth(),
-      now.getDate(),
-      now.getHours(),
-      bucketMinute,
-      0,
-      0
-    );
-  }
-
-  /**
-   * Public method for backfilling missing extended fields
-   * Fetches data from Dune for a specific time range and updates only missing fields
-   * Only fetches buckets that actually need updating (checks database first)
-   * @param startTime Start time for the query (format: YYYY-MM-DD HH:MM:SS)
-   * @param endTime Optional end time for the query (format: YYYY-MM-DD HH:MM:SS). If not provided, queries until now.
-   */
-  async backfillExtendedFields(startTime: string, endTime?: string): Promise<number> {
-    const queryId = config.dune.tenMinuteVolumeQueryId;
-    if (!queryId) {
-      logger.info('[TenMinVolume] No query ID configured for backfill');
-      return 0;
-    }
-
-    try {
-      if (!this.databaseService.pool) {
-        logger.info('[TenMinVolume] Database not available for backfill check');
-        return 0;
-      }
-
-      const startDate = new Date(startTime);
-      // Use provided endTime or calculate end of day
-      const endDate = endTime ? new Date(endTime) : new Date(startDate);
-      if (!endTime) {
-        endDate.setDate(endDate.getDate() + 1); // Full day window (24 hours) if no endTime provided
-      }
-
-      const missingCheck = await this.databaseService.pool.query(`
-        SELECT COUNT(*) as missing_count
-        FROM ten_minute_volumes
-        WHERE bucket >= $1 AND bucket < $2
-          AND (buy_volume IS NULL OR buy_volume = 0 OR
-               sell_volume IS NULL OR sell_volume = 0 OR
-               average_price IS NULL OR average_price = 0)
-      `, [startDate.toISOString(), endDate.toISOString()]);
-
-      const missingCount = parseInt(missingCheck.rows[0]?.missing_count || '0');
-      if (missingCount === 0) {
-        // No missing fields in this range, skip
-        return 0;
-      }
-
-      // Get the filtered list of DAOs from FutarchyService
-      const allDaos = await this.futarchyService.getAllDaos();
-      const tokenAddresses = allDaos.map(dao => dao.baseMint.toString());
-
-      logger.info(`[TenMinVolume] Backfilling ${missingCount} records from ${startTime} for ${tokenAddresses.length} tokens`);
-
-      const parameters: Record<string, any> = {
-        start_time: startTime,
-      };
-
-      // Always provide end_time - use far future date if not provided (effectively no limit)
-      if (endTime) {
-        parameters.end_time = endTime;
-      } else {
-        // Use far future date to effectively have no limit (avoids SQL parsing issues)
-        const farFuture = new Date('2099-12-31 23:59:59');
-        parameters.end_time = farFuture.toISOString().replace('T', ' ').replace('Z', '').slice(0, 19);
-      }
-
-      // Format token list
-      if (tokenAddresses.length > 0) {
-        parameters.token_list = tokenAddresses.map(token => `'${token}'`).join(', ');
-      } else {
-        parameters.token_list = "'__ALL__'";
-      }
-
-      const result = await (this.duneService as any).executeQueryManually(queryId, parameters);
-
-      if (!result || !result.rows || result.rows.length === 0) {
-        logger.info('[TenMinVolume] No results from Dune for backfill');
-        return 0;
-      }
-
-      const rows = result.rows;
-      logger.info(`[TenMinVolume] Received ${rows.length} rows from Dune for backfill`);
-
-      // Transform to records with extended fields
-      const records: TenMinuteVolumeRecord[] = rows.map((row: any) => ({
-        token: row.token,
-        bucket: this.parseDuneBucket(row.bucket),
-        base_volume: row.base_volume || '0',
-        target_volume: row.target_volume || '0',
-        buy_volume: row.buy_volume || '0',
-        sell_volume: row.sell_volume || '0',
-        high: row.high || '0',
-        low: row.low || '0',
-        average_price: row.average_price || '0',
-        trade_count: parseInt(row.trade_count || '0'),
-        usdc_fees: row.usdc_fees || '0',
-        token_fees: row.token_fees || '0',
-        token_fees_usdc: row.token_fees_usdc || '0',
-        sell_volume_usdc: row.sell_volume_usdc || '0',
-      }));
-
-      // Filter to only records that need updating (have missing fields)
-      const recordsToUpdate = records.filter(record => {
-        // Check if this specific bucket needs updating
-        // We'll let the upsert logic handle this, but we can optimize by checking first
-        return true; // Let upsert handle the filtering
-      });
-
-      // Batch upsert records (will only update missing fields due to our safe upsert logic)
-      const currentBucket = this.getCurrentBucketStart();
-      
-      // Separate complete and incomplete records for batch processing
-      const completeRecords = recordsToUpdate.filter(r => new Date(r.bucket) < currentBucket);
-      const incompleteRecords = recordsToUpdate.filter(r => new Date(r.bucket) >= currentBucket);
-      
-      let totalUpserted = 0;
-      
-      // Batch upsert complete records
-      if (completeRecords.length > 0) {
-        const count = await this.databaseService.upsertTenMinuteVolumes(completeRecords, true);
-        totalUpserted += count;
-      }
-      
-      // Batch upsert incomplete records
-      if (incompleteRecords.length > 0) {
-        const count = await this.databaseService.upsertTenMinuteVolumes(incompleteRecords, false);
-        totalUpserted += count;
-      }
-
-      logger.info(`[TenMinVolume] Backfilled ${totalUpserted} records (batched)`);
-      return totalUpserted;
-    } catch (error: any) {
-      if (error.message.includes('402') || error.message.includes('Payment Required')) {
-        throw error;
-      }
-      logger.error('[TenMinVolume] Error during backfill', error);
-      return 0;
-    }
-  }
-
-  /**
-   * Fetch 10-minute data from Dune and store in database
-   */
-  private async fetchAndStore(startTime: Date, markHistoricalComplete: boolean): Promise<void> {
-    const queryId = config.dune.tenMinuteVolumeQueryId;
-    if (!queryId) return;
-
-    try {
-      // Get the filtered list of DAOs from FutarchyService
-      const allDaos = await this.futarchyService.getAllDaos();
-      const tokenAddresses = allDaos.map(dao => dao.baseMint.toString());
-
-      logger.info(`[TenMinVolume] Fetching from Dune query ${queryId} with start_time: ${startTime.toISOString()} for ${tokenAddresses.length} tokens`);
-
-      const parameters: Record<string, any> = {
-        start_time: startTime.toISOString().replace('T', ' ').replace('Z', ''),
-      };
-
-      // Format token list
-      if (tokenAddresses.length > 0) {
-        parameters.token_list = tokenAddresses.map(token => `'${token}'`).join(', ');
-      } else {
-        parameters.token_list = "'__ALL__'";
-      }
-
-      const result = await (this.duneService as any).executeQueryManually(queryId, parameters);
-
-      if (!result || !result.rows) {
-        logger.info('[TenMinVolume] No results from Dune');
-        return;
-      }
-
-      const rows = result.rows;
-      logger.info(`[TenMinVolume] Received ${rows.length} rows from Dune`);
-
-      if (rows.length === 0) return;
-
-      // Transform to records with extended fields
-      const records: TenMinuteVolumeRecord[] = rows.map((row: any) => ({
-        token: row.token,
-        bucket: this.parseDuneBucket(row.bucket),
-        base_volume: row.base_volume || '0',
-        target_volume: row.target_volume || '0',
-        buy_volume: row.buy_volume || '0',
-        sell_volume: row.sell_volume || '0',
-        high: row.high || '0',
-        low: row.low || '0',
-        average_price: row.average_price || '0',
-        trade_count: parseInt(row.trade_count || '0'),
-        usdc_fees: row.usdc_fees || '0',
-        token_fees: row.token_fees || '0',
-        token_fees_usdc: row.token_fees_usdc || '0',
-        sell_volume_usdc: row.sell_volume_usdc || '0',
-      }));
-
-      // For historical backfill, mark all as complete except current bucket
-      if (markHistoricalComplete) {
-        const currentBucket = this.getCurrentBucketStart();
-        const completeRecords = records.filter(r => new Date(r.bucket) < currentBucket);
-        const incompleteRecords = records.filter(r => new Date(r.bucket) >= currentBucket);
-
-        if (completeRecords.length > 0) {
-          await this.databaseService.upsertTenMinuteVolumes(completeRecords, true);
-        }
-        if (incompleteRecords.length > 0) {
-          await this.databaseService.upsertTenMinuteVolumes(incompleteRecords, false);
-        }
-      } else {
-        // Regular refresh - batch upserts like historical mode
-        const currentBucket = this.getCurrentBucketStart();
-        const completeRecords = records.filter(r => new Date(r.bucket) < currentBucket);
-        const incompleteRecords = records.filter(r => new Date(r.bucket) >= currentBucket);
-
-        if (completeRecords.length > 0) {
-          await this.databaseService.upsertTenMinuteVolumes(completeRecords, true);
-        }
-        if (incompleteRecords.length > 0) {
-          await this.databaseService.upsertTenMinuteVolumes(incompleteRecords, false);
-        }
-      }
-
-    } catch (error: any) {
-      logger.error('[TenMinVolume] Error fetching from Dune', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Parse Dune's bucket timestamp format
-   */
-  private parseDuneBucket(bucket: string): string {
-    // Dune returns bucket as "2026-01-07 12:30:00" or similar
-    if (bucket.includes('T')) {
-      return bucket; // Already ISO format
-    }
-    // Convert to ISO format
-    return bucket.replace(' ', 'T') + 'Z';
-  }
-
-  /**
-   * Get rolling 24h metrics from the 10-minute data
-   * This is the PRIMARY method for /api/tickers 24h volume
-   */
-  async getRolling24hMetrics(baseMintAddresses?: string[]): Promise<Map<string, { base_volume_24h: number; target_volume_24h: number; high_24h: number; low_24h: number }>> {
-    if (!this.initialized || !this.databaseService.isAvailable()) {
-      logger.info('[TenMinVolume] Service not ready, returning empty metrics');
-      return new Map();
-    }
-
-    try {
-      const dbMetrics = await this.databaseService.getRolling24hFromTenMinute(baseMintAddresses);
-
-      const result = new Map<string, { base_volume_24h: number; target_volume_24h: number; high_24h: number; low_24h: number }>();
-      for (const [token, metrics] of dbMetrics) {
-        result.set(token, {
-          base_volume_24h: parseFloat(metrics.base_volume_24h) || 0,
-          target_volume_24h: parseFloat(metrics.target_volume_24h) || 0,
-          high_24h: parseFloat(metrics.high_24h) || 0,
-          low_24h: parseFloat(metrics.low_24h) || 0,
-        });
-      }
-
-      logger.info(`[TenMinVolume] Returning rolling 24h metrics for ${result.size} tokens`);
-      return result;
-    } catch (error: any) {
-      logger.error('[TenMinVolume] Error getting rolling 24h metrics', error);
-      return new Map();
-    }
-  }
-
-  /**
-   * Get service status for monitoring
-   */
-  getStatus(): {
-    initialized: boolean;
-    isRunning: boolean;
-    databaseConnected: boolean;
-    lastRefreshTime: string | null;
-    queryId: number | undefined;
-    refreshInProgress: boolean;
-  } {
-    return {
-      initialized: this.initialized,
-      isRunning: this.isRunning,
-      databaseConnected: this.databaseService.isAvailable(),
-      lastRefreshTime: this.lastRefreshTime?.toISOString() || null,
-      queryId: config.dune.tenMinuteVolumeQueryId,
-      refreshInProgress: this.refreshInProgress,
-    };
-  }
-}
-
diff --git a/src/services/v06ReconciliationService.ts b/src/services/v06ReconciliationService.ts
deleted file mode 100644
index 38d8550..0000000
--- a/src/services/v06ReconciliationService.ts
+++ /dev/null
@@ -1,698 +0,0 @@
-import { config } from '../config.js';
-import { logger } from '../utils/logger.js';
-import { scheduleWithoutPileup, type ScheduledTask } from '../utils/scheduling.js';
-import type { DatabaseService } from './databaseService.js';
-import type { ExternalDatabaseService } from './externalDatabaseService.js';
-
-const FEE_RATE = config.fees.protocolFeeRate; // 0.005 = 0.5%
-
-/**
- * Hourly reconciliation service for v0.6 data.
- *
- * Reads from the external indexer DB (v0_6_spot_swaps, v0_6_conditional_swaps,
- * v0_6_daos, v0_6_proposals) and upserts into the app DB's v06_* tables.
- *
- * Pipeline:
- *   1. Spot OHLCV 1m  — scan v0_6_spot_swaps JOIN v0_6_daos
- *   2. Spot OHLCV 1d  — rollup from 1m data
- *   3. Fee volume daily spot — aggregate spot swaps by calendar day
- *   4. Fee volume daily conditional — winning-market-only swaps
- *   5. Fee volume daily aggregate — spot + conditional totals
- */
-export class V06ReconciliationService {
-  private scheduledTask: ScheduledTask | null = null;
-  private static readonly RECONCILIATION_INTERVAL_MS = 60 * 60 * 1000; // 1 hour
-  // Window must start at a UTC day boundary — fee queries GROUP BY UTC day and a mid-day start
-  // would upsert partial-day sums over complete rows. Must also be > proposal voting period (3d)
-  // so that conditional swaps get re-reconciled after their proposal resolves.
-  private static readonly LOOKBACK_DAYS = 4;
-
-  constructor(
-    private readonly appDb: DatabaseService,
-    private readonly extDb: ExternalDatabaseService,
-  ) {}
-
-  start(): void {
-    if (!this.extDb.isAvailable()) {
-      logger.info('[V06Reconciliation] External DB not available — service will not start');
-      return;
-    }
-
-    this.scheduledTask = scheduleWithoutPileup(
-      () => this.reconcile(),
-      {
-        name: 'V06Reconciliation',
-        intervalMs: V06ReconciliationService.RECONCILIATION_INTERVAL_MS,
-        immediate: true,
-        onError: (err) => logger.error('[V06Reconciliation] Error during reconciliation', err),
-      },
-    );
-    logger.info('[V06Reconciliation] Service started — hourly reconciliation enabled');
-  }
-
-  stop(): void {
-    this.scheduledTask?.stop();
-    this.scheduledTask = null;
-    logger.info('[V06Reconciliation] Service stopped');
-  }
-
-  isRunning(): boolean {
-    return this.scheduledTask?.isRunning() ?? false;
-  }
-
-  getLastRunTime(): Date | null {
-    return this.scheduledTask?.getLastRunTime() ?? null;
-  }
-
-  // ------------------------------------------------------------------
-  // Top-level reconciliation
-  // ------------------------------------------------------------------
-
-  private static startOfUtcDay(d: Date): Date {
-    const t = new Date(d.getTime());
-    t.setUTCHours(0, 0, 0, 0);
-    return t;
-  }
-
-  private static defaultWindowStart(): Date {
-    const floor = V06ReconciliationService.startOfUtcDay(new Date());
-    floor.setUTCDate(floor.getUTCDate() - V06ReconciliationService.LOOKBACK_DAYS);
-    return floor;
-  }
-
-  // Always floors to UTC midnight — a caller-supplied mid-day `since` would reintroduce the
-  // partial-day overwrite bug.
-  private static resolveWindowStart(since?: Date): Date {
-    return since
-      ? V06ReconciliationService.startOfUtcDay(since)
-      : V06ReconciliationService.defaultWindowStart();
-  }
-
-  /**
-   * Run the full reconciliation pipeline.
-   * @param since  Lookback window start (floored to UTC midnight). Defaults to LOOKBACK_DAYS ago.
-   * @param until  Window upper bound (exclusive). Defaults to now.
-   */
-  async reconcile(since?: Date, until?: Date): Promise<void> {
-    const start = Date.now();
-    const windowStart = V06ReconciliationService.resolveWindowStart(since);
-    const windowEnd = until ?? new Date();
-    // Pass ISO strings to sub-methods so the pg driver never calls Date.toString()
-    // (which can produce un-parseable timezone names like "GMT-0700" under Bun).
-    const sinceISO = windowStart.toISOString();
-    const untilISO = windowEnd.toISOString();
-    logger.info(`[V06Reconciliation] Starting reconciliation cycle (since ${sinceISO} until ${untilISO})`);
-
-    await this.reconcileSpotOhlcv1m(sinceISO, untilISO);
-    // 1d rollup (app DB) and fee aggregates (indexer → app DB) are independent — run in parallel.
-    await Promise.all([
-      this.reconcileSpotOhlcv1d(windowStart),
-      this.reconcileFeeDailySpot(sinceISO, untilISO),
-      this.reconcileFeeDailyConditional(sinceISO, untilISO),
-    ]);
-    await this.reconcileFeeDailyAggregate(windowStart);
-
-    const elapsed = ((Date.now() - start) / 1000).toFixed(1);
-    logger.info(`[V06Reconciliation] Cycle complete in ${elapsed}s`);
-  }
-
-  async reconcileFeesOnly(since?: Date, until?: Date): Promise<void> {
-    const start = Date.now();
-    const windowStart = V06ReconciliationService.resolveWindowStart(since);
-    const windowEnd = until ?? new Date();
-    const sinceISO = windowStart.toISOString();
-    const untilISO = windowEnd.toISOString();
-    logger.info(`[V06Reconciliation] Starting fee-only reconciliation (since ${sinceISO} until ${untilISO})`);
-
-    await Promise.all([
-      this.reconcileFeeDailySpot(sinceISO, untilISO),
-      this.reconcileFeeDailyConditional(sinceISO, untilISO),
-    ]);
-    await this.reconcileFeeDailyAggregate(windowStart);
-
-    const elapsed = ((Date.now() - start) / 1000).toFixed(1);
-    logger.info(`[V06Reconciliation] Fee-only cycle complete in ${elapsed}s`);
-  }
-
-  // ------------------------------------------------------------------
-  // 1) Spot OHLCV 1-minute
-  // ------------------------------------------------------------------
-
-  private async reconcileSpotOhlcv1m(since: string, until: string): Promise<void> {
-    // #12: Single CTE query replaces 3 separate scans (aggregate + open + close).
-    // #10: Compare unix_timestamp directly against epoch seconds to allow index use.
-    const sinceEpoch = Math.floor(new Date(since).getTime() / 1000);
-    const untilEpoch = Math.floor(new Date(until).getTime() / 1000);
-
-    logger.info('[V06Reconciliation] Spot OHLCV 1m: querying (single CTE)...');
-    const rows = await this.extDb.query(`
-      WITH priced AS (
-        SELECT
-          d.base_mint_acct                                       AS token,
-          date_trunc('minute', to_timestamp(s.unix_timestamp))   AS bucket,
-          s.unix_timestamp,
-          s.id,
-          CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy'
-            THEN s.input_amount::numeric / NULLIF(s.output_amount::numeric, 0)
-            ELSE s.output_amount::numeric / NULLIF(s.input_amount::numeric, 0)
-          END                                                    AS price,
-          CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.output_amount::numeric ELSE s.input_amount::numeric END AS base_amt,
-          CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.input_amount::numeric  ELSE s.output_amount::numeric END AS target_amt,
-          CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.input_amount::numeric  ELSE 0 END AS buy_amt,
-          CASE WHEN LOWER(TRIM(s.swap_type)) = 'sell' THEN s.input_amount::numeric ELSE 0 END AS sell_amt
-        FROM v0_6_spot_swaps s
-        JOIN v0_6_daos d ON d.dao_addr = s.dao_addr
-        WHERE s.unix_timestamp >= $1
-          AND s.unix_timestamp < $2
-          AND s.input_amount > 0 AND s.output_amount > 0
-          AND LOWER(TRIM(s.swap_type)) IN ('buy', 'sell')
-      ),
-      ranked AS (
-        SELECT *,
-          ROW_NUMBER() OVER (PARTITION BY token, bucket ORDER BY unix_timestamp ASC,  id ASC)  AS rn_first,
-          ROW_NUMBER() OVER (PARTITION BY token, bucket ORDER BY unix_timestamp DESC, id DESC) AS rn_last
-        FROM priced
-      )
-      SELECT
-        token,
-        bucket,
-        MAX(CASE WHEN rn_first = 1 THEN price END) AS open,
-        MAX(price)                                  AS high,
-        MIN(price)                                  AS low,
-        MAX(CASE WHEN rn_last  = 1 THEN price END) AS close,
-        AVG(price)                                  AS average_price,
-        SUM(base_amt)                               AS base_volume,
-        SUM(target_amt)                             AS target_volume,
-        SUM(buy_amt)                                AS buy_volume,
-        SUM(sell_amt)                               AS sell_volume,
-        COUNT(*)::int                               AS trade_count
-      FROM ranked
-      GROUP BY token, bucket
-    `, [sinceEpoch, untilEpoch]);
-    logger.info(`[V06Reconciliation] Spot OHLCV 1m: got ${rows.rows.length} rows`);
-
-    if (rows.rows.length === 0) {
-      logger.info('[V06Reconciliation] Spot OHLCV 1m: no rows');
-      return;
-    }
-
-    // Batch upsert into app DB using multi-value INSERT
-    const pool = this.appDb.pool;
-    if (!pool) return;
-
-    const BATCH_SIZE = 500;
-    const client = await pool.connect();
-    try {
-      await client.query('BEGIN');
-
-      for (let i = 0; i < rows.rows.length; i += BATCH_SIZE) {
-        const batch = rows.rows.slice(i, i + BATCH_SIZE);
-        const values: any[] = [];
-        const placeholders: string[] = [];
-
-        batch.forEach((row: any, idx: number) => {
-          const offset = idx * 12;
-          placeholders.push(
-            `($${offset + 1}, $${offset + 2}, $${offset + 3}, $${offset + 4}, $${offset + 5}, $${offset + 6}, $${offset + 7}, $${offset + 8}, $${offset + 9}, $${offset + 10}, $${offset + 11}, $${offset + 12}, true, CURRENT_TIMESTAMP)`
-          );
-          values.push(
-            row.token, row.bucket,
-            Number(row.open), Number(row.high), Number(row.low), Number(row.close),
-            Number(row.average_price),
-            Number(row.base_volume), Number(row.target_volume),
-            Number(row.buy_volume), Number(row.sell_volume),
-            row.trade_count,
-          );
-        });
-
-        await client.query(`
-          INSERT INTO v06_spot_ohlcv_1m
-            (token, bucket, open, high, low, close, average_price,
-             base_volume, target_volume, buy_volume, sell_volume, trade_count, is_complete, updated_at)
-          VALUES ${placeholders.join(', ')}
-          ON CONFLICT (token, bucket) DO UPDATE SET
-            open = EXCLUDED.open,
-            high = EXCLUDED.high,
-            low = EXCLUDED.low,
-            close = EXCLUDED.close,
-            average_price = EXCLUDED.average_price,
-            base_volume = EXCLUDED.base_volume,
-            target_volume = EXCLUDED.target_volume,
-            buy_volume = EXCLUDED.buy_volume,
-            sell_volume = EXCLUDED.sell_volume,
-            trade_count = EXCLUDED.trade_count,
-            is_complete = true,
-            updated_at = CURRENT_TIMESTAMP
-        `, values);
-      }
-
-      await client.query('COMMIT');
-      logger.info(`[V06Reconciliation] Spot OHLCV 1m: upserted ${rows.rows.length} buckets`);
-    } catch (err) {
-      await client.query('ROLLBACK');
-      throw err;
-    } finally {
-      client.release();
-    }
-  }
-
-  // ------------------------------------------------------------------
-  // 2) Spot OHLCV daily — rollup from 1m in app DB
-  // ------------------------------------------------------------------
-
-  private async reconcileSpotOhlcv1d(since: Date): Promise<void> {
-    const pool = this.appDb.pool;
-    if (!pool) return;
-
-    const dayStart = new Date(since);
-    dayStart.setUTCHours(0, 0, 0, 0);
-
-    await pool.query(`
-      INSERT INTO v06_spot_ohlcv_1d
-        (token, bucket, open, high, low, close, average_price,
-         base_volume, target_volume, buy_volume, sell_volume, trade_count, is_complete, updated_at)
-      SELECT
-        token,
-        date_trunc('day', bucket) AS bucket,
-        (array_agg(open ORDER BY bucket ASC))[1]   AS open,
-        MAX(high)                                   AS high,
-        MIN(CASE WHEN low > 0 THEN low END)         AS low,
-        (array_agg(close ORDER BY bucket DESC))[1]  AS close,
-        CASE WHEN SUM(base_volume) > 0
-          THEN SUM(average_price * base_volume) / SUM(base_volume)
-          ELSE 0 END                                AS average_price,
-        SUM(base_volume)                            AS base_volume,
-        SUM(target_volume)                          AS target_volume,
-        SUM(buy_volume)                             AS buy_volume,
-        SUM(sell_volume)                             AS sell_volume,
-        SUM(trade_count)                             AS trade_count,
-        -- A day is complete only if it's in the past
-        CASE WHEN date_trunc('day', bucket) < date_trunc('day', NOW()) THEN true ELSE false END,
-        CURRENT_TIMESTAMP
-      FROM v06_spot_ohlcv_1m
-      WHERE bucket >= $1
-      GROUP BY token, date_trunc('day', bucket)
-      ON CONFLICT (token, bucket) DO UPDATE SET
-        open = EXCLUDED.open,
-        high = EXCLUDED.high,
-        low = EXCLUDED.low,
-        close = EXCLUDED.close,
-        average_price = EXCLUDED.average_price,
-        base_volume = EXCLUDED.base_volume,
-        target_volume = EXCLUDED.target_volume,
-        buy_volume = EXCLUDED.buy_volume,
-        sell_volume = EXCLUDED.sell_volume,
-        trade_count = EXCLUDED.trade_count,
-        is_complete = EXCLUDED.is_complete,
-        updated_at = CURRENT_TIMESTAMP
-    `, [dayStart]);
-
-    logger.info('[V06Reconciliation] Spot OHLCV 1d: rollup complete');
-  }
-
-  // ------------------------------------------------------------------
-  // 3) Fee volume daily — spot
-  // ------------------------------------------------------------------
-
-  private async reconcileFeeDailySpot(since: string, until: string): Promise<void> {
-    // #10: Use epoch-second comparison for index-friendly WHERE.
-    // #11: Compute fee columns in SQL to avoid JS numeric precision loss.
-    const sinceEpoch = Math.floor(new Date(since).getTime() / 1000);
-    const untilEpoch = Math.floor(new Date(until).getTime() / 1000);
-
-    logger.info('[V06Reconciliation] Fee daily spot: querying...');
-    // `AT TIME ZONE 'UTC'` keeps bucketing independent of pg session timezone.
-    const rows = await this.extDb.query(`
-      SELECT
-        d.base_mint_acct                                     AS token,
-        (to_timestamp(s.unix_timestamp) AT TIME ZONE 'UTC')::date AS swap_date,
-        SUM(CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.input_amount::numeric  ELSE 0 END) AS buy_volume,
-        SUM(CASE WHEN LOWER(TRIM(s.swap_type)) = 'sell' THEN s.input_amount::numeric ELSE 0 END) AS sell_volume,
-        SUM(CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.output_amount::numeric ELSE s.input_amount::numeric END) AS base_volume,
-        SUM(CASE WHEN LOWER(TRIM(s.swap_type)) = 'buy' THEN s.input_amount::numeric  ELSE s.output_amount::numeric END) AS target_volume,
-        COUNT(*)::int AS trade_count,
-        SUM(CASE WHEN LOWER(TRIM(s.swap_type)) = 'sell' THEN s.output_amount::numeric ELSE 0 END) AS sell_output_usdc
-      FROM v0_6_spot_swaps s
-      JOIN v0_6_daos d ON d.dao_addr = s.dao_addr
-      WHERE s.unix_timestamp >= $1
-        AND s.unix_timestamp < $2
-        AND s.input_amount > 0 AND s.output_amount > 0
-        AND LOWER(TRIM(s.swap_type)) IN ('buy', 'sell')
-      GROUP BY d.base_mint_acct, (to_timestamp(s.unix_timestamp) AT TIME ZONE 'UTC')::date
-    `, [sinceEpoch, untilEpoch]);
-
-    if (rows.rows.length === 0) {
-      logger.info('[V06Reconciliation] Fee daily spot: no rows');
-      return;
-    }
-
-    const pool = this.appDb.pool;
-    if (!pool) return;
-
-    const BATCH_SIZE = 500;
-    const client = await pool.connect();
-    try {
-      await client.query('BEGIN');
-
-      for (let i = 0; i < rows.rows.length; i += BATCH_SIZE) {
-        const batch = rows.rows.slice(i, i + BATCH_SIZE);
-        const values: any[] = [];
-        const placeholders: string[] = [];
-
-        batch.forEach((r: any, idx: number) => {
-          const dateStr = r.swap_date instanceof Date
-            ? r.swap_date.toISOString().slice(0, 10)
-            : String(r.swap_date);
-          const offset = idx * 8;
-          // #11: Pass raw volumes + fee rate; compute fees in SQL as NUMERIC arithmetic
-          placeholders.push(
-            `($${offset + 1}, $${offset + 2}::date, $${offset + 3}::numeric, $${offset + 4}::numeric, $${offset + 5}::numeric, $${offset + 6}::numeric, $${offset + 7}::int, $${offset + 8}::numeric)`
-          );
-          values.push(
-            r.token, dateStr,
-            r.buy_volume, r.sell_volume,
-            r.base_volume, r.target_volume,
-            r.trade_count,
-            r.sell_output_usdc,
-          );
-        });
-
-        await client.query(`
-          INSERT INTO v06_fee_volume_daily_spot
-            (token, date, buy_volume, sell_volume, base_volume, target_volume, trade_count,
-             usdc_fees, token_fees, token_fees_usdc, sell_volume_usdc, updated_at)
-          SELECT
-            v.token, v.date, v.buy_volume, v.sell_volume, v.base_volume, v.target_volume, v.trade_count,
-            v.buy_volume * ${FEE_RATE}::numeric   AS usdc_fees,
-            v.sell_volume * ${FEE_RATE}::numeric  AS token_fees,
-            v.sell_output_usdc * ${FEE_RATE}::numeric AS token_fees_usdc,
-            v.sell_output_usdc,
-            CURRENT_TIMESTAMP
-          FROM (VALUES ${placeholders.join(', ')})
-            AS v(token, date, buy_volume, sell_volume, base_volume, target_volume, trade_count, sell_output_usdc)
-          ON CONFLICT (token, date) DO UPDATE SET
-            buy_volume = EXCLUDED.buy_volume,
-            sell_volume = EXCLUDED.sell_volume,
-            base_volume = EXCLUDED.base_volume,
-            target_volume = EXCLUDED.target_volume,
-            trade_count = EXCLUDED.trade_count,
-            usdc_fees = EXCLUDED.usdc_fees,
-            token_fees = EXCLUDED.token_fees,
-            token_fees_usdc = EXCLUDED.token_fees_usdc,
-            sell_volume_usdc = EXCLUDED.sell_volume_usdc,
-            updated_at = CURRENT_TIMESTAMP
-        `, values);
-      }
-
-      await client.query('COMMIT');
-      logger.info(`[V06Reconciliation] Fee daily spot: upserted ${rows.rows.length} rows`);
-    } catch (err) {
-      await client.query('ROLLBACK');
-      throw err;
-    } finally {
-      client.release();
-    }
-  }
-
-  // ------------------------------------------------------------------
-  // 4) Fee volume daily — conditional (winning market only)
-  // ------------------------------------------------------------------
-
-  private async reconcileFeeDailyConditional(since: string, until: string): Promise<void> {
-    // #9:  Batch upserts (multi-value INSERT) instead of row-by-row.
-    // #10: Use epoch-second comparison for index-friendly WHERE.
-    // #11: Compute fee columns in SQL to avoid JS numeric precision loss.
-    const sinceEpoch = Math.floor(new Date(since).getTime() / 1000);
-    const untilEpoch = Math.floor(new Date(until).getTime() / 1000);
-
-    // Only include swaps where:
-    //   - proposal is Passed → keep market = 'pass'
-    //   - proposal is Failed → keep market = 'fail'
-    logger.info('[V06Reconciliation] Fee daily conditional: querying winning-market swaps...');
-    const rows = await this.extDb.query(`
-      SELECT
-        d.base_mint_acct                                             AS token,
-        (to_timestamp(c.unix_timestamp) AT TIME ZONE 'UTC')::date    AS swap_date,
-        SUM(CASE WHEN LOWER(TRIM(c.swap_type)) = 'buy' THEN c.input_amount::numeric  ELSE 0 END) AS buy_volume,
-        SUM(CASE WHEN LOWER(TRIM(c.swap_type)) = 'sell' THEN c.input_amount::numeric ELSE 0 END) AS sell_volume,
-        SUM(CASE WHEN LOWER(TRIM(c.swap_type)) = 'buy' THEN c.output_amount::numeric ELSE c.input_amount::numeric END) AS base_volume,
-        SUM(CASE WHEN LOWER(TRIM(c.swap_type)) = 'buy' THEN c.input_amount::numeric  ELSE c.output_amount::numeric END) AS target_volume,
-        COUNT(*)::int AS trade_count,
-        SUM(CASE WHEN LOWER(TRIM(c.swap_type)) = 'sell' THEN c.output_amount::numeric ELSE 0 END) AS sell_output_usdc
-      FROM v0_6_conditional_swaps c
-      JOIN v0_6_proposals p ON p.proposal_addr = c.proposal_addr
-      JOIN v0_6_daos d ON d.dao_addr = p.dao_addr
-      WHERE c.unix_timestamp >= $1
-        AND c.unix_timestamp < $2
-        AND c.input_amount > 0 AND c.output_amount > 0
-        AND LOWER(TRIM(c.swap_type)) IN ('buy', 'sell')
-        AND (
-          (p.state = 'Passed' AND LOWER(TRIM(c.market)) = 'pass')
-          OR
-          (p.state = 'Failed' AND LOWER(TRIM(c.market)) = 'fail')
-        )
-      GROUP BY d.base_mint_acct, (to_timestamp(c.unix_timestamp) AT TIME ZONE 'UTC')::date
-    `, [sinceEpoch, untilEpoch]);
-
-    // Also count how many open (non-terminal) proposals have swaps in this window
-    logger.info('[V06Reconciliation] Fee daily conditional: querying pending proposals...');
-    const pendingRows = await this.extDb.query(`
-      SELECT
-        d.base_mint_acct                                           AS token,
-        (to_timestamp(c.unix_timestamp) AT TIME ZONE 'UTC')::date  AS swap_date,
-        COUNT(DISTINCT p.proposal_addr)::int                       AS pending_count
-      FROM v0_6_conditional_swaps c
-      JOIN v0_6_proposals p ON p.proposal_addr = c.proposal_addr
-      JOIN v0_6_daos d ON d.dao_addr = p.dao_addr
-      WHERE c.unix_timestamp >= $1
-        AND c.unix_timestamp < $2
-        AND p.state NOT IN ('Passed', 'Failed')
-      GROUP BY d.base_mint_acct, (to_timestamp(c.unix_timestamp) AT TIME ZONE 'UTC')::date
-    `, [sinceEpoch, untilEpoch]);
-
-    // Normalise swap_date coming from pg (Date objects) into YYYY-MM-DD strings
-    // so that Bun's Date.toString() (which emits un-parseable "GMT-0700") never
-    // leaks into map keys or query parameters.
-    const normDate = (d: unknown): string =>
-      d instanceof Date ? d.toISOString().slice(0, 10) : String(d);
-
-    const pendingMap = new Map<string, number>();
-    for (const r of pendingRows.rows) {
-      pendingMap.set(`${r.token}|${normDate(r.swap_date)}`, r.pending_count);
-    }
-
-    // Build a lookup map for winning-market rows (avoids O(n×m) find inside loop)
-    const winRowMap = new Map<string, any>();
-    for (const r of rows.rows) {
-      winRowMap.set(`${r.token}|${normDate(r.swap_date)}`, r);
-    }
-
-    const pool = this.appDb.pool;
-    if (!pool) return;
-    const client = await pool.connect();
-
-    try {
-      await client.query('BEGIN');
-
-      // Collect all token-date keys that need a row
-      const allKeys = new Set<string>();
-      for (const r of rows.rows) allKeys.add(`${r.token}|${normDate(r.swap_date)}`);
-      for (const key of pendingMap.keys()) allKeys.add(key);
-
-      // Split into rows that have winning-market data vs pending-only
-      const winEntries: { token: string; date: string; row: any; pending: number; reconciled: boolean }[] = [];
-      const pendingOnlyEntries: { token: string; date: string; pending: number }[] = [];
-
-      for (const key of allKeys) {
-        const separatorIdx = key.indexOf('|');
-        const token = key.slice(0, separatorIdx);
-        const swapDateStr = key.slice(separatorIdx + 1);
-        const winRow = winRowMap.get(key);
-        const pendingCount = pendingMap.get(key) ?? 0;
-        if (winRow) {
-          winEntries.push({ token, date: swapDateStr, row: winRow, pending: pendingCount, reconciled: pendingCount === 0 });
-        } else {
-          pendingOnlyEntries.push({ token, date: swapDateStr, pending: pendingCount });
-        }
-      }
-
-      // Batch upsert winning-market rows with fee math in SQL
-      const BATCH_SIZE = 500;
-      for (let i = 0; i < winEntries.length; i += BATCH_SIZE) {
-        const batch = winEntries.slice(i, i + BATCH_SIZE);
-        const values: any[] = [];
-        const placeholders: string[] = [];
-
-        batch.forEach((entry, idx) => {
-          const offset = idx * 10;
-          placeholders.push(
-            `($${offset + 1}, $${offset + 2}::date, $${offset + 3}::numeric, $${offset + 4}::numeric, $${offset + 5}::numeric, $${offset + 6}::numeric, $${offset + 7}::int, $${offset + 8}::numeric, $${offset + 9}::boolean, $${offset + 10}::int)`
-          );
-          values.push(
-            entry.token, entry.date,
-            entry.row.buy_volume, entry.row.sell_volume,
-            entry.row.base_volume, entry.row.target_volume,
-            entry.row.trade_count,
-            entry.row.sell_output_usdc,
-            entry.reconciled, entry.pending,
-          );
-        });
-
-        await client.query(`
-          INSERT INTO v06_fee_volume_daily_conditional
-            (token, date, buy_volume, sell_volume, base_volume, target_volume, trade_count,
-             usdc_fees, token_fees, token_fees_usdc, sell_volume_usdc,
-             conditional_reconciled, pending_open_proposals, updated_at)
-          SELECT
-            v.token, v.date, v.buy_volume, v.sell_volume, v.base_volume, v.target_volume, v.trade_count,
-            v.buy_volume * ${FEE_RATE}::numeric       AS usdc_fees,
-            v.sell_volume * ${FEE_RATE}::numeric      AS token_fees,
-            v.sell_output_usdc * ${FEE_RATE}::numeric AS token_fees_usdc,
-            v.sell_output_usdc,
-            v.reconciled, v.pending,
-            CURRENT_TIMESTAMP
-          FROM (VALUES ${placeholders.join(', ')})
-            AS v(token, date, buy_volume, sell_volume, base_volume, target_volume, trade_count, sell_output_usdc, reconciled, pending)
-          ON CONFLICT (token, date) DO UPDATE SET
-            buy_volume = EXCLUDED.buy_volume,
-            sell_volume = EXCLUDED.sell_volume,
-            base_volume = EXCLUDED.base_volume,
-            target_volume = EXCLUDED.target_volume,
-            trade_count = EXCLUDED.trade_count,
-            usdc_fees = EXCLUDED.usdc_fees,
-            token_fees = EXCLUDED.token_fees,
-            token_fees_usdc = EXCLUDED.token_fees_usdc,
-            sell_volume_usdc = EXCLUDED.sell_volume_usdc,
-            conditional_reconciled = EXCLUDED.conditional_reconciled,
-            pending_open_proposals = EXCLUDED.pending_open_proposals,
-            updated_at = CURRENT_TIMESTAMP
-        `, values);
-      }
-
-      // Batch upsert pending-only rows (no winning-market volume yet)
-      for (let i = 0; i < pendingOnlyEntries.length; i += BATCH_SIZE) {
-        const batch = pendingOnlyEntries.slice(i, i + BATCH_SIZE);
-        const values: any[] = [];
-        const placeholders: string[] = [];
-
-        batch.forEach((entry, idx) => {
-          const offset = idx * 3;
-          placeholders.push(`($${offset + 1}, $${offset + 2}::date, $${offset + 3}::int)`);
-          values.push(entry.token, entry.date, entry.pending);
-        });
-
-        await client.query(`
-          INSERT INTO v06_fee_volume_daily_conditional
-            (token, date, conditional_reconciled, pending_open_proposals, updated_at)
-          SELECT v.token, v.date, false, v.pending, CURRENT_TIMESTAMP
-          FROM (VALUES ${placeholders.join(', ')})
-            AS v(token, date, pending)
-          ON CONFLICT (token, date) DO UPDATE SET
-            conditional_reconciled = false,
-            pending_open_proposals = EXCLUDED.pending_open_proposals,
-            updated_at = CURRENT_TIMESTAMP
-        `, values);
-      }
-
-      await client.query('COMMIT');
-      logger.info(`[V06Reconciliation] Fee daily conditional: upserted ${allKeys.size} rows`);
-    } catch (err) {
-      await client.query('ROLLBACK');
-      throw err;
-    } finally {
-      client.release();
-    }
-  }
-
-  // ------------------------------------------------------------------
-  // 5) Fee volume daily aggregate — join spot + conditional from app DB
-  // ------------------------------------------------------------------
-
-  private async reconcileFeeDailyAggregate(since: Date): Promise<void> {
-    const pool = this.appDb.pool;
-    if (!pool) return;
-
-    const dayStart = new Date(since);
-    dayStart.setUTCHours(0, 0, 0, 0);
-
-    await pool.query(`
-      INSERT INTO v06_fee_volume_daily_aggregate
-        (token, date,
-         spot_buy_volume, spot_sell_volume, spot_base_volume, spot_target_volume,
-         spot_trade_count, spot_usdc_fees, spot_token_fees, spot_token_fees_usdc,
-         conditional_buy_volume, conditional_sell_volume, conditional_base_volume, conditional_target_volume,
-         conditional_trade_count, conditional_usdc_fees, conditional_token_fees, conditional_token_fees_usdc,
-         total_buy_volume, total_sell_volume, total_base_volume, total_target_volume,
-         total_trade_count, total_usdc_fees, total_token_fees, total_token_fees_usdc,
-         conditional_reconciled, pending_open_proposals, updated_at)
-      SELECT
-        COALESCE(s.token, c.token)         AS token,
-        COALESCE(s.date, c.date)           AS date,
-        -- spot
-        COALESCE(s.buy_volume, 0),
-        COALESCE(s.sell_volume, 0),
-        COALESCE(s.base_volume, 0),
-        COALESCE(s.target_volume, 0),
-        COALESCE(s.trade_count, 0),
-        COALESCE(s.usdc_fees, 0),
-        COALESCE(s.token_fees, 0),
-        COALESCE(s.token_fees_usdc, 0),
-        -- conditional (nullable)
-        c.buy_volume,
-        c.sell_volume,
-        c.base_volume,
-        c.target_volume,
-        c.trade_count,
-        c.usdc_fees,
-        c.token_fees,
-        c.token_fees_usdc,
-        -- totals
-        COALESCE(s.buy_volume, 0)    + COALESCE(c.buy_volume, 0),
-        COALESCE(s.sell_volume, 0)   + COALESCE(c.sell_volume, 0),
-        COALESCE(s.base_volume, 0)   + COALESCE(c.base_volume, 0),
-        COALESCE(s.target_volume, 0) + COALESCE(c.target_volume, 0),
-        COALESCE(s.trade_count, 0)   + COALESCE(c.trade_count, 0),
-        COALESCE(s.usdc_fees, 0)     + COALESCE(c.usdc_fees, 0),
-        COALESCE(s.token_fees, 0)    + COALESCE(c.token_fees, 0),
-        COALESCE(s.token_fees_usdc, 0) + COALESCE(c.token_fees_usdc, 0),
-        -- reconciliation
-        COALESCE(c.conditional_reconciled, true),
-        COALESCE(c.pending_open_proposals, 0),
-        CURRENT_TIMESTAMP
-      FROM v06_fee_volume_daily_spot s
-      FULL OUTER JOIN v06_fee_volume_daily_conditional c
-        ON s.token = c.token AND s.date = c.date
-      WHERE COALESCE(s.date, c.date) >= $1::date
-      ON CONFLICT (token, date) DO UPDATE SET
-        spot_buy_volume     = EXCLUDED.spot_buy_volume,
-        spot_sell_volume    = EXCLUDED.spot_sell_volume,
-        spot_base_volume    = EXCLUDED.spot_base_volume,
-        spot_target_volume  = EXCLUDED.spot_target_volume,
-        spot_trade_count    = EXCLUDED.spot_trade_count,
-        spot_usdc_fees      = EXCLUDED.spot_usdc_fees,
-        spot_token_fees     = EXCLUDED.spot_token_fees,
-        spot_token_fees_usdc = EXCLUDED.spot_token_fees_usdc,
-        conditional_buy_volume     = EXCLUDED.conditional_buy_volume,
-        conditional_sell_volume    = EXCLUDED.conditional_sell_volume,
-        conditional_base_volume    = EXCLUDED.conditional_base_volume,
-        conditional_target_volume  = EXCLUDED.conditional_target_volume,
-        conditional_trade_count    = EXCLUDED.conditional_trade_count,
-        conditional_usdc_fees      = EXCLUDED.conditional_usdc_fees,
-        conditional_token_fees     = EXCLUDED.conditional_token_fees,
-        conditional_token_fees_usdc = EXCLUDED.conditional_token_fees_usdc,
-        total_buy_volume     = EXCLUDED.total_buy_volume,
-        total_sell_volume    = EXCLUDED.total_sell_volume,
-        total_base_volume    = EXCLUDED.total_base_volume,
-        total_target_volume  = EXCLUDED.total_target_volume,
-        total_trade_count    = EXCLUDED.total_trade_count,
-        total_usdc_fees      = EXCLUDED.total_usdc_fees,
-        total_token_fees     = EXCLUDED.total_token_fees,
-        total_token_fees_usdc = EXCLUDED.total_token_fees_usdc,
-        conditional_reconciled  = EXCLUDED.conditional_reconciled,
-        pending_open_proposals  = EXCLUDED.pending_open_proposals,
-        updated_at = CURRENT_TIMESTAMP
-    `, [dayStart]);
-
-    logger.info('[V06Reconciliation] Fee daily aggregate: upsert complete');
-  }
-}
diff --git a/src/utils/alerts.ts b/src/utils/alerts.ts
index 16f7a9a..1d7967b 100644
--- a/src/utils/alerts.ts
+++ b/src/utils/alerts.ts
@@ -16,6 +16,11 @@ export async function sendAlert(
   message: string,
   options?: { cooldownKey?: string; cooldownMs?: number },
 ): Promise<void> {
+  // Never fire real webhooks from the test runner (bun test sets NODE_ENV=test):
+  // the default WEBHOOK_URL points at the production Telegram relay.
+  if (process.env.NODE_ENV === 'test') return;
+  if (!WEBHOOK_URL) return;
+
   const cooldownKey = options?.cooldownKey;
   const cooldownMs = options?.cooldownMs ?? DEFAULT_COOLDOWN_MS;
 
diff --git a/src/utils/resilience.ts b/src/utils/resilience.ts
index dda69f8..917c769 100644
--- a/src/utils/resilience.ts
+++ b/src/utils/resilience.ts
@@ -1,6 +1,6 @@
 /**
  * Resilience utilities for handling external API calls.
- * Provides timeout and retry mechanisms for Dune, Solana RPC, and other external services.
+ * Provides timeout and retry mechanisms for Solana RPC and other external services.
  */
 
 import { logger } from './logger.js';
@@ -152,12 +152,12 @@ export async function retry<T>(
  * 
  * @example
  * const data = await withRetryAndTimeout(
- *   () => fetchDuneData(queryId),
+ *   () => fetchExternalData(),
  *   {
  *     timeoutMs: 30000,
  *     maxRetries: 2,
  *     isRetryable: isTransientError,
- *     onRetry: (attempt, err, delay) => console.log(`[Dune] Retry ${attempt}`),
+ *     onRetry: (attempt, err, delay) => console.log(`Retry ${attempt}`),
  *   }
  * );
  */
@@ -232,7 +232,7 @@ export function isTransientError(error: unknown): boolean {
 
 /**
  * Create a logger function for retry attempts.
- * @param prefix - Log prefix (e.g., '[Dune]', '[Solana]')
+ * @param prefix - Log prefix (e.g., '[ExternalDB]', '[Solana]')
  */
 export function createRetryLogger(prefix: string) {
   return (attempt: number, error: unknown, nextDelayMs: number): void => {
diff --git a/src/utils/scheduling.ts b/src/utils/scheduling.ts
index 1fc48a6..7ee7ec6 100644
--- a/src/utils/scheduling.ts
+++ b/src/utils/scheduling.ts
@@ -1,6 +1,6 @@
 /**
  * Scheduling utilities to prevent refresh pileup.
- * 
+ *
  * Uses recursive setTimeout instead of setInterval to ensure
  * the next execution only starts after the current one completes.
  * This prevents overlapping executions when tasks take longer than expected.
@@ -39,7 +39,7 @@ export function scheduleWithoutPileup(
 
   const scheduleNext = () => {
     if (stopped) return;
-    
+
     nextRunTime = new Date(Date.now() + options.intervalMs);
     timeoutId = setTimeout(runTask, options.intervalMs);
   };
@@ -48,7 +48,7 @@ export function scheduleWithoutPileup(
     if (stopped) return;
     running = true;
     lastRunTime = new Date();
-    
+
     try {
       await task();
     } catch (error) {
@@ -84,171 +84,3 @@ export function scheduleWithoutPileup(
     getNextRunTime: () => nextRunTime,
   };
 }
-
-/**
- * Schedule a task to run at specific time boundaries (e.g., every 10 minutes at :00, :10, :20...).
- * Uses recursive setTimeout to prevent pileup.
- */
-export function scheduleAtBoundary(
-  task: () => Promise<void>,
-  options: {
-    name: string;
-    boundaryMinutes: number;
-    bufferSeconds?: number;
-    onError?: (error: Error) => void;
-  }
-): ScheduledTask {
-  let timeoutId: ReturnType<typeof setTimeout> | null = null;
-  let running = false;
-  let lastRunTime: Date | null = null;
-  let nextRunTime: Date | null = null;
-  let stopped = false;
-
-  const getNextBoundary = (): Date => {
-    const now = new Date();
-    const currentMinute = now.getMinutes();
-    const nextBoundaryMinute = Math.ceil((currentMinute + 1) / options.boundaryMinutes) * options.boundaryMinutes;
-    
-    const next = new Date(now);
-    if (nextBoundaryMinute >= 60) {
-      next.setHours(next.getHours() + 1);
-      next.setMinutes(0, options.bufferSeconds ?? 0, 0);
-    } else {
-      next.setMinutes(nextBoundaryMinute, options.bufferSeconds ?? 0, 0);
-    }
-    next.setMilliseconds(0);
-    
-    return next;
-  };
-
-  const scheduleNext = () => {
-    if (stopped) return;
-    
-    nextRunTime = getNextBoundary();
-    const msUntilNext = nextRunTime.getTime() - Date.now();
-    
-    logger.info(`[${options.name}] Next run at ${nextRunTime.toISOString()} (in ${Math.round(msUntilNext / 1000)}s)`);
-    timeoutId = setTimeout(runTask, msUntilNext);
-  };
-
-  const runTask = async () => {
-    if (stopped) return;
-    running = true;
-    lastRunTime = new Date();
-    
-    try {
-      await task();
-    } catch (error) {
-      const err = error instanceof Error ? error : new Error(String(error));
-      if (options.onError) {
-        options.onError(err);
-      } else {
-        logger.error(`[${options.name}] Task error:`, err);
-      }
-    } finally {
-      running = false;
-      scheduleNext();
-    }
-  };
-
-  scheduleNext();
-
-  return {
-    stop: () => {
-      stopped = true;
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-        timeoutId = null;
-      }
-      logger.info(`[${options.name}] Scheduled task stopped`);
-    },
-    isRunning: () => running,
-    getLastRunTime: () => lastRunTime,
-    getNextRunTime: () => nextRunTime,
-  };
-}
-
-/**
- * Schedule a task to run at a specific UTC hour each day.
- * Uses recursive setTimeout to prevent pileup.
- */
-export function scheduleDailyAtUTC(
-  task: () => Promise<void>,
-  options: {
-    name: string;
-    hourUTC: number;
-    minuteUTC?: number;
-    onError?: (error: Error) => void;
-  }
-): ScheduledTask {
-  let timeoutId: ReturnType<typeof setTimeout> | null = null;
-  let running = false;
-  let lastRunTime: Date | null = null;
-  let nextRunTime: Date | null = null;
-  let stopped = false;
-
-  const getNextRun = (): Date => {
-    const now = new Date();
-    const next = new Date(Date.UTC(
-      now.getUTCFullYear(),
-      now.getUTCMonth(),
-      now.getUTCDate(),
-      options.hourUTC,
-      options.minuteUTC ?? 0,
-      0,
-      0
-    ));
-    
-    if (next.getTime() <= now.getTime()) {
-      next.setUTCDate(next.getUTCDate() + 1);
-    }
-    
-    return next;
-  };
-
-  const scheduleNext = () => {
-    if (stopped) return;
-    
-    nextRunTime = getNextRun();
-    const msUntilNext = nextRunTime.getTime() - Date.now();
-    
-    logger.info(`[${options.name}] Next run at ${nextRunTime.toISOString()} (in ${Math.round(msUntilNext / 3600000)}h)`);
-    timeoutId = setTimeout(runTask, msUntilNext);
-  };
-
-  const runTask = async () => {
-    if (stopped) return;
-    running = true;
-    lastRunTime = new Date();
-    
-    try {
-      await task();
-    } catch (error) {
-      const err = error instanceof Error ? error : new Error(String(error));
-      if (options.onError) {
-        options.onError(err);
-      } else {
-        logger.error(`[${options.name}] Task error:`, err);
-      }
-    } finally {
-      running = false;
-      scheduleNext();
-    }
-  };
-
-  scheduleNext();
-
-  return {
-    stop: () => {
-      stopped = true;
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-        timeoutId = null;
-      }
-      logger.info(`[${options.name}] Scheduled task stopped`);
-    },
-    isRunning: () => running,
-    getLastRunTime: () => lastRunTime,
-    getNextRunTime: () => nextRunTime,
-  };
-}
diff --git a/src/utils/solanaErrors.ts b/src/utils/solanaErrors.ts
new file mode 100644
index 0000000..a858bc4
--- /dev/null
+++ b/src/utils/solanaErrors.ts
@@ -0,0 +1,21 @@
+import { TokenAccountNotFoundError, TokenInvalidAccountOwnerError } from '@solana/spl-token';
+
+/**
+ * True ONLY when an SPL token account is genuinely absent on-chain — i.e. a 0
+ * balance is the correct answer. Every other error from getAccount (RPC error,
+ * timeout, rate limit, transport failure) is an INFRASTRUCTURE failure and must
+ * propagate: a financial endpoint must never read an outage as a 0 balance
+ * (which would, for circulating-supply math, undercount locked tokens and
+ * OVERSTATE circulating supply / market cap).
+ *
+ * Usage:
+ *   try { const acct = await getAccount(conn, ata); ... }
+ *   catch (e) { if (!isTokenAccountAbsent(e)) throw e;  // RPC failure → propagate
+ *               amount = new BN(0);  // genuinely absent → 0 is correct }
+ */
+export function isTokenAccountAbsent(error: unknown): boolean {
+  return (
+    error instanceof TokenAccountNotFoundError ||
+    error instanceof TokenInvalidAccountOwnerError
+  );
+}
diff --git a/src/utils/validation.ts b/src/utils/validation.ts
index 8e668dc..ea5fb0d 100644
--- a/src/utils/validation.ts
+++ b/src/utils/validation.ts
@@ -383,7 +383,7 @@ export function getUTCDateString(date: Date = new Date()): string {
 
 /**
  * Validate that a timestamp string is valid and normalize to UTC.
- * Used for parsing timestamps from external sources like Dune.
+ * Used for parsing timestamps from external data sources.
  */
 export function parseTimestampAsUTC(
   value: string | undefined,
@@ -395,7 +395,7 @@ export function parseTimestampAsUTC(
 
   const trimmed = value.trim();
   
-  // Handle Dune-style timestamps which may have inconsistent formats
+  // Handle external timestamps which may have inconsistent formats
   // e.g., "2024-01-15T10:20:00" or "2024-01-15 10:20:00"
   const normalized = trimmed.replace(' ', 'T');
   
diff --git a/tests/api.test.ts b/tests/api.test.ts
index 083b444..608e5c6 100644
--- a/tests/api.test.ts
+++ b/tests/api.test.ts
@@ -4,7 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { createApp, type Services } from '../src/app.js';
 import type { FutarchyService, DaoTickerData } from '../src/services/futarchyService.js';
 import type { PriceService } from '../src/services/priceService.js';
-import type { DatabaseService } from '../src/services/databaseService.js';
+import type { ExternalDatabaseService } from '../src/services/externalDatabaseService.js';
 
 // Mock DAO data
 const mockBaseMint = new PublicKey('SoLo9oxzLDpcq1dpqAgMwgce5WqkRDtNXK7EPnbmeta');
@@ -38,7 +38,6 @@ const mockFutarchyService = {
     baseProtocolFees: new BN('100000000'),
     quoteProtocolFees: new BN('5000000'),
   }),
-  getTotalLiquidity: jest.fn().mockResolvedValue(new BN('100000000000')),
 } as unknown as FutarchyService;
 
 const mockPriceService = {
@@ -48,30 +47,29 @@ const mockPriceService = {
     ask: '0.05025',
   })),
   calculateLiquidityUSD: jest.fn(() => '100000.00'),
-  calculateVolumeFromFees: jest.fn(() => ({
-    baseVolume: '40.00000000',
-    targetVolume: '2.00000000',
-  })),
 } as unknown as PriceService;
 
-const mockDatabaseService = {
+// /api/tickers 24h metrics come from the unified user_pool ETL candles
+// (user_pool_spot_ohlcv), keyed by token (base mint). First-trade dates (startDate)
+// also come from the served (external) DB. Single source, no app-DB fallback.
+const mockExternalDatabaseService = {
   isAvailable: jest.fn().mockReturnValue(true),
+  getSpotRolling24hMetrics: jest.fn().mockResolvedValue(new Map()),
   getFirstTradeDates: jest.fn().mockResolvedValue(new Map()),
-} as unknown as DatabaseService;
+  checkServedDataContract: jest.fn().mockResolvedValue({
+    ok: true,
+    checkedAt: '2024-01-01T00:00:00.000Z',
+    missing: [],
+  }),
+} as unknown as ExternalDatabaseService;
 
 function createMockServices(): Services {
   return {
     futarchyService: mockFutarchyService,
     priceService: mockPriceService,
-    databaseService: mockDatabaseService,
-    duneService: null,
-    duneCacheService: null,
+    externalDatabaseService: mockExternalDatabaseService,
     solanaService: undefined,
     launchpadService: undefined,
-    hourlyAggregationService: null,
-    tenMinuteVolumeFetcherService: null,
-    dailyAggregationService: null,
-    meteoraVolumeFetcherService: null,
   };
 }
 
@@ -123,6 +121,58 @@ describe('CoinGecko API', () => {
         expect(response.body[0].target_volume).toBe('0');
       }
     });
+
+    it('should return 503 instead of zero volume when the served DB is unavailable', async () => {
+      (mockExternalDatabaseService as any).isAvailable.mockReturnValueOnce(false);
+
+      const response = await request(app).get('/api/tickers');
+
+      expect(response.status).toBe(503);
+      expect(response.body.error).toBe('Served database not available');
+      expect(response.body.code).toBe('SERVED_DB_UNAVAILABLE');
+    });
+
+    it('should read 24h volume from user_pool_spot_ohlcv keyed by token (base mint)', async () => {
+      (mockExternalDatabaseService as any).getSpotRolling24hMetrics.mockResolvedValueOnce(new Map([
+        [mockBaseMint.toString(), {
+          token: mockBaseMint.toString(),
+          base_volume_24h: '12.5',
+          target_volume_24h: '125',
+          high_24h: '0.06',
+          low_24h: '0.04',
+          trade_count_24h: 4,
+        }],
+      ]));
+
+      const response = await request(app).get('/api/tickers');
+
+      expect(response.status).toBe(200);
+      expect(response.body[0].base_volume).toBe('12.5');
+      expect(response.body[0].target_volume).toBe('125');
+      expect(response.body[0].high_24h).toBe('0.06');
+      expect(response.body[0].low_24h).toBe('0.04');
+    });
+
+    it('should set startDate from the served DB first-trade dates (keyed by base mint)', async () => {
+      (mockExternalDatabaseService as any).getFirstTradeDates.mockResolvedValueOnce(
+        new Map([[mockBaseMint.toString(), '2024-03-07']])
+      );
+
+      const response = await request(app).get('/api/tickers');
+
+      expect(response.status).toBe(200);
+      expect(response.body[0].startDate).toBe('2024-03-07');
+      expect((mockExternalDatabaseService as any).getFirstTradeDates).toHaveBeenCalled();
+    });
+
+    it('should omit startDate when no first-trade date exists for the base mint', async () => {
+      // Default mock returns an empty Map.
+      const response = await request(app).get('/api/tickers');
+
+      expect(response.status).toBe(200);
+      expect(response.body[0]).not.toHaveProperty('startDate');
+    });
+
   });
 
   describe('GET /health', () => {
diff --git a/tests/helpers/testApp.ts b/tests/helpers/testApp.ts
index 4c97eda..fdfc24c 100644
--- a/tests/helpers/testApp.ts
+++ b/tests/helpers/testApp.ts
@@ -2,24 +2,28 @@ import BN from 'bn.js';
 import { createApp, type Services } from '../../src/app.js';
 import type { FutarchyService } from '../../src/services/futarchyService.js';
 import type { PriceService } from '../../src/services/priceService.js';
-import type { DatabaseService } from '../../src/services/databaseService.js';
+import type { ExternalDatabaseService } from '../../src/services/externalDatabaseService.js';
 import type { SolanaService } from '../../src/services/solanaService.js';
 import type { LaunchpadService } from '../../src/services/launchpadService.js';
 
-export function createMockDatabaseService(): DatabaseService {
+export function createMockExternalDatabaseService(): ExternalDatabaseService {
   return {
     isAvailable: () => true,
+    getSpotRolling24hMetrics: async () => new Map(),
+    getDailyMeteoraVolumes: async () => [],
+    getFutarchyAmmDailyActivity: async () => [],
     getFirstTradeDates: async () => new Map(),
-    getServiceHealthHistory: async () => [],
-    getHourlyRecordCount: async () => 0,
-    getTenMinuteRecordCount: async () => 0,
-    getDailyRecordCount: async () => 0,
-    getBuySellRecordCount: async () => 0,
-    insertServiceHealthSnapshot: async () => {},
-    insertMetricsBatch: async () => {},
-    pruneOldMetrics: async () => {},
+    getServedDataFreshness: async () => ({
+      latestSwapAt: new Date().toISOString(),
+      ageSeconds: 30,
+    }),
+    checkServedDataContract: async () => ({
+      ok: true,
+      checkedAt: new Date().toISOString(),
+      missing: [],
+    }),
     close: async () => {},
-  } as unknown as DatabaseService;
+  } as unknown as ExternalDatabaseService;
 }
 
 export function createMockFutarchyService(): FutarchyService {
@@ -63,15 +67,9 @@ export function createTestServices(overrides?: Partial<Services>): Services {
   return {
     futarchyService: createMockFutarchyService(),
     priceService: createMockPriceService(),
-    databaseService: createMockDatabaseService(),
-    duneService: null,
-    duneCacheService: null,
+    externalDatabaseService: createMockExternalDatabaseService(),
     solanaService: createMockSolanaService(),
     launchpadService: createMockLaunchpadService(),
-    hourlyAggregationService: null,
-    tenMinuteVolumeFetcherService: null,
-    dailyAggregationService: null,
-    meteoraVolumeFetcherService: null,
     ...overrides,
   };
 }
diff --git a/tests/routes/dexscreener.test.ts b/tests/routes/dexscreener.test.ts
new file mode 100644
index 0000000..d0f7e57
--- /dev/null
+++ b/tests/routes/dexscreener.test.ts
@@ -0,0 +1,97 @@
+import { describe, it, expect } from 'bun:test';
+import request from 'supertest';
+import { createTestApp } from '../helpers/testApp.js';
+import type { ExternalDatabaseService } from '../../src/services/externalDatabaseService.js';
+
+// Stub the served DB with canned user_pool_swaps-shaped rows (the aliased column
+// shape the migrated /events SQL returns) so we test the event-building transform:
+// buy/sell leg mapping, priceNative, reserves, and txnIndex/eventIndex grouping.
+function extDbReturning(rows: any[]): ExternalDatabaseService {
+  return {
+    isAvailable: () => true,
+    query: async (text: string) => {
+      if (/ORDER BY slot DESC/i.test(text)) {
+        return { rows: [{ slot: 999, unix_timestamp: '1700000999' }] } as any;
+      }
+      return { rows } as any; // /events
+    },
+  } as unknown as ExternalDatabaseService;
+}
+
+describe('DexScreener Routes', () => {
+  describe('GET /dexscreener/events', () => {
+    it('maps buy/sell legs, price, reserves, and txn/event indices from user_pool_swaps', async () => {
+      // Two swaps in one signature (same txn → eventIndex 0,1), one in a second txn.
+      const rows = [
+        { id: 1, signature: 'SIGA', slot: 10, unix_timestamp: '1700', dao_addr: 'DAO1', user_addr: 'U1',
+          swap_type: 'buy',  input_amount: '2000000',  output_amount: '40000000',
+          amm_base_amount: '1000000000', amm_quote_amount: '50000000' },
+        { id: 2, signature: 'SIGA', slot: 10, unix_timestamp: '1700', dao_addr: 'DAO1', user_addr: 'U1',
+          swap_type: 'sell', input_amount: '10000000', output_amount: '500000',
+          amm_base_amount: '1010000000', amm_quote_amount: '49500000' },
+        // Same slot as SIGA, new signature → txnIndex increments, eventIndex resets.
+        { id: 3, signature: 'SIGB', slot: 10, unix_timestamp: '1700', dao_addr: 'DAO1', user_addr: 'U2',
+          swap_type: 'buy',  input_amount: '1000000',  output_amount: '20000000',
+          amm_base_amount: '990000000', amm_quote_amount: '50500000' },
+      ];
+      const app = createTestApp({ externalDatabaseService: extDbReturning(rows) });
+
+      const res = await request(app).get('/dexscreener/events').query({ fromBlock: 0, toBlock: 100 });
+      expect(res.status).toBe(200);
+      expect(res.body.events).toHaveLength(3);
+
+      const [buy, sell, buy2] = res.body.events;
+
+      // Buy: USDC in (asset1In), token out (asset0Out); price = USDC/token = 2/40 = 0.05
+      expect(buy.eventType).toBe('swap');
+      expect(buy.txnId).toBe('SIGA');
+      expect(buy.txnIndex).toBe(0);
+      expect(buy.eventIndex).toBe(0);
+      expect(buy.maker).toBe('U1');
+      expect(buy.pairId).toBe('DAO1');
+      expect(buy.asset1In).toBe(2);
+      expect(buy.asset0Out).toBe(40);
+      expect(buy.priceNative).toBeCloseTo(0.05, 9);
+      expect(buy.reserves).toEqual({ asset0: 1000, asset1: 50 });
+
+      // Second swap in the SAME signature → same txnIndex, eventIndex increments.
+      expect(sell.txnId).toBe('SIGA');
+      expect(sell.txnIndex).toBe(0);
+      expect(sell.eventIndex).toBe(1);
+      // Sell: token in (asset0In=10), USDC out (asset1Out=0.5); price = USDC/token = 0.5/10 = 0.05
+      expect(sell.asset0In).toBe(10);
+      expect(sell.asset1Out).toBe(0.5);
+      expect(sell.priceNative).toBeCloseTo(0.05, 9);
+      expect(sell.reserves).toEqual({ asset0: 1010, asset1: 49.5 });
+
+      // New signature in the SAME slot → txnIndex increments, eventIndex resets.
+      expect(buy2.txnId).toBe('SIGB');
+      expect(buy2.txnIndex).toBe(1);
+      expect(buy2.eventIndex).toBe(0);
+    });
+
+    it('returns 503 when the served DB is unavailable', async () => {
+      const app = createTestApp({
+        externalDatabaseService: { isAvailable: () => false } as unknown as ExternalDatabaseService,
+      });
+      const res = await request(app).get('/dexscreener/events').query({ fromBlock: 0, toBlock: 100 });
+      expect(res.status).toBe(503);
+    });
+
+    it('rejects an out-of-order block range', async () => {
+      const app = createTestApp({ externalDatabaseService: extDbReturning([]) });
+      const res = await request(app).get('/dexscreener/events').query({ fromBlock: 100, toBlock: 10 });
+      expect(res.status).toBe(400);
+    });
+  });
+
+  describe('GET /dexscreener/latest-block', () => {
+    it('returns the latest block from user_pool_swaps', async () => {
+      const app = createTestApp({ externalDatabaseService: extDbReturning([]) });
+      const res = await request(app).get('/dexscreener/latest-block');
+      expect(res.status).toBe(200);
+      expect(res.body.block.blockNumber).toBe(999);
+      expect(res.body.block.blockTimestamp).toBe(1700000999);
+    });
+  });
+});
diff --git a/tests/routes/failurePaths.test.ts b/tests/routes/failurePaths.test.ts
new file mode 100644
index 0000000..d9ef07f
--- /dev/null
+++ b/tests/routes/failurePaths.test.ts
@@ -0,0 +1,150 @@
+/**
+ * Failure-path contract tests for the financial endpoints.
+ *
+ * The serving invariant: an infrastructure failure (RPC down, DB query error)
+ * must surface as a 5xx — NEVER as a 200 with zero/total/empty data that a
+ * consumer would read as real market data. These tests pin that behavior for
+ * every financial route so a future refactor can't silently reintroduce a
+ * swallow-and-default path.
+ */
+
+import { describe, it, expect } from 'bun:test';
+import request from 'supertest';
+import { createTestApp, createMockExternalDatabaseService } from '../helpers/testApp.js';
+import type { ExternalDatabaseService } from '../../src/services/externalDatabaseService.js';
+import type { LaunchpadService } from '../../src/services/launchpadService.js';
+import type { SolanaService } from '../../src/services/solanaService.js';
+
+const VALID_MINT = 'SoLo9oxzLDpcq1dpqAgMwgce5WqkRDtNXK7EPnbmeta';
+
+function failingExtDb(overrides: Partial<ExternalDatabaseService>): ExternalDatabaseService {
+  return {
+    ...createMockExternalDatabaseService(),
+    ...overrides,
+  } as unknown as ExternalDatabaseService;
+}
+
+describe('Financial endpoint failure paths (infra failure → 5xx, never fake data)', () => {
+  describe('/api/supply/:mint/circulating', () => {
+    it('returns 500 when the allocation breakdown fails (RPC outage), not circulating=total', async () => {
+      const launchpadService = {
+        getTokenAllocationBreakdown: async () => {
+          throw new Error('RPC connection refused');
+        },
+      } as unknown as LaunchpadService;
+      const app = createTestApp({ launchpadService });
+
+      const res = await request(app).get(`/api/supply/${VALID_MINT}/circulating`);
+
+      expect(res.status).toBe(500);
+      expect(res.body).not.toHaveProperty('result');
+    });
+
+    it('returns 500 when the mint supply fetch fails', async () => {
+      const solanaService = {
+        getSupplyInfo: async () => {
+          throw new Error('RPC timeout');
+        },
+        getTotalSupply: async () => {
+          throw new Error('RPC timeout');
+        },
+      } as unknown as SolanaService;
+      const app = createTestApp({ solanaService });
+
+      const res = await request(app).get(`/api/supply/${VALID_MINT}/circulating`);
+
+      expect(res.status).toBe(500);
+    });
+  });
+
+  describe('/api/supply/:mint/total', () => {
+    it('returns 500 when the RPC fetch fails', async () => {
+      const solanaService = {
+        getTotalSupply: async () => {
+          throw new Error('RPC timeout');
+        },
+      } as unknown as SolanaService;
+      const app = createTestApp({ solanaService });
+
+      const res = await request(app).get(`/api/supply/${VALID_MINT}/total`);
+
+      expect(res.status).toBe(500);
+      expect(res.body).not.toHaveProperty('result');
+    });
+  });
+
+  describe('/api/tickers', () => {
+    it('returns 5xx when the 24h metrics query fails (a failed query is not "zero volume")', async () => {
+      const externalDatabaseService = failingExtDb({
+        getSpotRolling24hMetrics: async () => {
+          throw new Error('relation does not exist');
+        },
+      });
+      const app = createTestApp({ externalDatabaseService });
+
+      const res = await request(app).get('/api/tickers');
+
+      expect(res.status).toBeGreaterThanOrEqual(500);
+      expect(Array.isArray(res.body)).toBe(false);
+    });
+
+    it('returns 503 when the served DB is unavailable', async () => {
+      const externalDatabaseService = failingExtDb({ isAvailable: () => false });
+      const app = createTestApp({ externalDatabaseService });
+
+      const res = await request(app).get('/api/tickers');
+
+      expect(res.status).toBe(503);
+      expect(res.body.code).toBe('SERVED_DB_UNAVAILABLE');
+    });
+  });
+
+  describe('/api/market-data', () => {
+    it('returns 500 when the daily-activity query fails, with no partial data', async () => {
+      const externalDatabaseService = failingExtDb({
+        getFutarchyAmmDailyActivity: async () => {
+          throw new Error('query failed');
+        },
+      });
+      const app = createTestApp({ externalDatabaseService });
+
+      const res = await request(app)
+        .get('/api/market-data')
+        .query({ startDate: '2026-01-01', endDate: '2026-01-31' });
+
+      expect(res.status).toBe(500);
+      expect(res.body).not.toHaveProperty('futarchyAMM');
+      // No raw SQL/schema detail leaks to the client
+      expect(JSON.stringify(res.body)).not.toContain('query failed');
+    });
+
+    it('returns 503 when the served DB is unavailable', async () => {
+      const externalDatabaseService = failingExtDb({ isAvailable: () => false });
+      const app = createTestApp({ externalDatabaseService });
+
+      const res = await request(app)
+        .get('/api/market-data')
+        .query({ startDate: '2026-01-01', endDate: '2026-01-31' });
+
+      expect(res.status).toBe(503);
+    });
+  });
+
+  describe('/dexscreener/events', () => {
+    it('returns 5xx when the swaps query fails (a failed query is not "no events")', async () => {
+      const externalDatabaseService = failingExtDb({
+        query: async () => {
+          throw new Error('connection terminated');
+        },
+      } as Partial<ExternalDatabaseService>);
+      const app = createTestApp({ externalDatabaseService });
+
+      const res = await request(app)
+        .get('/dexscreener/events')
+        .query({ fromBlock: 0, toBlock: 100 });
+
+      expect(res.status).toBeGreaterThanOrEqual(500);
+      expect(res.body).not.toHaveProperty('events');
+    });
+  });
+});
diff --git a/tests/routes/health.test.ts b/tests/routes/health.test.ts
index 4049246..6e15a3a 100644
--- a/tests/routes/health.test.ts
+++ b/tests/routes/health.test.ts
@@ -1,90 +1,94 @@
 import { describe, it, expect } from 'bun:test';
 import request from 'supertest';
-import { createTestApp } from '../helpers/testApp.js';
+import { createTestApp, createMockExternalDatabaseService } from '../helpers/testApp.js';
+import type { ExternalDatabaseService } from '../../src/services/externalDatabaseService.js';
 
 const app = createTestApp();
 
 describe('Health Routes', () => {
-  describe('GET /health', () => {
+  describe('GET /health (liveness)', () => {
     it('should return 200 with healthy status', async () => {
       const response = await request(app).get('/health');
-      
+
       expect(response.status).toBe(200);
       expect(response.body.status).toBe('healthy');
     });
 
     it('should include timestamp', async () => {
       const response = await request(app).get('/health');
-      
+
       expect(response.body.timestamp).toBeDefined();
       expect(new Date(response.body.timestamp).getTime()).not.toBeNaN();
     });
 
     it('should include uptime', async () => {
       const response = await request(app).get('/health');
-      
+
       expect(response.body.uptime).toBeDefined();
       expect(typeof response.body.uptime).toBe('number');
       expect(response.body.uptime).toBeGreaterThanOrEqual(0);
     });
-
-    it('should include duneCache info when available', async () => {
-      const response = await request(app).get('/health');
-      
-      // duneCache may be null if not configured
-      expect(response.body).toHaveProperty('duneCache');
-    });
   });
 
-  describe('GET /api/health', () => {
-    it('should return 200 with comprehensive health status', async () => {
+  describe('GET /api/health (readiness)', () => {
+    it('reports healthy with served DB connected, contract ok, and freshness', async () => {
       const response = await request(app).get('/api/health');
-      
+
       expect(response.status).toBe(200);
-      expect(response.body).toHaveProperty('status');
-      expect(response.body).toHaveProperty('timestamp');
-      expect(response.body).toHaveProperty('services');
-      expect(response.body).toHaveProperty('database');
+      expect(response.body.status).toBe('healthy');
+      expect(response.body.servedDatabase.connected).toBe(true);
+      expect(response.body.servedDatabase.servedDataContract.ok).toBe(true);
+      expect(response.body.servedDatabase.freshness.ageSeconds).toBe(30);
+      expect(response.body.servedDatabase.freshness.latestSwapAt).toBeDefined();
     });
 
-    it('should report database connection status', async () => {
-      const response = await request(app).get('/api/health');
-      
-      expect(response.body.database).toHaveProperty('connected');
-      expect(typeof response.body.database.connected).toBe('boolean');
-    });
+    it('reports degraded when the served DB is not connected', async () => {
+      const extDb = {
+        ...createMockExternalDatabaseService(),
+        isAvailable: () => false,
+      } as unknown as ExternalDatabaseService;
+      const degradedApp = createTestApp({ externalDatabaseService: extDb });
 
-    it('should return services object', async () => {
-      const response = await request(app).get('/api/health');
-      
-      expect(typeof response.body.services).toBe('object');
-    });
-  });
+      const response = await request(degradedApp).get('/api/health');
 
-  describe('GET /api/health/history', () => {
-    it('should return history or error', async () => {
-      const response = await request(app).get('/api/health/history');
-      
-      // 200 if database connected, 503 if not
-      expect([200, 503]).toContain(response.status);
+      expect(response.status).toBe(200);
+      expect(response.body.status).toBe('degraded');
+      expect(response.body.servedDatabase.connected).toBe(false);
+      expect(response.body.servedDatabase.servedDataContract.missing).toContain('connection');
+      expect(response.body.message).toContain('not connected');
     });
 
-    it('should accept hours parameter', async () => {
-      const response = await request(app).get('/api/health/history?hours=12');
-      
-      expect([200, 503]).toContain(response.status);
-      if (response.status === 200) {
-        expect(response.body.hours).toBe(12);
-      }
+    it('reports degraded when the served data contract check fails', async () => {
+      const extDb = {
+        ...createMockExternalDatabaseService(),
+        checkServedDataContract: async () => ({
+          ok: false,
+          checkedAt: new Date().toISOString(),
+          missing: ['futarchy.user_pool_swaps.inner_group'],
+        }),
+      } as unknown as ExternalDatabaseService;
+      const degradedApp = createTestApp({ externalDatabaseService: extDb });
+
+      const response = await request(degradedApp).get('/api/health');
+
+      expect(response.body.status).toBe('degraded');
+      expect(response.body.message).toContain('contract');
     });
 
-    it('should accept service parameter', async () => {
-      const response = await request(app).get('/api/health/history?service=dune_cache');
-      
-      expect([200, 503]).toContain(response.status);
-      if (response.status === 200) {
-        expect(response.body.service).toBe('dune_cache');
-      }
+    it('reports degraded when the freshness query fails (never masks a failure)', async () => {
+      const extDb = {
+        ...createMockExternalDatabaseService(),
+        getServedDataFreshness: async () => {
+          throw new Error('query failed');
+        },
+      } as unknown as ExternalDatabaseService;
+      const degradedApp = createTestApp({ externalDatabaseService: extDb });
+
+      const response = await request(degradedApp).get('/api/health');
+
+      expect(response.body.status).toBe('degraded');
+      expect(response.body.servedDatabase.freshness).toBeNull();
+      expect(response.body.message).toContain('freshness');
     });
   });
 });
diff --git a/tests/routes/market.test.ts b/tests/routes/market.test.ts
index 41c3219..dd5911e 100644
--- a/tests/routes/market.test.ts
+++ b/tests/routes/market.test.ts
@@ -1,89 +1,115 @@
 import { describe, it, expect } from 'bun:test';
 import request from 'supertest';
 import { createTestApp } from '../helpers/testApp.js';
+import type { ExternalDatabaseService } from '../../src/services/externalDatabaseService.js';
 
 const app = createTestApp();
 
+// A served-DB stub seeded with one futarchy row (spot + conditional pivoted by
+// getFutarchyAmmDailyActivity) and one meteora row, so the happy path asserts the
+// actual user_pool ETL → /api/market-data contract, not just the HTTP envelope.
+function seededExternalDb(): ExternalDatabaseService {
+  return {
+    isAvailable: () => true,
+    getFutarchyAmmDailyActivity: async () => [
+      {
+        token: 'TOK', date: '2024-01-02', has_conditional_volume: true,
+        spot_target_volume: '1000', spot_usdc_fees: '5',
+        spot_protocol_fee_usd: '4', spot_lp_fee_usd: '1',
+        conditional_target_volume: '200', conditional_usdc_fees: '1',
+        total_target_volume: '1200', total_usdc_fees: '6',
+        total_protocol_fee_usd: '4.8', total_lp_fee_usd: '1.2',
+        conditional_reconciled: true, pending_open_proposals: 0,
+      },
+    ],
+    getDailyMeteoraVolumes: async () => [
+      {
+        token: 'TOK', date: '2024-01-02', base_volume: '50', target_volume: '500',
+        buy_volume: '300', sell_volume: '200', trade_count: 7, average_price: '10',
+        usdc_fees: '2', token_fees: '0.1', token_fees_usdc: '1', token_per_usdc: '0.1',
+      },
+    ],
+  } as unknown as ExternalDatabaseService;
+}
+
 describe('Market Routes', () => {
   describe('GET /api/market-data', () => {
-    it('should require startDate parameter', async () => {
-      const response = await request(app)
-        .get('/api/market-data')
-        .query({ endDate: '2024-01-15' });
-      
-      // 400 for validation error, or 503 if database check happens first
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Missing required parameter');
-        expect(response.body.field).toBe('startDate');
-      }
+    it('returns 400 with field=startDate when startDate is missing', async () => {
+      const response = await request(app).get('/api/market-data').query({ endDate: '2024-01-15' });
+      expect(response.status).toBe(400);
+      expect(response.body.error).toBe('Missing required parameter');
+      expect(response.body.field).toBe('startDate');
     });
 
-    it('should require endDate parameter', async () => {
-      const response = await request(app)
-        .get('/api/market-data')
-        .query({ startDate: '2024-01-01' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Missing required parameter');
-        expect(response.body.field).toBe('endDate');
-      }
+    it('returns 400 with field=endDate when endDate is missing', async () => {
+      const response = await request(app).get('/api/market-data').query({ startDate: '2024-01-01' });
+      expect(response.status).toBe(400);
+      expect(response.body.error).toBe('Missing required parameter');
+      expect(response.body.field).toBe('endDate');
     });
 
-    it('should validate date format for startDate', async () => {
+    it('returns 400 Invalid date format for a malformed startDate', async () => {
       const response = await request(app)
         .get('/api/market-data')
         .query({ startDate: '01-01-2024', endDate: '2024-01-15' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Invalid date format');
-      }
+      expect(response.status).toBe(400);
+      expect(response.body.error).toBe('Invalid date format');
     });
 
-    it('should validate date format for endDate', async () => {
-      const response = await request(app)
+    it('returns 503 when the served DB is unavailable', async () => {
+      const downApp = createTestApp({
+        externalDatabaseService: { isAvailable: () => false } as unknown as ExternalDatabaseService,
+      });
+      const response = await request(downApp)
         .get('/api/market-data')
-        .query({ startDate: '2024-01-01', endDate: '15/01/2024' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Invalid date format');
-      }
+        .query({ startDate: '2024-01-01', endDate: '2024-01-15' });
+      expect(response.status).toBe(503);
+      expect(response.body.error).toBe('Served database not available');
     });
 
-    it('should accept valid date parameters', async () => {
-      const response = await request(app)
+    it('serves futarchy + meteora rows from the user_pool ETL with exact values', async () => {
+      const seededApp = createTestApp({ externalDatabaseService: seededExternalDb() });
+      const response = await request(seededApp)
         .get('/api/market-data')
         .query({ startDate: '2024-01-01', endDate: '2024-01-15' });
-      
-      // 200 with data, 503 if database not connected, or 500 if mock incomplete
-      expect([200, 500, 503]).toContain(response.status);
-      
-      if (response.status === 200) {
-        expect(response.body).toHaveProperty('filters');
-        expect(response.body).toHaveProperty('count');
-        expect(response.body).toHaveProperty('data');
-        expect(response.body.filters.startDate).toBe('2024-01-01');
-        expect(response.body.filters.endDate).toBe('2024-01-15');
-      }
+
+      expect(response.status).toBe(200);
+      // envelope
+      expect(response.body.source).toBe('user-pool-etl');
+      expect(response.body.filters.startDate).toBe('2024-01-01');
+      expect(response.body.filters.endDate).toBe('2024-01-15');
+
+      // futarchy block — source-tagged, counted, and the pivoted spot/conditional/total
+      // + protocol/LP split passed through verbatim from getFutarchyAmmDailyActivity.
+      expect(response.body.futarchyAMM.source).toBe('etl-user-pool-daily');
+      expect(response.body.futarchyAMM.count).toBe(1);
+      const fut = response.body.futarchyAMM.data[0];
+      expect(fut.token).toBe('TOK');
+      expect(fut.spot_target_volume).toBe('1000');
+      expect(fut.spot_protocol_fee_usd).toBe('4');
+      expect(fut.spot_lp_fee_usd).toBe('1');
+      expect(fut.total_target_volume).toBe('1200');
+      expect(fut.total_protocol_fee_usd).toBe('4.8');
+      expect(fut.total_lp_fee_usd).toBe('1.2');
+      expect(fut.conditional_reconciled).toBe(true);
+
+      // meteora block
+      expect(response.body.meteora.source).toBe('etl-meteora-daily');
+      expect(response.body.meteora.count).toBe(1);
+      const met = response.body.meteora.data[0];
+      expect(met.token).toBe('TOK');
+      expect(met.target_volume).toBe('500');
+      expect(met.usdc_fees).toBe('2');
+      expect(met.token_per_usdc).toBe('0.1');
     });
 
-    it('should accept tokens parameter', async () => {
-      const response = await request(app)
+    it('passes the tokens filter through to the response envelope', async () => {
+      const seededApp = createTestApp({ externalDatabaseService: seededExternalDb() });
+      const response = await request(seededApp)
         .get('/api/market-data')
-        .query({ 
-          startDate: '2024-01-01', 
-          endDate: '2024-01-15',
-          tokens: 'token1,token2'
-        });
-      
-      expect([200, 500, 503]).toContain(response.status);
-      
-      if (response.status === 200) {
-        expect(response.body.filters.tokens).toEqual(['token1', 'token2']);
-      }
+        .query({ startDate: '2024-01-01', endDate: '2024-01-15', tokens: 'token1,token2' });
+      expect(response.status).toBe(200);
+      expect(response.body.filters.tokens).toEqual(['token1', 'token2']);
     });
   });
 });
diff --git a/tests/routes/metrics.test.ts b/tests/routes/metrics.test.ts
index 86ba612..09e45de 100644
--- a/tests/routes/metrics.test.ts
+++ b/tests/routes/metrics.test.ts
@@ -8,89 +8,24 @@ describe('Metrics Routes', () => {
   describe('GET /metrics', () => {
     it('should return Prometheus metrics', async () => {
       const response = await request(app).get('/metrics');
-      
+
       expect(response.status).toBe(200);
       expect(response.headers['content-type']).toContain('text/plain');
     });
 
     it('should include standard metrics', async () => {
       const response = await request(app).get('/metrics');
-      
+
       expect(response.status).toBe(200);
       // Prometheus format includes HELP and TYPE comments
       expect(response.text).toContain('# HELP');
       expect(response.text).toContain('# TYPE');
     });
-  });
-
-  describe('GET /api/metrics/history/:metricName', () => {
-    it('should require database connection', async () => {
-      const response = await request(app).get('/api/metrics/history/test_metric');
-      
-      // 200 if database connected, 503 if not, 500 if mock incomplete
-      expect([200, 500, 503]).toContain(response.status);
-    });
-
-    it('should validate hours parameter', async () => {
-      const response = await request(app)
-        .get('/api/metrics/history/test_metric')
-        .query({ hours: 'invalid' });
-      
-      // 400 if validation runs, 503 if database check happens first
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Invalid integer');
-      }
-    });
 
-    it('should enforce hours minimum', async () => {
-      const response = await request(app)
-        .get('/api/metrics/history/test_metric')
-        .query({ hours: '0' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Value too small');
-      }
-    });
-
-    it('should enforce hours maximum', async () => {
-      const response = await request(app)
-        .get('/api/metrics/history/test_metric')
-        .query({ hours: '200' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Value too large');
-      }
-    });
-
-    it('should validate labels JSON', async () => {
-      const response = await request(app)
-        .get('/api/metrics/history/test_metric')
-        .query({ labels: '{invalid json}' });
-      
-      expect([400, 503]).toContain(response.status);
-      if (response.status === 400) {
-        expect(response.body.error).toBe('Invalid JSON');
-      }
-    });
-
-    it('should accept valid labels JSON', async () => {
-      const response = await request(app)
-        .get('/api/metrics/history/test_metric')
-        .query({ labels: '{"table":"daily_volumes"}' });
-      
-      // 200 if database connected, 503 if not, 500 if mock incomplete
-      expect([200, 500, 503]).toContain(response.status);
-    });
+    it('should expose the served DB connectivity gauge', async () => {
+      const response = await request(app).get('/metrics');
 
-    it('should use default hours when not specified', async () => {
-      const response = await request(app).get('/api/metrics/history/test_metric');
-      
-      if (response.status === 200) {
-        expect(response.body.hours).toBe(24);
-      }
+      expect(response.text).toContain('futarchy_served_db_connected 1');
     });
   });
 });
diff --git a/tests/routes/root.test.ts b/tests/routes/root.test.ts
index 3eb7fb4..6ed58ed 100644
--- a/tests/routes/root.test.ts
+++ b/tests/routes/root.test.ts
@@ -17,7 +17,7 @@ describe('Root Routes', () => {
       expect(response.body).toHaveProperty('name');
       expect(response.body).toHaveProperty('version');
       expect(response.body.name).toBe('Futarchy AMM - CoinGecko API');
-      expect(response.body.version).toBe('1.0.0');
+      expect(response.body.version).toBe('2.0.0');
     });
 
     it('should list available endpoints', async () => {
@@ -46,12 +46,13 @@ describe('Root Routes', () => {
       expect(response.body.supplyBreakdown).toHaveProperty('circulatingSupply');
     });
 
-    it('should include caching information', async () => {
+    it('describes itself as a read-only, Dune-free API', async () => {
       const response = await request(app).get('/');
-      
-      expect(response.body).toHaveProperty('caching');
-      expect(response.body.caching).toHaveProperty('description');
-      expect(response.body.caching).toHaveProperty('refreshInterval');
+
+      // The stale cache block was removed; root now carries a `note` and no caching fields.
+      expect(response.body).toHaveProperty('note');
+      expect(response.body.note).toContain('no Dune');
+      expect(response.body).not.toHaveProperty('caching');
     });
   });
 });
diff --git a/tests/runtime/services.test.ts b/tests/runtime/services.test.ts
new file mode 100644
index 0000000..9f73dbb
--- /dev/null
+++ b/tests/runtime/services.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it } from 'bun:test';
+import { createServices } from '../../src/runtime/services.js';
+
+describe('runtime service composition', () => {
+  it('creates API services without an app DB or indexing workers', () => {
+    const services = createServices();
+
+    expect(services.externalDatabaseService).toBeTruthy();
+    expect(services.futarchyService).toBeTruthy();
+    expect(services.solanaService).toBeTruthy();
+    expect(services.launchpadService).toBeTruthy();
+    expect('databaseService' in services).toBe(false);
+  });
+});
diff --git a/tests/services/launchpadService.test.ts b/tests/services/launchpadService.test.ts
new file mode 100644
index 0000000..98ad469
--- /dev/null
+++ b/tests/services/launchpadService.test.ts
@@ -0,0 +1,55 @@
+/**
+ * Regression tests for the getTokenAllocationBreakdown error contract.
+ *
+ * An empty breakdown (zero locked allocations) is ONLY correct when the token
+ * genuinely has no launch / an incomplete launch. An infrastructure failure
+ * must REJECT — a swallowed error here would zero out every locked allocation
+ * and serve circulating supply = total supply during any RPC blip (the exact
+ * bug this suite pins down).
+ */
+
+import { describe, it, expect } from 'bun:test';
+import { PublicKey } from '@solana/web3.js';
+import { LaunchpadService } from '../../src/services/launchpadService.js';
+
+const MINT = new PublicKey('SoLo9oxzLDpcq1dpqAgMwgce5WqkRDtNXK7EPnbmeta');
+
+describe('LaunchpadService.getTokenAllocationBreakdown', () => {
+  it('propagates infrastructure failures instead of returning an empty breakdown', async () => {
+    const svc = new LaunchpadService();
+    (svc as any).getLaunchByBaseMint = async () => {
+      throw new Error('RPC connection refused');
+    };
+
+    await expect(svc.getTokenAllocationBreakdown(MINT)).rejects.toThrow('RPC connection refused');
+  });
+
+  it('returns an empty breakdown when the token genuinely has no launch', async () => {
+    const svc = new LaunchpadService();
+    (svc as any).getLaunchByBaseMint = async () => null;
+
+    const breakdown = await svc.getTokenAllocationBreakdown(MINT);
+
+    expect(breakdown.teamPerformancePackage.amount.isZero()).toBe(true);
+    expect(breakdown.futarchyAmmLiquidity.amount.isZero()).toBe(true);
+    expect(breakdown.meteoraLpLiquidity.amount.isZero()).toBe(true);
+    expect(breakdown.totalNonCirculating.isZero()).toBe(true);
+  });
+
+  it('returns an empty breakdown (with launch metadata) for an incomplete launch', async () => {
+    const svc = new LaunchpadService();
+    const launchAddress = new PublicKey('5FPGRzY9ArJFwY2Hp2y2eqMzVewyWCBox7esmpuZfCvE');
+    (svc as any).getLaunchByBaseMint = async () => ({
+      launchAddress,
+      baseMint: MINT,
+      version: 'v0.7',
+      dao: undefined,
+    });
+
+    const breakdown = await svc.getTokenAllocationBreakdown(MINT);
+
+    expect(breakdown.version).toBe('v0.7');
+    expect(breakdown.launchAddress?.equals(launchAddress)).toBe(true);
+    expect(breakdown.totalNonCirculating.isZero()).toBe(true);
+  });
+});
diff --git a/tests/services/priceService.test.ts b/tests/services/priceService.test.ts
index 84fed49..f0cddc0 100644
--- a/tests/services/priceService.test.ts
+++ b/tests/services/priceService.test.ts
@@ -123,56 +123,4 @@ describe('PriceService', () => {
       expect(liquidity).toBe('0.00');
     });
   });
-
-  describe('calculateVolumeFromFees', () => {
-    it('should calculate volume from fees correctly', () => {
-      const baseFees = new BN('100000000'); // 0.1 tokens
-      const quoteFees = new BN('5000000');   // 5 USDC
-      const feeRate = 0.003; // 0.3%
-      
-      const volume = priceService.calculateVolumeFromFees(baseFees, quoteFees, 9, 6, feeRate);
-      
-      expect(volume).not.toBeNull();
-      expect(parseFloat(volume!.baseVolume)).toBeGreaterThan(0);
-      expect(parseFloat(volume!.targetVolume)).toBeGreaterThan(0);
-    });
-
-    it('should return null for zero fee rate', () => {
-      const baseFees = new BN('100000000');
-      const quoteFees = new BN('5000000');
-      
-      const volume = priceService.calculateVolumeFromFees(baseFees, quoteFees, 9, 6, 0);
-      
-      expect(volume).toBeNull();
-    });
-
-    it('should return null for negative fee rate', () => {
-      const baseFees = new BN('100000000');
-      const quoteFees = new BN('5000000');
-      
-      const volume = priceService.calculateVolumeFromFees(baseFees, quoteFees, 9, 6, -0.003);
-      
-      expect(volume).toBeNull();
-    });
-
-    it('should return null when both fees are zero', () => {
-      const baseFees = new BN(0);
-      const quoteFees = new BN(0);
-      
-      const volume = priceService.calculateVolumeFromFees(baseFees, quoteFees, 9, 6, 0.003);
-      
-      expect(volume).toBeNull();
-    });
-
-    it('should handle one zero fee', () => {
-      const baseFees = new BN('100000000');
-      const quoteFees = new BN(0);
-      
-      const volume = priceService.calculateVolumeFromFees(baseFees, quoteFees, 9, 6, 0.003);
-      
-      expect(volume).not.toBeNull();
-      expect(parseFloat(volume!.baseVolume)).toBeGreaterThan(0);
-      expect(volume!.targetVolume).toBe('0.00000000');
-    });
-  });
 });