global: snapshot

2026-04-25 23:29:58 -07:00 · 2026-03-14 12:36:37 +01:00
parent a0d378d06d
commit b4278842d9
37 changed files with 2591 additions and 4435 deletions
--- a/website/scripts/options/distribution/activity.js
+++ b/website/scripts/options/distribution/activity.js
--- a/website/scripts/options/distribution/cost-basis.js
+++ b/website/scripts/options/distribution/cost-basis.js
@@ -5,9 +5,9 @@
 * - Summary: Key stats (avg + median active, quartiles/extremes available)
 * - By Coin: BTC-weighted percentiles (IQR active: p25, p50, p75)
 * - By Capital: USD-weighted percentiles (IQR active: p25, p50, p75)
- * - Price Position: Spot percentile (both perspectives active)
+ * - Supply Density: Cost basis supply density percentage
 *
- * For cohorts WITHOUT percentiles: Summary only
+ * Only for cohorts WITH costBasis (All, STH, LTH)
 */

 import { colors } from "../../utils/colors.js";
@@ -38,37 +38,14 @@ function createCorePercentileSeries(p, n = (x) => x) {
 }

 /**
- * @param {UtxoCohortObject | CohortWithoutRelative} cohort
+ * @param {CohortAll | CohortFull | CohortLongTerm} cohort
 * @returns {FetchedPriceSeriesBlueprint[]}
 */
