ox 0.14.5 → 0.14.7

package/tempo/KeyAuthorization.ts

@@ -32,15 +32,16 @@ export type KeyAuthorization<
   signed extends boolean = boolean,
   bigintType = bigint,
   numberType = number,
+  addressType = Address.Address,
 > = {
   /** Address derived from the public key of the key type. */
-  address: TempoAddress.Address
+  address: addressType
   /** Chain ID for replay protection. */
   chainId: bigintType
   /** Unix timestamp when key expires (0 = never expires). */
   expiry?: numberType | null | undefined
   /** TIP20 spending limits for this key. */
-  limits?: readonly TokenLimit<bigintType>[] | undefined
+  limits?: readonly TokenLimit<bigintType, addressType>[] | undefined
   /** Key type. (secp256k1, P256, WebAuthn). */
   type: SignatureEnvelope.Type
 } & (signed extends true
@@ -51,6 +52,14 @@ export type KeyAuthorization<
         | undefined
     })
 
+/** Input type for a Key Authorization. */
+export type Input = KeyAuthorization<
+  false,
+  bigint,
+  number,
+  TempoAddress.Address
+>
+
 /** RPC representation of an {@link ox#KeyAuthorization.KeyAuthorization}. */
 export type Rpc = Omit<
   KeyAuthorization<false, Hex.Hex, Hex.Hex>,
@@ -62,11 +71,11 @@ export type Rpc = Omit<
 }
 
 /** Signed representation of a Key Authorization. */
