ox 0.14.1 → 0.14.3

package/tempo/AuthorizationTempo.ts

@@ -100,7 +100,7 @@ export type TupleListSigned = TupleList<true>
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -118,7 +118,7 @@ export type TupleListSigned = TupleList<true>
  * const privateKey = Secp256k1.randomPrivateKey()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qzlftsl42n5lep0v2xlxng7cq7sd2k709sxlwnsu',
+ *   address: 'tempox0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
  *   chainId: 1,
  *   nonce: 40n,
  * })
@@ -148,7 +148,7 @@ export type TupleListSigned = TupleList<true>
  * const { privateKey, publicKey } = P256.createKeyPair()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qzlftsl42n5lep0v2xlxng7cq7sd2k709sxlwnsu',
+ *   address: 'tempox0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
  *   chainId: 1,
  *   nonce: 40n,
  * })
@@ -183,7 +183,7 @@ export type TupleListSigned = TupleList<true>
  * const { privateKey, publicKey } = await WebCryptoP256.createKeyPair()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qzlftsl42n5lep0v2xlxng7cq7sd2k709sxlwnsu',
+ *   address: 'tempox0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
  *   chainId: 1,
  *   nonce: 40n,
  * })
@@ -219,7 +219,7 @@ export type TupleListSigned = TupleList<true>
  * const credential = await WebAuthnP256.createCredential({ name: 'Example' })
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qzlftsl42n5lep0v2xlxng7cq7sd2k709sxlwnsu',
+ *   address: 'tempox0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c',
  *   chainId: 1,
  *   nonce: 40n,
  * })