-function createSingleSummarySeriesBasic(cohort) {
-  const { color, tree } = cohort;
-  return [
-    price({ metric: tree.realized.realizedPrice, name: "Average", color }),
-    price({
-      metric: tree.costBasis.max,
-      name: "Max",
-      color: colors.stat.max,
-      defaultActive: false,
-    }),
-    price({
-      metric: tree.costBasis.min,
-      name: "Min",
-      color: colors.stat.min,
-      defaultActive: false,
-    }),
-  ];
-}
-
-/**
- * @param {CohortAll | CohortFull | CohortWithPercentiles} cohort
- * @returns {FetchedPriceSeriesBlueprint[]}
- */
-function createSingleSummarySeriesWithPercentiles(cohort) {
+function createSingleSummarySeries(cohort) {
  const { color, tree } = cohort;
  const p = tree.costBasis.percentiles;
  return [
-    price({ metric: tree.realized.realizedPrice, name: "Average", color }),
+    price({ metric: tree.realized.price, name: "Average", color }),
    price({
      metric: tree.costBasis.max,
      name: "Max (p100)",
@@ -98,25 +75,25 @@ function createSingleSummarySeriesWithPercentiles(cohort) {
 }

 /**
- * @param {readonly CohortObject[]} list
+ * @param {readonly (CohortAll | CohortFull | CohortLongTerm)[]} list
 * @param {CohortAll} all
 * @returns {FetchedPriceSeriesBlueprint[]}
 */
 function createGroupedSummarySeries(list, all) {
  return mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-    price({ metric: tree.realized.realizedPrice, name, color }),
+    price({ metric: tree.realized.price, name, color }),
  );
 }

 /**
- * @param {CohortAll | CohortFull | CohortWithPercentiles} cohort
+ * @param {CohortAll | CohortFull | CohortLongTerm} cohort
 * @returns {FetchedPriceSeriesBlueprint[]}
 */
 function createSingleByCoinSeries(cohort) {
  const { color, tree } = cohort;
  const cb = tree.costBasis;
  return [
-    price({ metric: tree.realized.realizedPrice, name: "Average", color }),
+    price({ metric: tree.realized.price, name: "Average", color }),
    price({
      metric: cb.max,
      name: "p100",
@@ -134,59 +111,36 @@ function createSingleByCoinSeries(cohort) {
 }

 /**
- * @param {CohortAll | CohortFull | CohortWithPercentiles} cohort
+ * @param {CohortAll | CohortFull | CohortLongTerm} cohort
 * @returns {FetchedPriceSeriesBlueprint[]}
 */
 function createSingleByCapitalSeries(cohort) {
  const { color, tree } = cohort;
  return [
-    price({ metric: tree.realized.investorPrice, name: "Average", color }),
+    price({ metric: tree.realized.investor.price, name: "Average", color }),
    ...createCorePercentileSeries(tree.costBasis.investedCapital),
  ];
 }

 /**
- * @param {CohortAll | CohortFull | CohortWithPercentiles} cohort
+ * @param {CohortAll | CohortFull | CohortLongTerm} cohort
 * @returns {AnyFetchedSeriesBlueprint[]}
 */
-function createSinglePricePositionSeries(cohort) {
+function createSingleSupplyDensitySeries(cohort) {
  const { tree } = cohort;
  return [
    line({
-      metric: tree.costBasis.spotCostBasisPercentile,
-      name: "By Coin",
+      metric: tree.costBasis.supplyDensity.percent,
+      name: "Supply Density",
      color: colors.bitcoin,
      unit: Unit.percentage,
    }),
-    line({
-      metric: tree.costBasis.spotInvestedCapitalPercentile,
-      name: "By Capital",
-      color: colors.usd,
-      unit: Unit.percentage,
-    }),
    ...priceLines({ numbers: [100, 50, 0], unit: Unit.percentage }),
  ];
 }

 /**
- * @param {{ cohort: UtxoCohortObject | CohortWithoutRelative, title: (metric: string) => string }} args
- * @returns {PartialOptionsGroup}
- */
-export function createCostBasisSection({ cohort, title }) {
-  return {
-    name: "Cost Basis",
-    tree: [
-      {
-        name: "Summary",
-        title: title("Cost Basis Summary"),
-        top: createSingleSummarySeriesBasic(cohort),
-      },
-    ],
-  };
-}
-
-/**
- * @param {{ cohort: CohortAll | CohortFull | CohortWithPercentiles, title: (metric: string) => string }} args
+ * @param {{ cohort: CohortAll | CohortFull | CohortLongTerm, title: (metric: string) => string }} args
 * @returns {PartialOptionsGroup}
 */
 export function createCostBasisSectionWithPercentiles({ cohort, title }) {
@@ -196,7 +150,7 @@ export function createCostBasisSectionWithPercentiles({ cohort, title }) {
      {
        name: "Summary",
        title: title("Cost Basis Summary"),
-        top: createSingleSummarySeriesWithPercentiles(cohort),
+        top: createSingleSummarySeries(cohort),
      },
      {
        name: "By Coin",
@@ -209,33 +163,16 @@ export function createCostBasisSectionWithPercentiles({ cohort, title }) {
        top: createSingleByCapitalSeries(cohort),
      },
      {
-        name: "Price Position",
-        title: title("Current Price Position"),
-        bottom: createSinglePricePositionSeries(cohort),
+        name: "Supply Density",
+        title: title("Cost Basis Supply Density"),
+        bottom: createSingleSupplyDensitySeries(cohort),
      },
    ],
  };
 }

 /**
- * @param {{ list: readonly (UtxoCohortObject | CohortWithoutRelative)[], all: CohortAll, title: (metric: string) => string }} args
- * @returns {PartialOptionsGroup}
- */
-export function createGroupedCostBasisSection({ list, all, title }) {
-  return {
-    name: "Cost Basis",
-    tree: [
-      {
-        name: "Summary",
-        title: title("Cost Basis Summary"),
-        top: createGroupedSummarySeries(list, all),
-      },
-    ],
-  };
-}
-
-/**
- * @param {{ list: readonly (CohortAll | CohortFull | CohortWithPercentiles)[], all: CohortAll, title: (metric: string) => string }} args
+ * @param {{ list: readonly (CohortAll | CohortFull | CohortLongTerm)[], all: CohortAll, title: (metric: string) => string }} args
 * @returns {PartialOptionsGroup}
 */
 export function createGroupedCostBasisSectionWithPercentiles({
@@ -258,7 +195,7 @@ export function createGroupedCostBasisSectionWithPercentiles({
            name: "Average",
            title: title("Realized Price Comparison"),
            top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.realizedPrice, name, color }),
+              price({ metric: tree.realized.price, name, color }),
            ),
          },
          {
@@ -291,7 +228,7 @@ export function createGroupedCostBasisSectionWithPercentiles({
            name: "Average",
            title: title("Investor Price Comparison"),
            top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.investorPrice, name, color }),
+              price({ metric: tree.realized.investor.price, name, color }),
            ),
          },
          {
@@ -330,39 +267,16 @@ export function createGroupedCostBasisSectionWithPercentiles({
        ],
      },
      {
-        name: "Price Position",
-        tree: [
-          {
-            name: "By Coin",
-            title: title("Price Position (BTC-weighted)"),
-            bottom: [
-              ...mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-                line({
-                  metric: tree.costBasis.spotCostBasisPercentile,
-                  name,
-                  color,
-                  unit: Unit.percentage,
-                }),
-              ),
-              ...priceLines({ numbers: [100, 50, 0], unit: Unit.percentage }),
-            ],
-          },
-          {
-            name: "By Capital",
-            title: title("Price Position (USD-weighted)"),
-            bottom: [
-              ...mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-                line({
-                  metric: tree.costBasis.spotInvestedCapitalPercentile,
-                  name,
-                  color,
-                  unit: Unit.percentage,
-                }),
-              ),
-              ...priceLines({ numbers: [100, 50, 0], unit: Unit.percentage }),
-            ],
-          },
-        ],
+        name: "Supply Density",
+        title: title("Cost Basis Supply Density"),
+        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
+          line({
+            metric: tree.costBasis.supplyDensity.percent,
+            name,
+            color,
+            unit: Unit.percentage,
+          }),
+        ),
      },
    ],
  };
--- a/website/scripts/options/distribution/data.js
+++ b/website/scripts/options/distribution/data.js
@@ -16,7 +16,7 @@ const ADDRESSABLE_TYPES = [

 /** @type {(key: SpendableType) => key is AddressableType} */
 const isAddressable = (key) =>
-  ADDRESSABLE_TYPES.includes(/** @type {any} */ (key));
+  /** @type {readonly string[]} */ (ADDRESSABLE_TYPES).includes(key);

 export function buildCohortData() {
  const utxoCohorts = brk.metrics.cohorts.utxo;
--- a/website/scripts/options/distribution/holdings.js
+++ b/website/scripts/options/distribution/holdings.js
--- a/website/scripts/options/distribution/index.js
+++ b/website/scripts/options/distribution/index.js
@@ -38,9 +38,7 @@ import {
  createGroupedPricesSection,
 } from "./prices.js";
 import {
-  createCostBasisSection,
  createCostBasisSectionWithPercentiles,
-  createGroupedCostBasisSection,
  createGroupedCostBasisSectionWithPercentiles,
 } from "./cost-basis.js";
 import {
@@ -60,8 +58,12 @@ import {
 import {
  createActivitySection,
  createActivitySectionWithAdjusted,
+  createActivitySectionWithActivity,
+  createActivitySectionMinimal,
  createGroupedActivitySection,
  createGroupedActivitySectionWithAdjusted,
+  createGroupedActivitySectionWithActivity,
+  createGroupedActivitySectionMinimal,
 } from "./activity.js";

 // Re-export data builder
@@ -121,12 +123,11 @@ export function createCohortFolderWithAdjusted(cohort) {
  return {
    name: cohort.name || "all",
    tree: [
-      createHoldingsSectionWithRelative({ cohort, title }),
+      createHoldingsSectionWithOwnSupply({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySectionWithNupl({ cohort, title }),
-      createActivitySectionWithAdjusted({ cohort, title }),
+      createActivitySectionWithActivity({ cohort, title }),
    ],
  };
 }
@@ -182,11 +183,10 @@ export function createCohortFolderAgeRange(cohort) {
    name: cohort.name || "all",
    tree: [
      createHoldingsSectionWithOwnSupply({ cohort, title }),
-      createValuationSectionFull({ cohort, title }),
-      createPricesSectionFull({ cohort, title }),
-      createCostBasisSectionWithPercentiles({ cohort, title }),
+      createValuationSection({ cohort, title }),
+      createPricesSectionBasic({ cohort, title }),
      createProfitabilitySectionWithInvestedCapitalPct({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionWithActivity({ cohort, title }),
    ],
  };
 }
@@ -201,12 +201,11 @@ export function createCohortFolderBasicWithMarketCap(cohort) {
  return {
    name: cohort.name || "all",
    tree: [
-      createHoldingsSectionWithRelative({ cohort, title }),
+      createHoldingsSection({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySectionWithNupl({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionMinimal({ cohort, title }),
    ],
  };
 }
@@ -221,12 +220,11 @@ export function createCohortFolderBasicWithoutMarketCap(cohort) {
  return {
    name: cohort.name || "all",
    tree: [
-      createHoldingsSectionWithOwnSupply({ cohort, title }),
+      createHoldingsSection({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySectionBasicWithInvestedCapitalPct({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionMinimal({ cohort, title }),
    ],
  };
 }
@@ -244,9 +242,8 @@ export function createCohortFolderAddress(cohort) {
      createHoldingsSectionAddress({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySectionBasicWithInvestedCapitalPct({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionMinimal({ cohort, title }),
    ],
  };
 }
@@ -264,9 +261,8 @@ export function createCohortFolderWithoutRelative(cohort) {
      createHoldingsSection({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySection({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionMinimal({ cohort, title }),
    ],
  };
 }
@@ -284,9 +280,8 @@ export function createAddressCohortFolder(cohort) {
      createHoldingsSectionAddressAmount({ cohort, title }),
      createValuationSection({ cohort, title }),
      createPricesSectionBasic({ cohort, title }),
-      createCostBasisSection({ cohort, title }),
      createProfitabilitySectionWithNupl({ cohort, title }),
-      createActivitySection({ cohort, title }),
+      createActivitySectionMinimal({ cohort, title }),
    ],
  };
 }
@@ -333,12 +328,11 @@ export function createGroupedCohortFolderWithAdjusted({
  return {
    name: name || "all",
    tree: [
-      createGroupedHoldingsSectionWithRelative({ list, all, title }),
+      createGroupedHoldingsSectionWithOwnSupply({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
-      createGroupedProfitabilitySectionWithNupl({ list, all, title }),
-      createGroupedActivitySectionWithAdjusted({ list, all, title }),
+      createGroupedProfitabilitySectionWithInvestedCapitalPct({ list, all, title }),
+      createGroupedActivitySectionWithActivity({ list, all, title }),
    ],
  };
 }
@@ -406,15 +400,14 @@ export function createGroupedCohortFolderAgeRange({
    name: name || "all",
    tree: [
      createGroupedHoldingsSectionWithOwnSupply({ list, all, title }),
-      createGroupedValuationSectionWithOwnMarketCap({ list, all, title }),
+      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSectionWithPercentiles({ list, all, title }),
      createGroupedProfitabilitySectionWithInvestedCapitalPct({
        list,
        all,
        title,
      }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedActivitySectionWithActivity({ list, all, title }),
    ],
  };
 }
@@ -433,12 +426,11 @@ export function createGroupedCohortFolderBasicWithMarketCap({
  return {
    name: name || "all",
    tree: [
-      createGroupedHoldingsSectionWithRelative({ list, all, title }),
+      createGroupedHoldingsSection({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
-      createGroupedProfitabilitySectionWithNupl({ list, all, title }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedProfitabilitySection({ list, all, title }),
+      createGroupedActivitySectionMinimal({ list, all, title }),
    ],
  };
 }
@@ -457,16 +449,15 @@ export function createGroupedCohortFolderBasicWithoutMarketCap({
  return {
    name: name || "all",
    tree: [
-      createGroupedHoldingsSectionWithOwnSupply({ list, all, title }),
+      createGroupedHoldingsSection({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
      createGroupedProfitabilitySectionBasicWithInvestedCapitalPct({
        list,
        all,
        title,
      }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedActivitySectionMinimal({ list, all, title }),
    ],
  };
 }
@@ -488,13 +479,12 @@ export function createGroupedCohortFolderAddress({
      createGroupedHoldingsSectionAddress({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
      createGroupedProfitabilitySectionBasicWithInvestedCapitalPct({
        list,
        all,
        title,
      }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedActivitySectionMinimal({ list, all, title }),
    ],
  };
 }
@@ -516,9 +506,8 @@ export function createGroupedCohortFolderWithoutRelative({
      createGroupedHoldingsSection({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
      createGroupedProfitabilitySection({ list, all, title }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedActivitySectionMinimal({ list, all, title }),
    ],
  };
 }
@@ -540,9 +529,8 @@ export function createGroupedAddressCohortFolder({
      createGroupedHoldingsSectionAddressAmount({ list, all, title }),
      createGroupedValuationSection({ list, all, title }),
      createGroupedPricesSection({ list, all, title }),
-      createGroupedCostBasisSection({ list, all, title }),
-      createGroupedProfitabilitySectionWithNupl({ list, all, title }),
-      createGroupedActivitySection({ list, all, title }),
+      createGroupedProfitabilitySection({ list, all, title }),
+      createGroupedActivitySectionMinimal({ list, all, title }),
    ],
  };
 }
--- a/website/scripts/options/distribution/prices.js
+++ b/website/scripts/options/distribution/prices.js
@@ -19,47 +19,9 @@ import { baseline, price } from "../series.js";
 import { Unit } from "../../utils/units.js";

 /**
- * @param {{ realized: { realizedPrice: ActivePricePattern, investorPrice: ActivePricePattern, lowerPriceBand: ActivePricePattern, upperPriceBand: ActivePricePattern } }} tree
- * @param {(metric: string) => string} title
- * @returns {PartialChartOption}
- */
-function createCompareChart(tree, title) {
-  return {
-    name: "Compare",
-    title: title("Prices"),
-    top: [
-      price({
-        metric: tree.realized.realizedPrice,
-        name: "Realized",
-        color: colors.realized,
-      }),
-      price({
-        metric: tree.realized.investorPrice,
-        name: "Investor",
-        color: colors.investor,
-      }),
-      price({
-        metric: tree.realized.upperPriceBand,
-        name: "I²/R",
-        color: colors.stat.max,
-        style: 2,
-        defaultActive: false,
-      }),
-      price({
-        metric: tree.realized.lowerPriceBand,
-        name: "R²/I",
-        color: colors.stat.min,
-        style: 2,
-        defaultActive: false,
-      }),
-    ],
-  };
-}
-
-/**
- * Create prices section for cohorts with full ActivePriceRatioPattern
- * (CohortAll, CohortFull, CohortWithPercentiles)
- * @param {{ cohort: CohortAll | CohortFull | CohortWithPercentiles, title: (metric: string) => string }} args
+ * Create prices section for cohorts with full ratio patterns
+ * (CohortAll, CohortFull, CohortLongTerm)
+ * @param {{ cohort: CohortAll | CohortFull | CohortLongTerm, title: (metric: string) => string }} args
 * @returns {PartialOptionsGroup}
 */
 export function createPricesSectionFull({ cohort, title }) {
@@ -67,14 +29,23 @@ export function createPricesSectionFull({ cohort, title }) {
  return {
    name: "Prices",
    tree: [
-      createCompareChart(tree, title),
+      {
+        name: "Compare",
+        title: title("Prices"),
+        top: [
+          price({ metric: tree.realized.price, name: "Realized", color: colors.realized }),
+          price({ metric: tree.realized.investor.price, name: "Investor", color: colors.investor }),
+          price({ metric: tree.realized.investor.upperPriceBand, name: "I²/R", color: colors.stat.max, style: 2, defaultActive: false }),
+          price({ metric: tree.realized.investor.lowerPriceBand, name: "R²/I", color: colors.stat.min, style: 2, defaultActive: false }),
+        ],
+      },
      {
        name: "Realized",
        tree: createPriceRatioCharts({
          context: cohort.name,
          legend: "Realized",
-          pricePattern: tree.realized.realizedPrice,
-          ratio: { ...tree.realized.realizedPriceExtra, ...tree.realized.realizedPriceRatioExt },
+          pricePattern: tree.realized.price,
+          ratio: tree.realized.price,
          color,
          priceTitle: title("Realized Price"),
          titlePrefix: "Realized Price",
@@ -82,52 +53,19 @@ export function createPricesSectionFull({ cohort, title }) {
      },
      {
        name: "Investor",
-        tree: createPriceRatioCharts({
-          context: cohort.name,
-          legend: "Investor",
-          pricePattern: tree.realized.investorPrice,
-          ratio: { ...tree.realized.investorPriceExtra, ...tree.realized.investorPriceRatioExt },
-          color,
-          priceTitle: title("Investor Price"),
-          titlePrefix: "Investor Price",
-        }),
-      },
-    ],
-  };
-}
-
-/**
- * Create prices section for cohorts with basic ratio patterns only
- * (CohortWithAdjusted, CohortBasic, CohortAddress, CohortWithoutRelative)
- * @param {{ cohort: CohortWithAdjusted | CohortBasic | CohortAddress | CohortWithoutRelative, title: (metric: string) => string }} args
- * @returns {PartialOptionsGroup}
- */
-export function createPricesSectionBasic({ cohort, title }) {
-  const { tree, color } = cohort;
-  return {
-    name: "Prices",
-    tree: [
-      createCompareChart(tree, title),
-      {
-        name: "Realized",
        tree: [
          {
            name: "Price",
-            title: title("Realized Price"),
-            top: [
-              price({
-                metric: tree.realized.realizedPrice,
-                name: "Realized",
-                color,
-              }),
-            ],
+            title: title("Investor Price"),
+            top: [price({ metric: tree.realized.investor.price, name: "Investor", color })],
          },
          {
            name: "Ratio",
-            title: title("Realized Price Ratio"),
+            title: title("Investor Price Ratio"),
+            top: [price({ metric: tree.realized.investor.price, name: "Investor", color })],
            bottom: [
              baseline({
-                metric: tree.realized.realizedPriceExtra.ratio,
+                metric: tree.realized.investor.price.ratio,
                name: "Ratio",
                unit: Unit.ratio,
                base: 1,
@@ -136,27 +74,36 @@ export function createPricesSectionBasic({ cohort, title }) {
          },
        ],
      },
+    ],
+  };
+}
+
+/**
+ * Create prices section for cohorts with basic ratio patterns only
+ * (CohortWithAdjusted, CohortBasic, CohortAddress, CohortWithoutRelative)
+ * @param {{ cohort: CohortWithAdjusted | CohortBasic | CohortAddress | CohortWithoutRelative | CohortAgeRange, title: (metric: string) => string }} args
+ * @returns {PartialOptionsGroup}
+ */
+export function createPricesSectionBasic({ cohort, title }) {
+  const { tree, color } = cohort;
+  return {
+    name: "Prices",
+    tree: [
      {
-        name: "Investor",
+        name: "Realized",
        tree: [
          {
            name: "Price",
-            title: title("Investor Price"),
-            top: [
-              price({
-                metric: tree.realized.investorPrice,
-                name: "Investor",
-                color,
-              }),
-            ],
+            title: title("Realized Price"),
+            top: [price({ metric: tree.realized.price, name: "Realized", color })],
          },
          {
            name: "Ratio",
-            title: title("Investor Price Ratio"),
+            title: title("Realized Price Ratio"),
            bottom: [
              baseline({
-                metric: tree.realized.investorPriceExtra.ratio,
-                name: "Ratio",
+                metric: tree.realized.mvrv,
+                name: "MVRV",
                unit: Unit.ratio,
                base: 1,
              }),
@@ -184,40 +131,15 @@ export function createGroupedPricesSection({ list, all, title }) {
            name: "Price",
            title: title("Realized Price"),
            top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.realizedPrice, name, color }),
+              price({ metric: tree.realized.price, name, color }),
            ),
          },
          {
            name: "Ratio",
-            title: title("Realized Price Ratio"),
+            title: title("MVRV"),
            bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
              baseline({
-                metric: tree.realized.realizedPriceExtra.ratio,
-                name,
-                color,
-                unit: Unit.ratio,
-                base: 1,
-              }),
-            ),
-          },
-        ],
-      },
-      {
-        name: "Investor",
-        tree: [
-          {
-            name: "Price",
-            title: title("Investor Price"),
-            top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.investorPrice, name, color }),
-            ),
-          },
-          {
-            name: "Ratio",
-            title: title("Investor Price Ratio"),
-            bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              baseline({
-                metric: tree.realized.investorPriceExtra.ratio,
+                metric: tree.realized.mvrv,
                name,
                color,
                unit: Unit.ratio,
--- a/website/scripts/options/distribution/profitability.js
+++ b/website/scripts/options/distribution/profitability.js
--- a/website/scripts/options/distribution/valuation.js
+++ b/website/scripts/options/distribution/valuation.js
@@ -22,7 +22,7 @@ function createSingleRealizedCapSeries(cohort) {
  const { color, tree } = cohort;
  return [
    line({
-      metric: tree.realized.realizedCap,
+      metric: tree.realized.cap.usd,
      name: "Realized Cap",
      color,
      unit: Unit.usd,
@@ -37,7 +37,7 @@ function createSingleRealizedCapSeries(cohort) {
 function createSingle30dChangeSeries(cohort) {
  return [
    baseline({
-      metric: cohort.tree.realized.realizedCap30dDelta,
+      metric: cohort.tree.realized.cap.delta.change._1m.usd,
      name: "30d Change",
      unit: Unit.usd,
    }),
@@ -47,7 +47,7 @@ function createSingle30dChangeSeries(cohort) {
 /**
 * Create valuation section for cohorts with full ratio patterns
 * (CohortAll, CohortFull, CohortWithPercentiles)
- * @param {{ cohort: CohortAll | CohortFull | CohortWithPercentiles, title: (metric: string) => string }} args
+ * @param {{ cohort: CohortAll | CohortFull | CohortLongTerm, title: (metric: string) => string }} args
 * @returns {PartialOptionsGroup}
 */
 export function createValuationSectionFull({ cohort, title }) {
@@ -61,7 +61,7 @@ export function createValuationSectionFull({ cohort, title }) {
        bottom: [
          ...createSingleRealizedCapSeries(cohort),
          baseline({
-            metric: tree.realized.realizedCapRelToOwnMarketCap,
+            metric: tree.realized.cap.relToOwnMcap.percent,
            name: "Rel. to Own M.Cap",
            color,
            unit: Unit.pctOwnMcap,
@@ -75,8 +75,8 @@ export function createValuationSectionFull({ cohort, title }) {
      },
      createRatioChart({
        title,
-        pricePattern: tree.realized.realizedPrice,
-        ratio: { ...tree.realized.realizedPriceExtra, ...tree.realized.realizedPriceRatioExt },
+        pricePattern: tree.realized.price,
+        ratio: tree.realized.price,
        color,
        name: "MVRV",
      }),
@@ -110,7 +110,7 @@ export function createValuationSection({ cohort, title }) {
        title: title("MVRV"),
        bottom: [
          baseline({
-            metric: tree.realized.realizedPriceExtra.ratio,
+            metric: tree.realized.mvrv,
            name: "MVRV",
            unit: Unit.ratio,
            base: 1,
@@ -134,7 +134,7 @@ export function createGroupedValuationSection({ list, all, title }) {
        title: title("Realized Cap"),
        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
          line({
-            metric: tree.realized.realizedCap,
+            metric: tree.realized.cap.usd,
            name,
            color,
            unit: Unit.usd,
@@ -146,7 +146,7 @@ export function createGroupedValuationSection({ list, all, title }) {
        title: title("Realized Cap 30d Change"),
        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
          baseline({
-            metric: tree.realized.realizedCap30dDelta,
+            metric: tree.realized.cap.delta.change._1m.usd,
            name,
            color,
            unit: Unit.usd,
@@ -158,7 +158,7 @@ export function createGroupedValuationSection({ list, all, title }) {
        title: title("MVRV"),
        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
          baseline({
-            metric: tree.realized.realizedPriceExtra.ratio,
+            metric: tree.realized.mvrv,
            name,
            color,
            unit: Unit.ratio,
@@ -171,7 +171,7 @@ export function createGroupedValuationSection({ list, all, title }) {
 }

 /**
- * @param {{ list: readonly (CohortAll | CohortFull | CohortWithPercentiles)[], all: CohortAll, title: (metric: string) => string }} args
+ * @param {{ list: readonly (CohortAll | CohortFull | CohortLongTerm)[], all: CohortAll, title: (metric: string) => string }} args
 * @returns {PartialOptionsGroup}
 */
 export function createGroupedValuationSectionWithOwnMarketCap({
@@ -188,7 +188,7 @@ export function createGroupedValuationSectionWithOwnMarketCap({
        bottom: [
          ...mapCohortsWithAll(list, all, ({ name, color, tree }) =>
            line({
-              metric: tree.realized.realizedCap,
+              metric: tree.realized.cap.usd,
              name,
              color,
              unit: Unit.usd,
@@ -196,7 +196,7 @@ export function createGroupedValuationSectionWithOwnMarketCap({
          ),
          ...mapCohortsWithAll(list, all, ({ name, color, tree }) =>
            baseline({
-              metric: tree.realized.realizedCapRelToOwnMarketCap,
+              metric: tree.realized.cap.relToOwnMcap.percent,
              name,
              color,
              unit: Unit.pctOwnMcap,
@@ -209,7 +209,7 @@ export function createGroupedValuationSectionWithOwnMarketCap({
        title: title("Realized Cap 30d Change"),
        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
          baseline({
-            metric: tree.realized.realizedCap30dDelta,
+            metric: tree.realized.cap.delta.change._1m.usd,
            name,
            color,
            unit: Unit.usd,
@@ -221,7 +221,7 @@ export function createGroupedValuationSectionWithOwnMarketCap({
        title: title("MVRV"),
        bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
          baseline({
-            metric: tree.realized.realizedPriceExtra.ratio,
+            metric: tree.realized.mvrv,
            name,
            color,
            unit: Unit.ratio,