ox 1.0.3 → 1.0.5

package/dist/tempo/index.js

@@ -67,6 +67,28 @@ export * as AuthorizationTempo from './AuthorizationTempo.js';
  * @category Reference
  */
 export * as Channel from './Channel.js';
+/**
+ * Tempo Earn `VaultAdapter` share math: raw vault-share and venue-share conversions
+ * at the anchor rate, the dilution-correct fee-share formula, and the
+ * `minimumOutput` slippage floor.
+ *
+ * Conversions are fee-blind mirrors of the adapter's anchor arithmetic; use the
+ * adapter's `previewRedeem` for user-facing value.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const shareAmount = EarnShares.toAmount(
+ *   { engineShares: 3n, shareSupply: 2n },
+ *   7n
+ * )
+ * // @log: 4n
+ * ```
+ *
+ * @category Reference
+ */
+export * as EarnShares from './EarnShares.js';
 /**
  * Tempo key authorization utilities for provisioning and signing access keys.
  *
@@ -506,18 +528,17 @@ export * as VirtualMaster from './VirtualMaster.js';
 /**
  * Zone ID utilities for converting between zone IDs and zone chain IDs.
  *
- * Zone chain IDs are deterministically derived from zone IDs using the formula
- * `421_700_000 + zoneId`. This module provides helpers to convert between them.
+ * Zone chain IDs use the base and range assigned to their Tempo source chain.
  *
  * @example
  * ```ts twoslash
  * import { ZoneId } from 'ox/tempo'
  *
- * const zoneId = ZoneId.fromChainId(421_700_026)
- * // @log: 26
+ * const zoneId = ZoneId.fromChainId(421_700_001)
+ * // @log: 1
  *
- * const chainId = ZoneId.toChainId(26)
- * // @log: 421700026
+ * const chainId = ZoneId.toChainId(1)
+ * // @log: 421700001
  * ```
  *
  * @category Reference

package/dist/tempo/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tempo/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,2DAA2D;AAE3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAA;AACjE;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tempo/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,2DAA2D;AAE3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAA;AACjE;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "ox",
   "description": "Ethereum Standard Library",
   "type": "module",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "main": "./dist/index.js",
   "sideEffects": false,
   "license": "MIT",
@@ -520,6 +520,11 @@
       "types": "./dist/tempo/Channel.d.ts",
       "default": "./dist/tempo/Channel.js"
     },
+    "./tempo/EarnShares": {
+      "src": "./src/tempo/EarnShares.ts",
+      "types": "./dist/tempo/EarnShares.d.ts",
+      "default": "./dist/tempo/EarnShares.js"
+    },
     "./tempo/KeyAuthorization": {
       "src": "./src/tempo/KeyAuthorization.ts",
       "types": "./dist/tempo/KeyAuthorization.d.ts",

package/src/tempo/EarnShares.test.ts

@@ -0,0 +1,120 @@
+import { EarnShares } from 'ox/tempo'
+import { describe, expect, test } from 'vite-plus/test'
+
+const anchor = { engineShares: 3n, shareSupply: 2n } as const
+
+describe('toAmount', () => {
+  test('default', () => {
+    expect(EarnShares.toAmount(anchor, 7n)).toBe(4n)
+  })
+
+  test('behavior: rounds down', () => {
+    expect(EarnShares.toAmount({ engineShares: 3n, shareSupply: 1n }, 2n)).toBe(
+      0n,
+    )
+  })
+})
+
+describe('toAmountUp', () => {
+  test('default', () => {
+    expect(EarnShares.toAmountUp(anchor, 7n)).toBe(5n)
+  })
+
+  test('behavior: exact conversions do not round up', () => {
+    expect(EarnShares.toAmountUp(anchor, 3n)).toBe(2n)
+  })
+})
+
+describe('toVenueAmount', () => {
+  test('default', () => {
+    expect(EarnShares.toVenueAmount(anchor, 7n)).toBe(10n)
+  })
+
+  test('behavior: identity at the initial 1:1 anchor', () => {
+    expect(
+      EarnShares.toVenueAmount({ engineShares: 1n, shareSupply: 1n }, 12_345n),
+    ).toBe(12_345n)
+  })
+})
+
+describe('feeShares', () => {
+  test('default', () => {
+    expect(
+      EarnShares.feeShares({
+        activeAssets: 1_100n,
+        shareSupply: 1_000n,
+        totalFeeAssets: 100n,
+      }),
+    ).toBe(100n)
+  })
+
+  test('behavior: zero fee mints nothing', () => {
+    expect(
+      EarnShares.feeShares({
+        activeAssets: 1_100n,
+        shareSupply: 1_000n,
+        totalFeeAssets: 0n,
+      }),
+    ).toBe(0n)
+  })
+
+  test('behavior: fee at or above active assets mints nothing', () => {
+    expect(
+      EarnShares.feeShares({
+        activeAssets: 100n,
+        shareSupply: 1_000n,
+        totalFeeAssets: 100n,
+      }),
+    ).toBe(0n)
+  })
+
+  test('behavior: rounds down', () => {
+    expect(
+      EarnShares.feeShares({
+        activeAssets: 1_000n,
+        shareSupply: 999n,
+        totalFeeAssets: 100n,
+      }),
+    ).toBe(111n)
+  })
+})
+
+describe('minimumOutput', () => {
+  test('default', () => {
+    expect(EarnShares.minimumOutput(1_000_000n, 50)).toBe(995_000n)
+  })
+
+  test('behavior: zero slippage returns the expected output', () => {
+    expect(EarnShares.minimumOutput(1_000_000n, 0)).toBe(1_000_000n)
+  })
+
+  test('behavior: floors to 1n', () => {
+    expect(EarnShares.minimumOutput(1n, 9_999)).toBe(1n)
+  })
+
+  test('error: non-positive expected output', () => {
+    expect(() =>
+      EarnShares.minimumOutput(0n, 50),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `[EarnShares.InvalidExpectedOutputError: Expected output \`0\` must be greater than zero.]`,
+    )
+  })
+
+  test('error: out-of-range slippage', () => {
+    expect(() => EarnShares.minimumOutput(1_000_000n, 10_000))
+      .toThrowErrorMatchingInlineSnapshot(`
+      [EarnShares.InvalidSlippageError: Slippage tolerance \`10000\` is invalid.
+
+      Slippage must be a whole number from 0 through 9999 basis points.]
+    `)
+  })
+
+  test('error: non-integer slippage', () => {
+    expect(() => EarnShares.minimumOutput(1_000_000n, 0.5))
+      .toThrowErrorMatchingInlineSnapshot(`
+      [EarnShares.InvalidSlippageError: Slippage tolerance \`0.5\` is invalid.
+
+      Slippage must be a whole number from 0 through 9999 basis points.]
+    `)
+  })
+})

package/src/tempo/EarnShares.ts

@@ -0,0 +1,235 @@
+import * as Errors from '../core/Errors.js'
+
+/** Basis-point denominator used by slippage bounds. */
+export const basisPointScale = 10_000
+
+/**
+ * Tempo Earn `VaultAdapter` conversion anchor.
+ *
+ * The adapter prices vault shares against venue shares through this pair:
+ * `engineShares` venue shares are worth `shareSupply` vault shares. It is initialised
+ * 1:1 and restated on `contribute` and `migrateEngine`.
+ *
+ * These conversions are raw and fee-blind; they ignore pending fee dilution
+ * and are unsuitable for user-facing value (use the adapter's `previewRedeem`).
+ */
+export type Anchor = {
+  /** Venue shares held by the engine at the anchor point. */
+  engineShares: bigint
+  /** Vault share supply at the anchor point. */
+  shareSupply: bigint
+}
+
+/**
+ * Converts venue shares to a vault share amount at the anchor rate, rounding down.
+ *
+ * Mirrors `VaultAdapter.sharesToTokens`.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const shareAmount = EarnShares.toAmount(
+ *   { engineShares: 3n, shareSupply: 2n },
+ *   7n
+ * )
+ * // @log: 4n
+ * ```
+ *
+ * @param anchor - The conversion anchor.
+ * @param venueShareAmount - Venue share amount, base units.
+ * @returns Vault share amount, rounded down.
+ */
+export function toAmount(anchor: Anchor, venueShareAmount: bigint): bigint {
+  return (venueShareAmount * anchor.shareSupply) / anchor.engineShares
+}
+
+export declare namespace toAmount {
+  type ErrorType = Errors.GlobalErrorType
+}
+
+/**
+ * Converts venue shares to a vault share amount at the anchor rate, rounding up.
+ *
+ * Mirrors the adapter's ceiling conversion used by exact-asset exits.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const shareAmount = EarnShares.toAmountUp(
+ *   { engineShares: 3n, shareSupply: 2n },
+ *   7n
+ * )
+ * // @log: 5n
+ * ```
+ *
+ * @param anchor - The conversion anchor.
+ * @param venueShareAmount - Venue share amount, base units.
+ * @returns Vault share amount, rounded up.
+ */
+export function toAmountUp(anchor: Anchor, venueShareAmount: bigint): bigint {
+  const { engineShares, shareSupply } = anchor
+  return (venueShareAmount * shareSupply + engineShares - 1n) / engineShares
+}
+
+export declare namespace toAmountUp {
+  type ErrorType = Errors.GlobalErrorType
+}
+
+/**
+ * Converts a vault share amount to venue shares at the anchor rate, rounding down.
+ *
+ * Mirrors `VaultAdapter.tokensToShares`.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const venueShareAmount = EarnShares.toVenueAmount(
+ *   { engineShares: 3n, shareSupply: 2n },
+ *   7n
+ * )
+ * // @log: 10n
+ * ```
+ *
+ * @param anchor - The conversion anchor.
+ * @param shareAmount - Vault share amount, base units.
+ * @returns Venue share amount, rounded down.
+ */
+export function toVenueAmount(anchor: Anchor, shareAmount: bigint): bigint {
+  return (shareAmount * anchor.engineShares) / anchor.shareSupply
+}
+
+export declare namespace toVenueAmount {
+  type ErrorType = Errors.GlobalErrorType
+}
+
+/**
+ * Computes the dilution-correct vault shares minted for an asset-denominated fee.
+ *
+ * Mirrors `FeeMath`:
+ * `feeShares = floor(fee * shareSupply / (activeAssets - fee))`, zero when the
+ * fee is zero or not smaller than the active assets. Minting this amount to the
+ * fee ledger prices the fee at post-mint value per share.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const shares = EarnShares.feeShares({
+ *   activeAssets: 1_100n,
+ *   shareSupply: 1_000n,
+ *   totalFeeAssets: 100n
+ * })
+ * // @log: 100n
+ * ```
+ *
+ * @param options - Fee accrual inputs.
+ * @returns Vault shares to mint for the fee, rounded down.
+ */
+export function feeShares(options: feeShares.Options): bigint {
+  const { activeAssets, shareSupply, totalFeeAssets } = options
+  if (totalFeeAssets === 0n || totalFeeAssets >= activeAssets) return 0n
+  return (totalFeeAssets * shareSupply) / (activeAssets - totalFeeAssets)
+}
+
+export declare namespace feeShares {
+  export type Options = {
+    /** Assets backing the active (non-queued) supply, base units. */
+    activeAssets: bigint
+    /** Active vault share supply, base units. */
+    shareSupply: bigint
+    /** Total fee liability in asset units. */
+    totalFeeAssets: bigint
+  }
+  export type ErrorType = Errors.GlobalErrorType
+}
+
+/**
+ * Lowers an expected output by a basis-point slippage tolerance, flooring to `1n`.
+ *
+ * Suitable for lower bounds such as a deposit's minimum shares or a redeem's
+ * minimum assets; not for upper bounds such as an exact withdrawal's maximum
+ * shares.
+ *
+ * @example
+ * ```ts twoslash
+ * import { EarnShares } from 'ox/tempo'
+ *
+ * const minimumShares = EarnShares.minimumOutput(
+ *   1_000_000n,
+ *   50
+ * )
+ * // @log: 995_000n
+ * ```
+ *
+ * @param expectedAmount - Expected output in base units.
+ * @param slippageBps - Allowed slippage in basis points from `0` through `9_999`.
+ * @returns The minimum accepted output, floored to `1n`.
+ * @throws `InvalidExpectedOutputError` when `expectedAmount` is not positive.
+ * @throws `InvalidSlippageError` when `slippageBps` is outside its valid range.
+ */
+export function minimumOutput(
+  expectedAmount: bigint,
+  slippageBps: number,
+): bigint {
+  if (expectedAmount <= 0n)
+    throw new InvalidExpectedOutputError({ expectedAmount })
+  if (
+    !Number.isInteger(slippageBps) ||
+    slippageBps < 0 ||
+    slippageBps >= basisPointScale
+  )
+    throw new InvalidSlippageError({ slippageBps })
+  const scale = BigInt(basisPointScale)
+  const bounded = (expectedAmount * (scale - BigInt(slippageBps))) / scale
+  return bounded === 0n ? 1n : bounded
+}
+
+export declare namespace minimumOutput {
+  type ErrorType =
+    | InvalidExpectedOutputError
+    | InvalidSlippageError
+    | Errors.GlobalErrorType
+}
+
+/**
+ * Error thrown when an expected output is not positive.
+ */
+export class InvalidExpectedOutputError extends Errors.BaseError {
+  override readonly name = 'EarnShares.InvalidExpectedOutputError'
+
+  constructor(options: InvalidExpectedOutputError.Options) {
+    super(
+      `Expected output \`${options.expectedAmount}\` must be greater than zero.`,
+    )
+  }
+}
+
+export declare namespace InvalidExpectedOutputError {
+  export type Options = {
+    expectedAmount: bigint
+  }
+}
+
+/**
+ * Error thrown when a slippage tolerance is not an integer from `0` through `9_999`.
+ */
+export class InvalidSlippageError extends Errors.BaseError {
+  override readonly name = 'EarnShares.InvalidSlippageError'
+
+  constructor(options: InvalidSlippageError.Options) {
+    super(`Slippage tolerance \`${options.slippageBps}\` is invalid.`, {
+      metaMessages: [
+        `Slippage must be a whole number from 0 through ${basisPointScale - 1} basis points.`,
+      ],
+    })
+  }
+}
+
+export declare namespace InvalidSlippageError {
+  export type Options = {
+    slippageBps: number
+  }
+}