@@ -300,7 +300,7 @@ export declare namespace from {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.fromRpc({
- *   address: 'tempo1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj97hme',
+ *   address: 'tempox0x0000000000000000000000000000000000000000',
  *   chainId: '0x1',
  *   nonce: '0x1',
  *   signature: {
@@ -338,7 +338,7 @@ export declare namespace fromRpc {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorizationList = AuthorizationTempo.fromRpcList([{
- *   address: 'tempo1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj97hme',
+ *   address: 'tempox0x0000000000000000000000000000000000000000',
  *   chainId: '0x1',
  *   nonce: '0x1',
  *   signature: {
@@ -522,7 +522,7 @@ export declare namespace fromTupleList {
  * const privateKey = Secp256k1.randomPrivateKey()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -550,7 +550,7 @@ export declare namespace fromTupleList {
  * const { privateKey, publicKey } = P256.createKeyPair()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -583,7 +583,7 @@ export declare namespace fromTupleList {
  * const { privateKey, publicKey } = await WebCryptoP256.createKeyPair()
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -617,7 +617,7 @@ export declare namespace fromTupleList {
  * const credential = await WebAuthnP256.createCredential({ name: 'Example' })
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -658,7 +658,7 @@ export declare namespace getSignPayload {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -714,7 +714,7 @@ export declare namespace hash {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.toRpc({
- *   address: 'tempo1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj97hme',
+ *   address: 'tempox0x0000000000000000000000000000000000000000',
  *   chainId: 1,
  *   nonce: 1n,
  *   signature: {
@@ -754,7 +754,7 @@ export declare namespace toRpc {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.toRpcList([{
- *   address: 'tempo1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj97hme',
+ *   address: 'tempox0x0000000000000000000000000000000000000000',
  *   chainId: 1,
  *   nonce: 1n,
  *   signature: {
@@ -787,7 +787,7 @@ export declare namespace toRpcList {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
@@ -836,12 +836,12 @@ export declare namespace toTuple {
  * import { AuthorizationTempo } from 'ox/tempo'
  *
  * const authorization_1 = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 1,
  *   nonce: 69n,
  * })
  * const authorization_2 = AuthorizationTempo.from({
- *   address: 'tempo1qqfrg4ncjz4ummcjx3t83y9tehh3ydzk0qhcg00y',
+ *   address: 'tempox0x1234567890abcdef1234567890abcdef12345678',
  *   chainId: 3,
  *   nonce: 20n,
  * })

package/tempo/KeyAuthorization.test.ts

@@ -84,8 +84,8 @@ describe('from', () => {
   })
 
   test('tempo address input', () => {
-    const tempoAddr = 'tempo1qzlftsl42n5lep0v2xlxng7cq7sd2k709sxlwnsu'
-    const tempoToken = 'tempo1qqsvqqqqqqqqqqqqqqqqqqqqqqqqqqqqqyr9xgnd'
+    const tempoAddr = 'tempox0xbe95c3f554e9fc85ec51be69a3d807a0d55bcf2c'
+    const tempoToken = 'tempox0x20c0000000000000000000000000000000000001'
 
     const authorization = KeyAuthorization.from({
       address: tempoAddr,

package/tempo/PoolId.test.ts

@@ -32,8 +32,8 @@ test('from', () => {
   expect(poolId4).toBe(poolId1)
 
   // Test with tempo address inputs
-  const tempoAddr0 = 'tempo1qqsvqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqv0ywuh'
-  const tempoAddr1 = 'tempo1qqsvqqqqqqqqqqqqqqqqqqqqqqqqqqqqqyr9xgnd'
+  const tempoAddr0 = 'tempox0x20c0000000000000000000000000000000000000'
+  const tempoAddr1 = 'tempox0x20c0000000000000000000000000000000000001'
   const poolId5 = PoolId.from({
     userToken: tempoAddr0,
     validatorToken: tempoAddr1,

package/tempo/TempoAddress.test.ts

@@ -1,4 +1,4 @@
-import { Address, Bech32m } from 'ox'
+import { Address } from 'ox'
 import { TempoAddress } from 'ox/tempo'
 import { describe, expect, test } from 'vitest'
 
@@ -15,17 +15,12 @@ describe('resolve', () => {
     const tempoAddr = TempoAddress.format(rawAddress)
     expect(TempoAddress.resolve(tempoAddr)).toBe(rawAddress)
   })
-
-  test('tempo zone address', () => {
-    const tempoAddr = TempoAddress.format(rawAddress, { zoneId: 1 })
-    expect(TempoAddress.resolve(tempoAddr)).toBe(rawAddress)
-  })
 })
 
 describe('format', () => {
-  test('mainnet address', () => {
+  test('default', () => {
     expect(TempoAddress.format(rawAddress)).toMatchInlineSnapshot(
-      `"tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0"`,
+      `"tempox0x742d35cc6634c0532925a3b844bc9e7595f2bd28"`,
     )
   })
 
@@ -34,225 +29,61 @@ describe('format', () => {
     expect(TempoAddress.format(tempoAddr)).toBe(tempoAddr)
   })
 
-  test('zone address (zone ID = 1)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 1 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qqqhgtf4e3nrfszn9yj68wzyhj08t90jh55q74d9uj"`,
-    )
-  })
-
-  test('zone address (zone ID = 252)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 252 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qr78gtf4e3nrfszn9yj68wzyhj08t90jh55q9k62jd"`,
-    )
-  })
-
-  test('zone address (zone ID = 253)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 253 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qr7l6qr5956uce35cpfjjfdrhpzte8n4jhet62q0j8hus"`,
-    )
-  })
-
-  test('zone address (zone ID = 65535)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 65535 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qr7lllm5956uce35cpfjjfdrhpzte8n4jhet62q8pdj6j"`,
-    )
-  })
-
-  test('zone address (zone ID = 65536)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 65536 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qrlqqqqpqp6z6dwvvc6vq5efyk3ms39une6etu4a9qdupk5c"`,
-    )
-  })
-
-  test('zone address (zone ID = 4294967295)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: 4294967295 }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qrl0llllla6z6dwvvc6vq5efyk3ms39une6etu4a9qnk36qy"`,
-    )
-  })
-
-  test('zone address (zone ID > 4294967295)', () => {
-    expect(
-      TempoAddress.format(rawAddress, { zoneId: BigInt('4294967296') }),
-    ).toMatchInlineSnapshot(
-      `"tempoz1qrlsqqqqqqqsqqqqwskntnrxxnq9x2f95wuyf0y7wk2l90fg4306kk"`,
-    )
-  })
-
   test('lowercase output', () => {
     const result = TempoAddress.format(rawAddress)
     expect(result).toBe(result.toLowerCase())
   })
 
-  test('spec test vectors', () => {
-    expect(TempoAddress.format(rawAddress)).toBe(
-      'tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0',
-    )
-    expect(TempoAddress.format(rawAddress, { zoneId: 1 })).toBe(
-      'tempoz1qqqhgtf4e3nrfszn9yj68wzyhj08t90jh55q74d9uj',
-    )
-    expect(TempoAddress.format(rawAddress, { zoneId: 1000 })).toBe(
-      'tempoz1qr77sqm5956uce35cpfjjfdrhpzte8n4jhet62qxx4zvx',
-    )
-    expect(TempoAddress.format(rawAddress, { zoneId: 100000 })).toBe(
-      'tempoz1qrl2ppspqp6z6dwvvc6vq5efyk3ms39une6etu4a9qg5477g',
-    )
-  })
-
-  test('address lengths match spec', () => {
-    expect(TempoAddress.format(rawAddress).length).toBe(46)
-    expect(TempoAddress.format(rawAddress, { zoneId: 1 }).length).toBe(49)
-    expect(TempoAddress.format(rawAddress, { zoneId: 1000 }).length).toBe(52)
-    expect(TempoAddress.format(rawAddress, { zoneId: 100000 }).length).toBe(55)
+  test('address length', () => {
+    expect(TempoAddress.format(rawAddress).length).toBe(48)
   })
 })
 
 describe('parse', () => {
-  test('mainnet', () => {
+  test('default', () => {
     const encoded = TempoAddress.format(rawAddress)
     expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
       {
         "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": undefined,
-      }
-    `)
-  })
-
-  test('zone (zone ID = 1)', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 1 })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 1n,
-      }
-    `)
-  })
-
-  test('zone (zone ID = 252)', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 252 })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 252n,
-      }
-    `)
-  })
-
-  test('zone (zone ID = 253)', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 253 })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 253n,
-      }
-    `)
-  })
-
-  test('zone (zone ID = 65535)', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 65535 })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 65535n,
       }
     `)
   })
 
-  test('zone (zone ID = 65536)', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 65536 })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 65536n,
-      }
-    `)
-  })
-
-  test('zone (large zone ID)', () => {
-    const encoded = TempoAddress.format(rawAddress, {
-      zoneId: BigInt('18446744073709551615'),
-    })
-    expect(TempoAddress.parse(encoded)).toMatchInlineSnapshot(`
-      {
-        "address": "0x742d35CC6634c0532925a3B844bc9e7595F2Bd28",
-        "zoneId": 18446744073709551615n,
-      }
-    `)
-  })
-
-  test('all uppercase', () => {
-    const encoded = TempoAddress.format(rawAddress)
-    const upper = encoded.toUpperCase()
-    expect(TempoAddress.parse(upper).address).toBe(rawAddress)
+  test('uppercase hex', () => {
+    expect(
+      TempoAddress.parse('tempox0x742D35CC6634C0532925A3B844BC9E7595F2BD28')
+        .address,
+    ).toBe(rawAddress)
   })
 
   test('error: invalid prefix', () => {
-    const encoded = Bech32m.encode('bitcoin', new Uint8Array(20))
     expect(() =>
-      TempoAddress.parse(encoded),
+      TempoAddress.parse('bitcoin0x742d35cc6634c0532925a3b844bc9e7595f2bd28'),
     ).toThrowErrorMatchingInlineSnapshot(
-      `[TempoAddress.InvalidPrefixError: Tempo address "${encoded}" has an invalid prefix. Expected "tempo1" or "tempoz1".]`,
+      `[TempoAddress.InvalidPrefixError: Tempo address "bitcoin0x742d35cc6634c0532925a3b844bc9e7595f2bd28" has an invalid prefix. Expected "tempox".]`,
     )
   })
 
-  test('error: unsupported version', () => {
-    const data = new Uint8Array([0x01, ...new Uint8Array(20)])
-    const encoded = Bech32m.encode('tempo', data)
-    expect(() => TempoAddress.parse(encoded)).toThrow(
-      TempoAddress.InvalidVersionError,
-    )
+  test('error: invalid hex', () => {
+    expect(() => TempoAddress.parse('tempox0xinvalid')).toThrow()
   })
 
-  test('error: invalid checksum', () => {
-    const encoded = TempoAddress.format(rawAddress)
-    const tampered = encoded.slice(0, -1) + (encoded.endsWith('q') ? 'p' : 'q')
-    expect(() =>
-      TempoAddress.parse(tampered),
-    ).toThrowErrorMatchingInlineSnapshot(
-      `[TempoAddress.InvalidChecksumError: Tempo address "${tampered}" has an invalid checksum.]`,
-    )
-  })
-
-  test('error: prefix swap detected', () => {
-    const mainnet = TempoAddress.format(rawAddress)
-    const swapped = 'tempoz1' + mainnet.slice(6)
-    expect(() =>
-      TempoAddress.parse(swapped),
-    ).toThrowErrorMatchingInlineSnapshot(
-      `[TempoAddress.InvalidChecksumError: Tempo address "tempoz1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0" has an invalid checksum.]`,
-    )
+  test('error: missing 0x prefix', () => {
+    expect(() => TempoAddress.parse('tempox742d35cc')).toThrow()
   })
 })
 
 describe('validate', () => {
-  test('valid mainnet address', () => {
+  test('valid address', () => {
     const encoded = TempoAddress.format(rawAddress)
-    expect(TempoAddress.validate(encoded)).toMatchInlineSnapshot(`true`)
-  })
-
-  test('valid zone address', () => {
-    const encoded = TempoAddress.format(rawAddress, { zoneId: 1 })
-    expect(TempoAddress.validate(encoded)).toMatchInlineSnapshot(`true`)
+    expect(TempoAddress.validate(encoded)).toBe(true)
   })
 
   test('invalid address', () => {
-    expect(TempoAddress.validate('invalid')).toMatchInlineSnapshot(`false`)
+    expect(TempoAddress.validate('invalid')).toBe(false)
   })
 
-  test('tampered address', () => {
-    const encoded = TempoAddress.format(rawAddress)
-    const tampered = encoded.slice(0, -1) + (encoded.endsWith('q') ? 'p' : 'q')
-    expect(TempoAddress.validate(tampered)).toMatchInlineSnapshot(`false`)
+  test('invalid hex', () => {
+    expect(TempoAddress.validate('tempox0xinvalid')).toBe(false)
   })
 })

package/tempo/TempoAddress.ts

@@ -1,26 +1,23 @@
 import * as core_Address from '../core/Address.js'
-import * as Bech32m from '../core/Bech32m.js'
-import * as Bytes from '../core/Bytes.js'
-import * as CompactSize from '../core/CompactSize.js'
 import * as Errors from '../core/Errors.js'
 import * as Hex from '../core/Hex.js'
 import type { Compute } from '../core/internal/types.js'
 
-/** An address that can be either an Ethereum hex address or a Tempo bech32m address. */
+/** An address that can be either an Ethereum hex address or a Tempo address. */
 export type Address = core_Address.Address | Tempo
 
 /** Root type for a Tempo Address. */
-export type Tempo = Compute<`tempo1${string}` | `tempoz1${string}`>
+export type Tempo = Compute<`tempox${string}`>
 
 /**
- * Resolves an address input (either an Ethereum hex address or a Tempo bech32m address)
+ * Resolves an address input (either an Ethereum hex address or a Tempo address)
  * to an Ethereum hex address.
  *
  * @example
  * ```ts twoslash
  * import { TempoAddress } from 'ox/tempo'
  *
- * const address = TempoAddress.resolve('tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0')
+ * const address = TempoAddress.resolve('tempox0x742d35cc6634c0532925a3b844bc9e7595f2bd28')
  * // @log: '0x742d35CC6634c0532925a3B844bc9e7595F2Bd28'
  * ```
  *
@@ -33,7 +30,7 @@ export type Tempo = Compute<`tempo1${string}` | `tempoz1${string}`>
  * // @log: '0x742d35CC6634c0532925a3B844bc9e7595F2Bd28'
  * ```
  *
- * @param address - An Ethereum hex address or Tempo bech32m address.
+ * @param address - An Ethereum hex address or Tempo address.
  * @returns The resolved Ethereum hex address.
  */
 export function resolve(address: Address): core_Address.Address {
@@ -42,140 +39,63 @@ export function resolve(address: Address): core_Address.Address {
 }
 
 /**
- * Formats a raw Ethereum address (and optional zone ID) into a Tempo address string.
+ * Formats a raw Ethereum address into a Tempo address string.
  *
  * @example
  * ```ts twoslash
  * import { TempoAddress } from 'ox/tempo'
  *
  * const address = TempoAddress.format('0x742d35Cc6634C0532925a3b844Bc9e7595f2bD28')
- * // @log: 'tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0'
- * ```
- *
- * @example
- * ### Zone Address
- * ```ts twoslash
- * import { TempoAddress } from 'ox/tempo'
- *
- * const address = TempoAddress.format(
- *   '0x742d35Cc6634C0532925a3b844Bc9e7595f2bD28',
- *   { zoneId: 1 },
- * )
- * // @log: 'tempoz1qqqhgtf4e3nrfszn9yj68wzyhj08t90jh55q74d9uj'
+ * // @log: 'tempox0x742d35cc6634c0532925a3b844bc9e7595f2bd28'
  * ```
  *
  * @param address - The raw 20-byte Ethereum address.
- * @param options - Options.
  * @returns The encoded Tempo address string.
  */
-export function format(address: Address, options: format.Options = {}): Tempo {
-  const { zoneId } = options
-
+export function format(address: Address): Tempo {
   const resolved = resolve(address)
-  const hrp = zoneId != null ? 'tempoz' : 'tempo'
-  const version = new Uint8Array([0x00])
-  const zone = zoneId != null ? CompactSize.toBytes(zoneId) : new Uint8Array()
-  const data = Bytes.concat(version, zone, Bytes.fromHex(resolved))
-
-  return Bech32m.encode(hrp, data) as Tempo
+  return `tempox${resolved.toLowerCase()}` as Tempo
 }
 
 export declare namespace format {
-  type Options = {
-    /** Zone ID for zone addresses. */
-    zoneId?: number | bigint | undefined
-  }
-
   type ErrorType = Errors.GlobalErrorType
 }
 
 /**
- * Parses a Tempo address string into a raw Ethereum address and optional zone ID.
+ * Parses a Tempo address string into a raw Ethereum address.
  *
  * @example
- * ### Mainnet Address
  * ```ts twoslash
  * import { TempoAddress } from 'ox/tempo'
  *
  * const result = TempoAddress.parse(
- *   'tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0',
+ *   'tempox0x742d35cc6634c0532925a3b844bc9e7595f2bd28',
  * )
- * // @log: { address: '0x742d35CC6634c0532925a3B844bc9e7595F2Bd28', zoneId: undefined }
- * ```
- *
- * @example
- * ### Zone Address
- * ```ts twoslash
- * import { TempoAddress } from 'ox/tempo'
- *
- * const result = TempoAddress.parse(
- *   'tempoz1qqqhgtf4e3nrfszn9yj68wzyhj08t90jh55q74d9uj',
- * )
- * // @log: { address: '0x742d35CC6634c0532925a3B844bc9e7595F2Bd28', zoneId: 1 }
+ * // @log: { address: '0x742d35CC6634c0532925a3B844bc9e7595F2Bd28' }
  * ```
  *
  * @param tempoAddress - The Tempo address string to parse.
- * @returns The parsed raw address and optional zone ID.
+ * @returns The parsed raw address.
  */
 export function parse(tempoAddress: string): parse.ReturnType {
-  let hrp: string
-  let data: Uint8Array
-  try {
-    const decoded = Bech32m.decode(tempoAddress)
-    hrp = decoded.hrp
-    data = decoded.data
-  } catch {
-    throw new InvalidChecksumError({ address: tempoAddress })
-  }
-
-  if (hrp !== 'tempo' && hrp !== 'tempoz')
+  if (!tempoAddress.startsWith('tempox'))
     throw new InvalidPrefixError({ address: tempoAddress })
 
-  if (data.length < 1 || data[0] !== 0x00)
-    throw new InvalidVersionError({
-      address: tempoAddress,
-      version: data.length > 0 ? data[0]! : undefined,
-    })
-
-  const payload = data.slice(1)
-
-  let zoneId: number | bigint | undefined
-  let rawAddress: Uint8Array
-  if (hrp === 'tempoz') {
-    const { value, size } = CompactSize.fromBytes(payload)
-    zoneId = value
-    rawAddress = payload.slice(size)
-  } else {
-    zoneId = undefined
-    rawAddress = payload
-  }
-
-  if (rawAddress.length !== 20)
-    throw new InvalidLengthError({
-      address: tempoAddress,
-      expected: 20,
-      actual: rawAddress.length,
-    })
+  const hex = tempoAddress.slice('tempox'.length)
+  Hex.assert(hex, { strict: true })
 
-  const address = core_Address.checksum(Hex.fromBytes(rawAddress) as never)
+  const address = core_Address.checksum(hex)
 
-  return { address, zoneId }
+  return { address }
 }
 
 export declare namespace parse {
   type ReturnType = {
     /** The raw 20-byte Ethereum address. */
     address: core_Address.Address
-    /** The zone ID, or `undefined` for mainnet addresses. */
-    zoneId: number | bigint | undefined
   }
 
-  type ErrorType =
-    | InvalidPrefixError
-    | InvalidVersionError
-    | InvalidLengthError
-    | InvalidChecksumError
-    | Errors.GlobalErrorType
+  type ErrorType = InvalidPrefixError | Errors.GlobalErrorType
 }
 
 /**
@@ -186,7 +106,7 @@ export declare namespace parse {
  * import { TempoAddress } from 'ox/tempo'
  *
  * const valid = TempoAddress.validate(
- *   'tempo1qp6z6dwvvc6vq5efyk3ms39une6etu4a9qtj2kk0',
+ *   'tempox0x742d35cc6634c0532925a3b844bc9e7595f2bd28',
  * )
  * // @log: true
  * ```
@@ -209,45 +129,7 @@ export class InvalidPrefixError extends Errors.BaseError {
 
   constructor({ address }: { address: string }) {
     super(
-      `Tempo address "${address}" has an invalid prefix. Expected "tempo1" or "tempoz1".`,
-    )
-  }
-}
-
-/** Thrown when a Tempo address has an unsupported version byte. */
-export class InvalidVersionError extends Errors.BaseError {
-  override readonly name = 'TempoAddress.InvalidVersionError'
-
-  constructor({
-    address,
-    version,
-  }: { address: string; version: number | undefined }) {
-    super(
-      `Tempo address "${address}" has unsupported version ${version === undefined ? '(missing)' : `0x${version.toString(16).padStart(2, '0')}`}. Only version 0x00 is supported.`,
+      `Tempo address "${address}" has an invalid prefix. Expected "tempox".`,
     )
   }
 }
-
-/** Thrown when a Tempo address has an invalid payload length. */
-export class InvalidLengthError extends Errors.BaseError {
-  override readonly name = 'TempoAddress.InvalidLengthError'
-
-  constructor({
-    address,
-    expected,
-    actual,
-  }: { address: string; expected: number; actual: number }) {
-    super(
-      `Tempo address "${address}" has an invalid payload length. Expected ${expected} bytes, got ${actual}.`,
-    )
-  }
-}
-
-/** Thrown when a Tempo address has an invalid checksum. */
-export class InvalidChecksumError extends Errors.BaseError {
-  override readonly name = 'TempoAddress.InvalidChecksumError'
-
-  constructor({ address }: { address: string }) {
-    super(`Tempo address "${address}" has an invalid checksum.`)
-  }
-}