-export type Signed<bigintType = bigint, numberType = number> = KeyAuthorization<
-  true,
-  bigintType,
-  numberType
->
+export type Signed<
+  bigintType = bigint,
+  numberType = number,
+  addressType = Address.Address,
+> = KeyAuthorization<true, bigintType, numberType, addressType>
 
 type BaseTuple = readonly [
   chainId: Hex.Hex,
@@ -106,9 +115,9 @@ export type Tuple<signed extends boolean = boolean> = signed extends true
  *
  * [Access Keys Specification](https://docs.tempo.xyz/protocol/transactions/spec-tempo-transaction#access-keys)
  */
-export type TokenLimit<bigintType = bigint> = {
+export type TokenLimit<bigintType = bigint, addressType = Address.Address> = {
   /** Address of the TIP-20 token. */
-  token: TempoAddress.Address
+  token: addressType
   /** Maximum spending amount for this token (enforced over the key's lifetime). */
   limit: bigintType
 }
@@ -250,7 +259,7 @@ export type TokenLimit<bigintType = bigint> = {
  * @returns The {@link ox#KeyAuthorization.KeyAuthorization}.
  */
 export function from<
-  const authorization extends KeyAuthorization | Rpc,
+  const authorization extends Input | Rpc,
   const signature extends SignatureEnvelope.from.Value | undefined = undefined,
 >(
   authorization: authorization | KeyAuthorization,
@@ -291,17 +300,19 @@ export declare namespace from {
   }
 
   type ReturnType<
-    authorization extends KeyAuthorization | Rpc = KeyAuthorization,
+    authorization extends KeyAuthorization | Input | Rpc = KeyAuthorization,
     signature extends SignatureEnvelope.from.Value | undefined =
       | SignatureEnvelope.from.Value
       | undefined,
   > = Compute<
     authorization extends Rpc
       ? Signed
-      : authorization &
-          (signature extends SignatureEnvelope.from.Value
-            ? { signature: SignatureEnvelope.from.ReturnValue<signature> }
-            : {})
+      : TempoAddress.ResolveAddresses<
+          authorization &
+            (signature extends SignatureEnvelope.from.Value
+              ? { signature: SignatureEnvelope.from.ReturnValue<signature> }
+              : {})
+        >
   >
 
   type ErrorType = Errors.GlobalErrorType

package/tempo/PoolId.ts

@@ -1,5 +1,6 @@
 import * as Hash from '../core/Hash.js'
 import * as Hex from '../core/Hex.js'
+import type * as TempoAddress from './TempoAddress.js'
 import * as TokenId from './TokenId.js'
 
 /**
@@ -35,8 +36,8 @@ export function from(value: from.Value): Hex.Hex {
 export declare namespace from {
   export type Value = {
     /** User token. */
-    userToken: TokenId.TokenIdOrAddress
+    userToken: TokenId.TokenIdOrAddress<TempoAddress.Address>
     /** Validator token. */
-    validatorToken: TokenId.TokenIdOrAddress
+    validatorToken: TokenId.TokenIdOrAddress<TempoAddress.Address>
   }
 }

package/tempo/TempoAddress.ts

@@ -9,6 +9,15 @@ export type Address = core_Address.Address | Tempo
 /** Root type for a Tempo Address. */
 export type Tempo = Compute<`tempox${string}`>
 
+/** Deeply converts all {@link ox#TempoAddress.Tempo} types to {@link ox#Address.Address}. */
+export type ResolveAddresses<type> = type extends Tempo
+  ? core_Address.Address
+  : type extends readonly (infer item)[]
+    ? readonly ResolveAddresses<item>[]
+    : type extends object
+      ? { [key in keyof type]: ResolveAddresses<type[key]> }
+      : type
+
 /**
  * Resolves an address input (either an Ethereum hex address or a Tempo address)
  * to an Ethereum hex address.

package/tempo/TokenId.ts

@@ -7,7 +7,9 @@ import * as TempoAddress from './TempoAddress.js'
 const tip20Prefix = '0x20c0'
 
 export type TokenId = bigint
-export type TokenIdOrAddress = TokenId | TempoAddress.Address
+export type TokenIdOrAddress<addressType = Address.Address> =
+  | TokenId
+  | addressType
 
 /**
  * Converts a token ID or address to a token ID.
@@ -73,7 +75,9 @@ export function fromAddress(address: TempoAddress.Address): TokenId {
  * @param tokenId - The token ID.
  * @returns The address.
  */
-export function toAddress(tokenId: TokenIdOrAddress): Address.Address {
+export function toAddress(
+  tokenId: TokenIdOrAddress<TempoAddress.Address>,
+): Address.Address {
   if (typeof tokenId === 'string') {
     const resolved = TempoAddress.resolve(tokenId as TempoAddress.Address)
     Address.assert(resolved)

package/tempo/TransactionRequest.ts

@@ -35,7 +35,7 @@ export type TransactionRequest<
     keyAuthorization?: KeyAuthorization.KeyAuthorization<true> | undefined
     keyData?: Hex.Hex | undefined
     keyType?: KeyType | undefined
-    feeToken?: TokenId.TokenIdOrAddress | undefined
+    feeToken?: TokenId.TokenIdOrAddress<TempoAddress.Address> | undefined
     nonceKey?: 'random' | bigintType | undefined
     validBefore?: numberType | undefined
     validAfter?: numberType | undefined

package/tempo/TxEnvelopeTempo.ts

@@ -69,6 +69,7 @@ export type TxEnvelopeTempo<
   bigintType = bigint,
   numberType = number,
   type extends string = Type,
+  addressType = Address.Address,
 > = Compute<
   {
     /** EIP-2930 Access List. */
@@ -78,11 +79,11 @@ export type TxEnvelopeTempo<
       | AuthorizationTempo.ListSigned<bigintType, numberType>
       | undefined
     /** Array of calls to execute. */
-    calls: readonly Call<bigintType, TempoAddress.Address>[]
+    calls: readonly Call<bigintType, addressType>[]
     /** EIP-155 Chain ID. */
     chainId: numberType
     /** Sender of the transaction. */
-    from?: TempoAddress.Address | undefined
+    from?: addressType | undefined
     /** Gas provided for transaction execution */
     gas?: bigintType | undefined
     /** Fee payer signature. */
@@ -100,7 +101,7 @@ export type TxEnvelopeTempo<
      * The authorization must be signed with the root key, the tx can be signed by the Keychain signature.
      */
     keyAuthorization?:
-      | KeyAuthorization.Signed<bigintType, numberType>
+      | KeyAuthorization.Signed<bigintType, numberType, addressType>
       | undefined
     /** Total fee per gas in wei (gasPrice/baseFeePerGas + maxPriorityFeePerGas). */
     maxFeePerGas?: bigintType | undefined
@@ -127,6 +128,15 @@ export type TxEnvelopeTempo<
       })
 >
 
+/** Input type that accepts TempoAddress for `calls.to`, `from`, etc. */
+export type Input = TxEnvelopeTempo<
+  boolean,
+  bigint,
+  number,
+  Type,
+  TempoAddress.Address
+>
+
 export type Rpc<signed extends boolean = boolean> = TxEnvelopeTempo<
   signed,
   Hex.Hex,
@@ -486,10 +496,10 @@ export declare namespace deserialize {
  * @returns A Tempo Transaction Envelope.
  */
 export function from<
-  const envelope extends UnionPartialBy<TxEnvelopeTempo, 'type'> | Serialized,
+  const envelope extends UnionPartialBy<Input, 'type'> | Serialized,
   const signature extends SignatureEnvelope.from.Value | undefined = undefined,
 >(
-  envelope: envelope | UnionPartialBy<TxEnvelopeTempo, 'type'> | Serialized,
+  envelope: envelope | UnionPartialBy<Input, 'type'> | Serialized,
   options: from.Options<signature> = {},
 ): from.ReturnValue<envelope, signature> {
   const { feePayerSignature, signature } = options
@@ -532,20 +542,22 @@ export declare namespace from {
   }
 
   type ReturnValue<
-    envelope extends UnionPartialBy<TxEnvelopeTempo, 'type'> | Hex.Hex =
+    envelope extends UnionPartialBy<Input, 'type'> | Hex.Hex =
       | TxEnvelopeTempo
       | Hex.Hex,
     signature extends SignatureEnvelope.from.Value | undefined = undefined,
   > = Compute<
     envelope extends Hex.Hex
       ? TxEnvelopeTempo
-      : Assign<
-          envelope,
-          (signature extends SignatureEnvelope.from.Value
-            ? { signature: SignatureEnvelope.from.ReturnValue<signature> }
-            : {}) & {
-            readonly type: 'tempo'
-          }
+      : TempoAddress.ResolveAddresses<
+          Assign<
+            envelope,
+            (signature extends SignatureEnvelope.from.Value
+              ? { signature: SignatureEnvelope.from.ReturnValue<signature> }
+              : {}) & {
+              readonly type: 'tempo'
+            }
+          >
         >
   >
 

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.14.5'
+export const version = '0.14.7'

package/webauthn/Authentication.ts

@@ -408,7 +408,14 @@ export function serializeResponse(response: Response): Response<true> {
 
   const rawResponse = {} as Record<string, string>
   for (const key of responseKeys) {
-    const value = (raw.response as unknown as Record<string, unknown>)[key]
+    const r = raw.response as unknown as Record<string, unknown>
+    let value = r[key]
+    if (!(value instanceof ArrayBuffer)) {
+      const getter =
+        `get${key[0]!.toUpperCase()}${key.slice(1)}` as keyof typeof r
+      const fn = r[getter]
+      if (typeof fn === 'function') value = fn.call(r)
+    }
     if (value instanceof ArrayBuffer)
       rawResponse[key] = Base64.fromBytes(
         new Uint8Array(value),

package/webauthn/Credential.ts

@@ -53,7 +53,17 @@ export function serialize(credential: Credential): Credential<true> {
 
   const response = {} as Record<string, string>
   for (const key of responseKeys) {
-    const value = (raw.response as unknown as Record<string, unknown>)[key]
+    const r = raw.response as unknown as Record<string, unknown>
+    let value = r[key]
+    // Some properties (e.g. `authenticatorData`) are only accessible via
+    // getter methods (e.g. `getAuthenticatorData()`) in certain browsers
+    // and passkey providers.
+    if (!(value instanceof ArrayBuffer)) {
+      const getter =
+        `get${key[0]!.toUpperCase()}${key.slice(1)}` as keyof typeof r
+      const fn = r[getter]
+      if (typeof fn === 'function') value = fn.call(r)
+    }
     if (value instanceof ArrayBuffer)
       response[key] = Base64.fromBytes(new Uint8Array(value), base64UrlOptions)
   }

package/webauthn/Registration.ts

@@ -302,9 +302,14 @@ export function serializeResponse(response: Response): Response<true> {
 
   const rawResponse = {} as Record<string, string>
   for (const key of responseKeys) {
-    const value = (
-      credential.raw.response as unknown as Record<string, unknown>
-    )[key]
+    const r = credential.raw.response as unknown as Record<string, unknown>
+    let value = r[key]
+    if (!(value instanceof ArrayBuffer)) {
+      const getter =
+        `get${key[0]!.toUpperCase()}${key.slice(1)}` as keyof typeof r
+      const fn = r[getter]
+      if (typeof fn === 'function') value = fn.call(r)
+    }
     if (value instanceof ArrayBuffer)
       rawResponse[key] = Base64.fromBytes(
         new Uint8Array(value),