package/src/tempo/ZoneId.test-d.ts

@@ -0,0 +1,16 @@
+import { expectTypeOf, test } from 'vp/test'
+import * as ZoneId from './ZoneId.js'
+
+test('accepts supported source IDs', () => {
+  expectTypeOf(ZoneId.fromChainId(421_700_001)).toEqualTypeOf<number>()
+  expectTypeOf(
+    ZoneId.fromChainId(1_424_310_001, 42_431),
+  ).toEqualTypeOf<number>()
+  expectTypeOf(ZoneId.toChainId(1)).toEqualTypeOf<number>()
+  expectTypeOf(ZoneId.toChainId(1, 42_431)).toEqualTypeOf<number>()
+
+  // @ts-expect-error Unsupported source ID.
+  ZoneId.fromChainId(421_700_001, 1)
+  // @ts-expect-error Unsupported source ID.
+  ZoneId.toChainId(1, 1)
+})

package/src/tempo/ZoneId.test.ts

@@ -3,40 +3,75 @@ import * as ZoneId from './ZoneId.js'
 
 describe('fromChainId', () => {
   test('default', () => {
-    expect(ZoneId.fromChainId(4_217_000_006)).toBe(6)
+    expect(ZoneId.chainIdBase).toMatchInlineSnapshot(`421700000`)
+    expect(ZoneId.fromChainId(421_700_001)).toMatchInlineSnapshot(`1`)
   })
 
-  test('zone 1', () => {
-    expect(ZoneId.fromChainId(4_217_000_001)).toBe(1)
+  test('Moderato', () => {
+    expect(ZoneId.fromChainId(1_424_310_028, 42_431)).toMatchInlineSnapshot(
+      `28`,
+    )
   })
 
-  test('zone 28', () => {
-    expect(ZoneId.fromChainId(4_217_000_028)).toBe(28)
+  test('unsupported source id', () => {
+    expect(() =>
+      // @ts-expect-error Unsupported source ID.
+      ZoneId.fromChainId(421_700_001, 1),
+    ).toThrowErrorMatchingInlineSnapshot(`
+      [ZoneId.UnsupportedSourceIdError: Source chain ID "1" is not supported.
+
+      Supported source chain IDs: 4217, 42431.]
+    `)
   })
 })
 
 describe('toChainId', () => {
   test('default', () => {
-    expect(ZoneId.toChainId(6)).toBe(4_217_000_006)
+    expect(ZoneId.toChainId(1)).toMatchInlineSnapshot(`421700001`)
+  })
+
+  test('Moderato', () => {
+    expect(ZoneId.toChainId(28, 42_431)).toMatchInlineSnapshot(`1424310028`)
   })
 
-  test('zone 1', () => {
-    expect(ZoneId.toChainId(1)).toBe(4_217_000_001)
+  test('wraps within the source chain range', () => {
+    expect(ZoneId.toChainId(1_002_610_001)).toMatchInlineSnapshot(`421700001`)
+    expect(ZoneId.toChainId(723_173_649, 42_431)).toMatchInlineSnapshot(
+      `1424310001`,
+    )
   })
 
-  test('zone 28', () => {
-    expect(ZoneId.toChainId(28)).toBe(4_217_000_028)
+  test('unsupported source id', () => {
+    expect(() =>
+      // @ts-expect-error Unsupported source ID.
+      ZoneId.toChainId(1, 1),
+    ).toThrowErrorMatchingInlineSnapshot(`
+      [ZoneId.UnsupportedSourceIdError: Source chain ID "1" is not supported.
+
+      Supported source chain IDs: 4217, 42431.]
+    `)
   })
 })
 
 describe('roundtrip', () => {
   test('fromChainId → toChainId', () => {
-    const chainId = 4_217_000_006
-    expect(ZoneId.toChainId(ZoneId.fromChainId(chainId))).toBe(chainId)
+    const chainId = 421_700_006
+    expect(ZoneId.toChainId(ZoneId.fromChainId(chainId))).toMatchInlineSnapshot(
+      `421700006`,
+    )
   })
 
   test('toChainId → fromChainId', () => {
     const zoneId = 42
-    expect(ZoneId.fromChainId(ZoneId.toChainId(zoneId))).toBe(zoneId)
+    expect(ZoneId.fromChainId(ZoneId.toChainId(zoneId))).toMatchInlineSnapshot(
+      `42`,
+    )
+  })
+
+  test('Moderato', () => {
+    const zoneId = 42
+    const sourceId = 42_431
+    const chainId = ZoneId.toChainId(zoneId, sourceId)
+    expect(ZoneId.fromChainId(chainId, sourceId)).toMatchInlineSnapshot(`42`)
   })
 })

package/src/tempo/ZoneId.ts

@@ -1,58 +1,94 @@
-import type * as Errors from '../core/Errors.js'
+import * as Errors from '../core/Errors.js'
+
+const chainIdConfig = {
+  4_217: {
+    base: 421_700_000,
+    range: 1_002_610_000,
+  },
+  42_431: {
+    base: 1_424_310_000,
+    range: 723_173_648,
+  },
+} as const
+
+const defaultSourceId = 4_217
 
 /**
- * Base offset for deriving zone chain IDs.
- *
- * Zone chain IDs are computed as `chainIdBase + zoneId`.
+ * Base offset for deriving Presto zone chain IDs.
  */
-export const chainIdBase = 4_217_000_000 as const
+export const chainIdBase = chainIdConfig[defaultSourceId].base
+
+/** Tempo source chain ID. */
+export type SourceId = keyof typeof chainIdConfig
 
 /**
  * Derives a zone ID from a zone chain ID.
  *
- * Zone chain IDs follow the formula `4_217_000_000 + zoneId`, so a chain ID
- * of `4217000006` corresponds to zone ID `6`.
+ * Zone chain IDs use the base assigned to their Tempo source chain.
  *
  * @example
  * ```ts twoslash
  * import { ZoneId } from 'ox/tempo'
  *
- * const zoneId = ZoneId.fromChainId(4_217_000_006)
- * // @log: 6
+ * const zoneId = ZoneId.fromChainId(421_700_001)
+ * // @log: 1
  * ```
  *
  * @param chainId - The zone chain ID.
+ * @param sourceId - The Tempo source chain ID. Defaults to `4217` (Presto).
  * @returns The zone ID.
  */
-export function fromChainId(chainId: number): number {
-  return chainId - chainIdBase
+export function fromChainId(
+  chainId: number,
+  sourceId: SourceId = defaultSourceId,
+): number {
+  return chainId - getChainIdConfig(sourceId).base
 }
 
 export declare namespace fromChainId {
-  type ErrorType = Errors.GlobalErrorType
+  type ErrorType = typeof UnsupportedSourceIdError | Errors.GlobalErrorType
 }
 
 /**
  * Derives a zone chain ID from a zone ID.
  *
- * Zone chain IDs follow the formula `4_217_000_000 + zoneId`, so zone ID
- * `6` corresponds to chain ID `4217000006`.
+ * Zone chain IDs use the base and range assigned to their Tempo source chain.
  *
  * @example
  * ```ts twoslash
  * import { ZoneId } from 'ox/tempo'
  *
- * const chainId = ZoneId.toChainId(6)
- * // @log: 4217000006
+ * const chainId = ZoneId.toChainId(1)
+ * // @log: 421700001
  * ```
  *
  * @param zoneId - The zone ID.
+ * @param sourceId - The Tempo source chain ID. Defaults to `4217` (Presto).
  * @returns The zone chain ID.
  */
-export function toChainId(zoneId: number): number {
-  return chainIdBase + zoneId
+export function toChainId(
+  zoneId: number,
+  sourceId: SourceId = defaultSourceId,
+): number {
+  const { base, range } = getChainIdConfig(sourceId)
+  return base + (zoneId % range)
 }
 
 export declare namespace toChainId {
-  type ErrorType = Errors.GlobalErrorType
+  type ErrorType = typeof UnsupportedSourceIdError | Errors.GlobalErrorType
+}
+
+/** Thrown when a Tempo source chain ID is unsupported. */
+export class UnsupportedSourceIdError extends Errors.BaseError {
+  override readonly name = 'ZoneId.UnsupportedSourceIdError'
+  constructor({ sourceId }: { sourceId: number }) {
+    super(`Source chain ID "${sourceId}" is not supported.`, {
+      metaMessages: ['Supported source chain IDs: 4217, 42431.'],
+    })
+  }
+}
+
+function getChainIdConfig(sourceId: number) {
+  if (sourceId === 4_217 || sourceId === 42_431) return chainIdConfig[sourceId]
+  throw new UnsupportedSourceIdError({ sourceId })
 }