ox 0.1.7 → 0.2.0

package/core/TypedData.ts

@@ -157,7 +157,10 @@ export function assert<
   }
 
   // Validate domain types.
-  if (types.EIP712Domain && domain) validateData(types.EIP712Domain, domain)
+  if (types.EIP712Domain && domain) {
+    if (typeof domain !== 'object') throw new InvalidDomainError({ domain })
+    validateData(types.EIP712Domain, domain)
+  }
 
   // Validate message types.
   if (primaryType !== 'EIP712Domain') {
@@ -181,10 +184,6 @@ export declare namespace assert {
     | Errors.GlobalErrorType
 }
 
-assert.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as assert.ErrorType
-
 /**
  * Creates [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) [`domainSeparator`](https://eips.ethereum.org/EIPS/eip-712#definition-of-domainseparator) for the provided domain.
  *
@@ -214,10 +213,6 @@ export declare namespace domainSeparator {
   type ErrorType = hashDomain.ErrorType | Errors.GlobalErrorType
 }
 
-domainSeparator.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as domainSeparator.ErrorType
-
 /**
  * Encodes typed data in [EIP-712 format](https://eips.ethereum.org/EIPS/eip-712): `0x19 ‖ 0x01 ‖ domainSeparator ‖ hashStruct(message)`.
  *
@@ -320,9 +315,6 @@ export declare namespace encode {
     | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-encode.parseError = (error: unknown) => error as encode.ErrorType
-
 /**
  * Encodes [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) schema for the provided primaryType.
  *
@@ -372,9 +364,6 @@ export declare namespace encodeType {
   type ErrorType = findTypeDependencies.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-encodeType.parseError = (error: unknown) => error as encodeType.ErrorType
-
 /**
  * Gets [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) schema for EIP-721 domain.
  *
@@ -421,10 +410,6 @@ export declare namespace extractEip712DomainTypes {
   type ErrorType = Errors.GlobalErrorType
 }
 
-extractEip712DomainTypes.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as extractEip712DomainTypes.ErrorType
-
 /**
  * Gets the payload to use for signing typed data in [EIP-712 format](https://eips.ethereum.org/EIPS/eip-712).
  *
@@ -484,10 +469,6 @@ export declare namespace getSignPayload {
     | Errors.GlobalErrorType
 }
 
-getSignPayload.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as getSignPayload.ErrorType
-
 /**
  * Hashes [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) domain.
  *
@@ -537,9 +518,6 @@ export declare namespace hashDomain {
   type ErrorType = hashStruct.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-hashDomain.parseError = (error: unknown) => error as hashDomain.ErrorType
-
 /**
  * Hashes [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) struct.
  *
@@ -594,9 +572,6 @@ export declare namespace hashStruct {
     | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-hashStruct.parseError = (error: unknown) => error as hashStruct.ErrorType
-
 /**
  * Serializes [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) schema into string.
  *
@@ -681,10 +656,6 @@ export declare namespace serialize {
   type ErrorType = Json.stringify.ErrorType | Errors.GlobalErrorType
 }
 
-serialize.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as serialize.ErrorType
-
 /**
  * Checks if [EIP-712 Typed Data](https://eips.ethereum.org/EIPS/eip-712) is valid.
  *
@@ -734,9 +705,6 @@ export declare namespace validate {
   type ErrorType = assert.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-validate.parseError = (error: unknown) => error as validate.ErrorType
-
 /** Thrown when the bytes size of a typed data value does not match the expected size. */
 export class BytesSizeMismatchError extends Errors.BaseError {
   override readonly name = 'TypedData.BytesSizeMismatchError'
@@ -749,6 +717,17 @@ export class BytesSizeMismatchError extends Errors.BaseError {
   }
 }
 
+/** Thrown when the domain is invalid. */
+export class InvalidDomainError extends Errors.BaseError {
+  override readonly name = 'TypedData.InvalidDomainError'
+
+  constructor({ domain }: { domain: unknown }) {
+    super(`Invalid domain "${Json.stringify(domain)}".`, {
+      metaMessages: ['Must be a valid EIP-712 domain.'],
+    })
+  }
+}
+
 /** Thrown when the primary type of a typed data value is invalid. */
 export class InvalidPrimaryTypeError extends Errors.BaseError {
   override readonly name = 'TypedData.InvalidPrimaryTypeError'

package/core/ValidatorData.ts

@@ -45,9 +45,6 @@ export declare namespace encode {
     | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-encode.parseError = (error: unknown) => error as encode.ErrorType
-
 /**
  * Gets the payload to use for signing [ERC-191 formatted](https://eips.ethereum.org/EIPS/eip-191#0x00) data with an intended validator.
  *
@@ -81,7 +78,3 @@ export declare namespace getSignPayload {
     | encode.ErrorType
     | Errors.GlobalErrorType
 }
-
-/* v8 ignore next */
-getSignPayload.parseError = (error: unknown) =>
-  error as getSignPayload.ErrorType

package/core/Value.ts

@@ -46,9 +46,6 @@ export declare namespace format {
   type ErrorType = Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-format.parseError = (error: unknown) => error as format.ErrorType
-
 /**
  * Formats a `bigint` Value (default: wei) to a string representation of Ether.
  *
@@ -75,9 +72,6 @@ export declare namespace formatEther {
   type ErrorType = format.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-formatEther.parseError = (error: unknown) => error as formatEther.ErrorType
-
 /**
  * Formats a `bigint` Value (default: wei) to a string representation of Gwei.
  *
@@ -101,9 +95,6 @@ export declare namespace formatGwei {
   type ErrorType = format.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-formatGwei.parseError = (error: unknown) => error as formatGwei.ErrorType
-
 /**
  * Parses a `string` representation of a Value to `bigint` (multiplied by the given exponent).
  *
@@ -165,9 +156,6 @@ export declare namespace from {
   type ErrorType = Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-from.parseError = (error: unknown) => error as from.ErrorType
-
 /**
  * Parses a string representation of Ether to a `bigint` Value (default: wei).
  *
@@ -194,9 +182,6 @@ export declare namespace fromEther {
   type ErrorType = from.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-fromEther.parseError = (error: unknown) => error as fromEther.ErrorType
-
 /**
  * Parses a string representation of Gwei to a `bigint` Value (default: wei).
  *
@@ -220,9 +205,6 @@ export declare namespace fromGwei {
   type ErrorType = from.ErrorType | Errors.GlobalErrorType
 }
 
-/* v8 ignore next */
-fromGwei.parseError = (error: unknown) => error as fromGwei.ErrorType
-
 /**
  * Thrown when a value is not a valid decimal number.
  *

package/core/WebAuthnP256.ts

@@ -67,9 +67,10 @@ export async function createCredential(
       creationOptions,
     )) as internal.PublicKeyCredential
     if (!credential) throw new CredentialCreationFailedError()
-    const publicKey = await internal.parseCredentialPublicKey(
-      new Uint8Array((credential.response as any).getPublicKey()),
-    )
+
+    const response = credential.response as AuthenticatorAttestationResponse
+    const publicKey = await internal.parseCredentialPublicKey(response)
+
     return {
       id: credential.id,
       publicKey,
@@ -99,13 +100,10 @@ export declare namespace createCredential {
 
   type ErrorType =
     | getCredentialCreationOptions.ErrorType
+    | internal.parseCredentialPublicKey.ErrorType
     | Errors.GlobalErrorType
 }
 
-createCredential.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as createCredential.ErrorType
-
 /**
  * Gets the authenticator data which contains information about the
  * processing of an authenticator request (ie. from `WebAuthnP256.sign`).
@@ -156,10 +154,6 @@ export declare namespace getAuthenticatorData {
   type ErrorType = Errors.GlobalErrorType
 }
 
-getAuthenticatorData.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as getAuthenticatorData.ErrorType
-
 /**
  * Constructs the Client Data in stringified JSON format which represents client data that
  * was passed to `credentials.get()` in {@link ox#WebAuthnP256.(sign:function)}.
@@ -219,10 +213,6 @@ export declare namespace getClientDataJSON {
   type ErrorType = Errors.GlobalErrorType
 }
 
-getClientDataJSON.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as getClientDataJSON.ErrorType
-
 /**
  * Returns the creation options for a P256 WebAuthn Credential to be used with
  * the Web Authentication API.
@@ -361,10 +351,6 @@ export declare namespace getCredentialCreationOptions {
     | Errors.GlobalErrorType
 }
 
-getCredentialCreationOptions.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as getCredentialCreationOptions.ErrorType
-
 /**
  * Returns the request options to sign a challenge with the Web Authentication API.
  *
@@ -430,9 +416,6 @@ export declare namespace getCredentialRequestOptions {
     | Errors.GlobalErrorType
 }
 
-getCredentialRequestOptions.parseError = (error: unknown) =>
-  error as getCredentialRequestOptions.ErrorType
-
 /**
  * Constructs the final digest that was signed and computed by the authenticator. This payload includes
  * the cryptographic `challenge`, as well as authenticator metadata (`authenticatorData` + `clientDataJSON`).
@@ -557,10 +540,6 @@ export declare namespace getSignPayload {
     | Errors.GlobalErrorType
 }
 
-getSignPayload.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as getSignPayload.ErrorType
-
 /**
  * Signs a challenge using a stored WebAuthn P256 Credential. If no Credential is provided,
  * a prompt will be displayed for the user to select an existing Credential
@@ -664,10 +643,6 @@ export declare namespace sign {
     | Errors.GlobalErrorType
 }
 
-sign.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as sign.ErrorType
-
 /**
  * Verifies a signature using the Credential's public key and the challenge which was signed.
  *
@@ -776,10 +751,6 @@ export declare namespace verify {
     | Errors.GlobalErrorType
 }
 
-verify.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as verify.ErrorType
-
 /** Thrown when a WebAuthn P256 credential creation fails. */
 export class CredentialCreationFailedError extends Errors.BaseError<Error> {
   override readonly name = 'WebAuthnP256.CredentialCreationFailedError'

package/core/WebCryptoP256.ts

@@ -68,10 +68,6 @@ export declare namespace createKeyPair {
   type ErrorType = PublicKey.from.ErrorType | Errors.GlobalErrorType
 }
 
-createKeyPair.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as createKeyPair.ErrorType
-
 /**
  * Signs a payload with the provided `CryptoKey` private key and returns a P256 signature.
  *
@@ -124,10 +120,6 @@ export declare namespace sign {
   type ErrorType = Bytes.fromArray.ErrorType | Errors.GlobalErrorType
 }
 
-sign.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as sign.ErrorType
-
 /**
  * Verifies a payload was signed by the provided public key.
  *
@@ -184,7 +176,3 @@ export declare namespace verify {
 
   type ErrorType = Errors.GlobalErrorType
 }
-
-verify.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as verify.ErrorType

package/core/Withdrawal.ts

@@ -49,10 +49,6 @@ export declare namespace fromRpc {
   export type ErrorType = Errors.GlobalErrorType
 }
 
-fromRpc.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as fromRpc.ErrorType
-
 /**
  * Converts a {@link ox#Withdrawal.Withdrawal} to an {@link ox#Withdrawal.Rpc}.
  *
@@ -89,7 +85,3 @@ export function toRpc(withdrawal: Withdrawal): Rpc {
 export declare namespace toRpc {
   export type ErrorType = Errors.GlobalErrorType
 }
-
-toRpc.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as toRpc.ErrorType

package/core/internal/base58.ts

@@ -101,6 +101,3 @@ export declare namespace from {
 }
 
 /** @internal */
-from.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as from.ErrorType

package/core/internal/promise.ts

@@ -49,9 +49,6 @@ export declare namespace withTimeout {
 }
 
 /** @internal */
-withTimeout.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as withTimeout.ErrorType
 
 /**
  * Thrown when an operation times out.

package/core/internal/rpcTransport.ts

@@ -67,8 +67,3 @@ export declare namespace create {
     | RpcResponse.parse.ErrorType
     | Errors.GlobalErrorType
 }
-
-/** @internal */
-create.parseError = (error: unknown) =>
-  /* v8 ignore next */
-  error as create.ErrorType

package/core/internal/webauthn.ts

@@ -1,7 +1,8 @@
 import { p256 } from '@noble/curves/p256'
-import type * as Bytes from '../Bytes.js'
+import type * as Errors from '../Errors.js'
 import * as Hex from '../Hex.js'
 import * as PublicKey from '../PublicKey.js'
+import { CredentialCreationFailedError } from '../WebAuthnP256.js'
 
 /** @internal */
 export type AttestationConveyancePreference =
@@ -178,21 +179,61 @@ export function parseAsn1Signature(bytes: Uint8Array) {
  * @internal
  */
 export async function parseCredentialPublicKey(
-  cPublicKey: Bytes.Bytes,
+  response: AuthenticatorAttestationResponse,
 ): Promise<PublicKey.PublicKey> {
-  const cryptoKey = await crypto.subtle.importKey(
-    'spki',
-    new Uint8Array(cPublicKey),
-    {
-      name: 'ECDSA',
-      namedCurve: 'P-256',
-      hash: 'SHA-256',
-    },
-    true,
-    ['verify'],
-  )
-  const publicKey = new Uint8Array(
-    await crypto.subtle.exportKey('raw', cryptoKey),
-  )
-  return PublicKey.from(publicKey)
+  try {
+    const publicKeyBuffer = response.getPublicKey()
+    if (!publicKeyBuffer) throw new CredentialCreationFailedError()
+
+    // Converting `publicKeyBuffer` throws when credential is created by 1Password Firefox Add-on
+    const publicKeyBytes = new Uint8Array(publicKeyBuffer)
+    const cryptoKey = await crypto.subtle.importKey(
+      'spki',
+      new Uint8Array(publicKeyBytes),
+      {
+        name: 'ECDSA',
+        namedCurve: 'P-256',
+        hash: 'SHA-256',
+      },
+      true,
+      ['verify'],
+    )
+    const publicKey = new Uint8Array(
+      await crypto.subtle.exportKey('raw', cryptoKey),
+    )
+    return PublicKey.from(publicKey)
+  } catch (error) {
+    // Fallback for 1Password Firefox Add-on restricts access to certain credential properties
+    // so we need to use `attestationObject` to extract the public key.
+    // https://github.com/passwordless-id/webauthn/issues/50#issuecomment-2072902094
+    if ((error as Error).message !== 'Permission denied to access object')
+      throw error
+
+    const data = new Uint8Array(response.attestationObject)
+    const coordinateLength = 0x20
+    const cborPrefix = 0x58
+
+    const findStart = (key: number) => {
+      const coordinate = new Uint8Array([key, cborPrefix, coordinateLength])
+      for (let i = 0; i < data.length - coordinate.length; i++)
+        if (coordinate.every((byte, j) => data[i + j] === byte))
+          return i + coordinate.length
+      throw new CredentialCreationFailedError()
+    }
+
+    const xStart = findStart(0x21)
+    const yStart = findStart(0x22)
+
+    return PublicKey.from(
+      new Uint8Array([
+        0x04,
+        ...data.slice(xStart, xStart + coordinateLength),
+        ...data.slice(yStart, yStart + coordinateLength),
+      ]),
+    )
+  }
+}
+
+export declare namespace parseCredentialPublicKey {
+  type ErrorType = CredentialCreationFailedError | Errors.GlobalErrorType
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ox",
   "description": "Ethereum Standard Library",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.1.7'
+export const version = '0.2.0'