@qrlwallet/connect 5.0.3 → 5.1.0

package/README.md

@@ -9,8 +9,9 @@ Account validation and message-signature verification use the complete 64-byte
 address. Applications using legacy 20-byte addresses must remain on version 4
 until their network and wallet support QIP-55.
 
-Wallet typed-data requests are disabled pending a versioned 64-byte address
-encoding. The local verifier remains available for address-free typed data.
+`qrl_signTypedData` signs payloads with QIP-55 address fields under
+`QRL-SIGN-TYPED-v2` (one 64-byte word per value); address-free payloads keep
+`QRL-SIGN-TYPED-v1`. See docs/JSON-RPC-REFERENCE.md.
 The private v3 network is a test network; its availability does not establish
 compatibility with legacy deployments or contracts.
 
@@ -173,16 +174,16 @@ The main class. Creates a connection manager and EIP-1193 provider.
 **Require user approval:**
 `qrl_requestAccounts`, `qrl_sendTransaction`, `qrl_signTransaction`, `qrl_signMessage`, `qrl_signTypedData`, `wallet_switchQrlChain`
 
-`qrl_signMessage` uses SHAKE256 plus native ML-DSA-87 ctx and returns a rich `{ signature, publicKey, descriptor, signer, digest, schemeVersion }` object. During the QIP-55 port, `qrl_signTypedData` stays in the approval policy and fails locally before relay use. Its v1 encoding fixes addresses to a 32-byte slot, so a new 64-byte encoding needs a new scheme version and regenerated wallet parity vectors.
+`qrl_signMessage` and `qrl_signTypedData` use SHAKE256 plus native ML-DSA-87 ctx and return a rich `{ signature, publicKey, descriptor, signer, digest, schemeVersion }` object (typed data also echoes `domain`). Typed data with QIP-55 address fields is signed under `QRL-SIGN-TYPED-v2`, address-free typed data under `QRL-SIGN-TYPED-v1`.
 
 `request()` returns `unknown`. First validate the exact response shape with
 `isQrlSignedMessageResult` or `isQrlSignedTypedDataResult`, then require
 `hasSigningDescriptor`. PQP3 authenticates the paired transport session. It
 does not prove that the returned ML-DSA signature is valid or that its public
 key belongs to the claimed signer. Authentication and authorization flows must
-call `verifyMessageForSigner` or the historical v1 `verifyTypedDataForSigner`
-with the original challenge or payload and the expected QIP-55 Q + 128 hex
-address.
+call `verifyMessageForSigner` or `verifyTypedDataForSigner` (pass the
+response's `schemeVersion`) with the original challenge or payload and the
+expected QIP-55 Q + 128 hex address.
 
 The lower-level `verifyMessageSignature` / `verifyTypedDataSignature` helpers
 verify only the supplied key and signature; they do not prove that the key

package/dist/index.d.mts

@@ -269,8 +269,8 @@ interface EIP6963ProviderInfoOverride {
     rdns?: string;
 }
 /**
- * Rich response object returned by `qrl_signMessage` and retained for locked
- * `qrl_signTypedData` v1 fixtures. The signature alone is not enough to
+ * Rich response object returned by `qrl_signMessage` and
+ * `qrl_signTypedData`. The signature alone is not enough to
  * verify since ML-DSA-87 public keys cannot be recovered from a signature,
  * so the wallet returns the public key explicitly. Stateless verifiers need
  * the original payload plus the signature fields below.
@@ -290,24 +290,26 @@ interface QrlSignedResult {
     signer: string;
     /** 0x-hex of the 64-byte SHAKE256 digest that was signed. */
     digest: string;
-    /** Scheme tag: 'QRL-SIGN-MSG-v1' or 'QRL-SIGN-TYPED-v1'. */
+    /** Scheme tag: 'QRL-SIGN-MSG-v1', 'QRL-SIGN-TYPED-v1' or 'QRL-SIGN-TYPED-v2'. */
     schemeVersion: QrlSigningSchemeVersion;
 }
 /** A current wallet response whose descriptor can be signer-bound. */
 interface QrlSignedResultWithDescriptor extends QrlSignedResult {
     descriptor: string;
 }
-type QrlSigningSchemeVersion = 'QRL-SIGN-MSG-v1' | 'QRL-SIGN-TYPED-v1';
+type QrlSigningSchemeVersion = 'QRL-SIGN-MSG-v1' | 'QRL-SIGN-TYPED-v1' | 'QRL-SIGN-TYPED-v2';
 /** Strict wire shape returned by `qrl_signMessage`. */
 interface QrlSignedMessageResult extends QrlSignedResult {
     schemeVersion: 'QRL-SIGN-MSG-v1';
 }
 /**
- * Historical v1 response from `qrl_signTypedData`. It echoes `domain` so a
- * stateless verifier does not need to be told the domain out-of-band.
+ * Response from `qrl_signTypedData`. It echoes `domain` so a stateless
+ * verifier does not need to be told the domain out-of-band. The scheme is
+ * v2 when the payload's types reach an `address` field and v1 otherwise;
+ * pass `schemeVersion` to `verifyTypedDataForSigner` to have it checked.
  */
 interface QrlSignedTypedDataResult extends QrlSignedResult {
-    schemeVersion: 'QRL-SIGN-TYPED-v1';
+    schemeVersion: 'QRL-SIGN-TYPED-v1' | 'QRL-SIGN-TYPED-v2';
     domain: Record<string, unknown>;
 }
 /** Every strict signing-result wire shape understood by this SDK. */
@@ -338,10 +340,9 @@ declare function hasSigningDescriptor(result: unknown): result is QrlSigningResu
  */
 type QrlSignMessageParams = [string, string];
 /**
- * Reserved `qrl_signTypedData` params: `[signer, payload]`. This interface
- * describes the historical v1 payload retained by the verifier exports. The
- * QIP-55 provider rejects requests until a versioned 64-byte encoding is
- * defined.
+ * `qrl_signTypedData` params: `[signer, payload]`. A payload whose types
+ * reach an `address` field is signed under QRL-SIGN-TYPED-v2, any other
+ * under v1.
  */
 interface QrlTypedDataPayload {
     types: Record<string, readonly {
@@ -870,8 +871,17 @@ declare class SocketClient extends EventEmitter<SocketClientEvents> {
  */
 declare const SCHEME_VERSION_MSG = "QRL-SIGN-MSG-v1";
 declare const SCHEME_VERSION_TYPED = "QRL-SIGN-TYPED-v1";
+/**
+ * Typed data with 64-byte slots, one QRVM word per atomic value, so a QIP-55
+ * address fits. A payload uses it exactly when an `address` type is
+ * reachable from QRLDomain or the primary type; every other payload keeps
+ * v1. See typedData.ts.
+ */
+declare const SCHEME_VERSION_TYPED_V2 = "QRL-SIGN-TYPED-v2";
+type TypedDataSchemeVersion = typeof SCHEME_VERSION_TYPED | typeof SCHEME_VERSION_TYPED_V2;
 declare const SCHEME_TAG_MSG: Uint8Array;
 declare const SCHEME_TAG_TYPED: Uint8Array;
+declare const SCHEME_TAG_TYPED_V2: Uint8Array;
 /** SHAKE256 output length used throughout the signing module (NIST L5-matched). */
 declare const DIGEST_LEN = 64;
 
@@ -887,7 +897,7 @@ declare const DIGEST_LEN = 64;
 declare function computeMessageDigest(messageBytes: Uint8Array): Uint8Array;
 
 /**
- * Historical EIP-712-shaped typed-data encoding for `qrl_signTypedData` v1.
+ * EIP-712-shaped typed-data encoding for `qrl_signTypedData`.
  *
  * Byte-identical algorithm with the wallet's signing/typedData.ts; this
  * file is the SDK port (only the import block differs: the SDK routes
@@ -895,10 +905,19 @@ declare function computeMessageDigest(messageBytes: Uint8Array): Uint8Array;
  * the wallet copy for the spec-level comments; behavior must stay in
  * lock-step or the cross-repo parity test fails on next CI.
  *
- * The v1 address slot is 32 bytes. QIP-55 address fields fail closed until a
- * 64-byte encoding receives a new scheme tag and lockstep wallet fixtures.
- * Address-free digests retain their existing encoding.
+ * Two schemes share this codec and differ only in the atomic slot size:
+ * - QRL-SIGN-TYPED-v1: 32-byte slots, the original layout.
+ * - QRL-SIGN-TYPED-v2: 64-byte slots, one QRVM word per atomic value, so a
+ *   64-byte QIP-55 address fits one slot. Integers are zero- or
+ *   sign-extended over 512 bits, bool and address are left-padded, bytesN
+ *   is right-padded.
+ * Strings, bytes, arrays, structs and type hashes are 64-byte SHAKE256
+ * digests in both. A payload uses v2 exactly when an `address` type
+ * (including address arrays) is reachable from QRLDomain or the primary
+ * type, so address-free payloads keep their v1 digests and older verifiers
+ * keep working for them.
  */
+
 declare const TYPED_DATA_LIMITS: Readonly<{
     maxTypes: 32;
     maxFieldsPerType: 32;
@@ -928,8 +947,25 @@ interface TypedDataPayload {
 }
 declare function encodeType(primary: string, types: TypeMap): string;
 declare function typeHash(primary: string, types: TypeMap): Uint8Array;
-declare function encodeField(type: FieldType, value: unknown, types: TypeMap): Uint8Array;
-declare function hashStruct(primary: string, data: Message, types: TypeMap): Uint8Array;
+/**
+ * Encode one field. The scheme defaults to the one `types` selects (v2 when
+ * any struct has an address field), which matches computeTypedDataDigest
+ * when `types` is a payload's full type map.
+ */
+declare function encodeField(type: FieldType, value: unknown, types: TypeMap, schemeVersion?: TypedDataSchemeVersion): Uint8Array;
+/**
+ * Hash one struct. The scheme defaults to the one `types` selects (v2 when
+ * any struct has an address field), which matches computeTypedDataDigest
+ * when `types` is a payload's full type map.
+ */
+declare function hashStruct(primary: string, data: Message, types: TypeMap, schemeVersion?: TypedDataSchemeVersion): Uint8Array;
+/**
+ * The scheme a payload is signed and verified under. It follows from the
+ * payload's types alone, so wallet and verifier agree without negotiating.
+ */
+declare function typedDataSchemeVersion(payload: unknown): TypedDataSchemeVersion;
+/** The digest-preimage and ML-DSA-87 ctx tag of a typed-data scheme. */
+declare function typedDataSchemeTag(schemeVersion: TypedDataSchemeVersion): Uint8Array;
 declare function computeTypedDataDigest(payload: unknown): Uint8Array;
 
 /**
@@ -961,13 +997,18 @@ interface VerifyTypedDataParams {
     signature: Uint8Array | string;
     publicKey: Uint8Array | string;
     payload: TypedDataPayload;
+    /**
+     * The `schemeVersion` from the wallet response. Optional: the payload's
+     * types decide the scheme, and a supplied value must match it.
+     */
+    schemeVersion?: string | undefined;
 }
 /**
  * Verify against an explicitly supplied ML-DSA public key only. This does not
  * bind that key to a Q-address. Use verifyTypedDataForSigner when signer
  * identity matters.
  */
-declare function verifyTypedDataSignature({ signature, publicKey, payload, }: VerifyTypedDataParams): boolean;
+declare function verifyTypedDataSignature({ signature, publicKey, payload, schemeVersion, }: VerifyTypedDataParams): boolean;
 interface VerifyMessageForSignerParams extends VerifyMessageParams {
     /** QIP-55 Q + 128 hex address expected by the dApp. */
     expectedSigner: string;
@@ -983,7 +1024,7 @@ interface VerifyTypedDataForSignerParams extends VerifyTypedDataParams {
     descriptor?: Uint8Array | string | undefined;
 }
 /** Verify both the typed-data signature and public-key-to-signer binding. */
-declare function verifyTypedDataForSigner({ expectedSigner, descriptor, signature, publicKey, payload, }: VerifyTypedDataForSignerParams): boolean;
+declare function verifyTypedDataForSigner({ expectedSigner, descriptor, signature, publicKey, payload, schemeVersion, }: VerifyTypedDataForSignerParams): boolean;
 /**
  * @deprecated Use verifyMessageSignature for a key-only check, or
  * verifyMessageForSigner when signer identity matters.
@@ -1135,4 +1176,4 @@ declare function isValidJsonRpcMethod(value: unknown): value is string;
  */
 declare function classifyRpcMethod(method: string): RpcMethodPolicy;
 
-export { type AckMessage, BLOB_LEN, CAP_LEN, CID_LEN, ConnectionManager, ConnectionStatus, type DAppMetadata, type DAppSession, DEFAULT_RELAY_URL, DIGEST_LEN, type Domain, type EIP6963ProviderInfoOverride, EXPLICITLY_UNSUPPORTED_METHODS, FP_LEN, type InitiatedKeyExchange, type JsonRpcRequest, type JsonRpcResponse, KeyExchange, KeyExchangeMessageType, MAX_CONNECTION_URI_LENGTH, MAX_JSON_RPC_ID_LENGTH, MAX_JSON_RPC_METHOD_LENGTH, MAX_RELAY_URL_LENGTH, ML_DSA_87_PUBLIC_KEY_BYTES, ML_DSA_87_SIGNATURE_BYTES, ML_DSA_DESCRIPTOR_BYTES, type Message, MessageType, PAIRING_CAPABILITY_LEN, PROTOCOL_VERSION, type ParsedURI, type PendingRequest, type PersistedSession, type ProviderEvents, QRLConnectProvider as QRLConnect, type QRLConnectOptions, QRLConnectProvider, QRL_ADDRESS_BYTES, QRL_ADDRESS_HEX_LENGTH, QRL_CONNECT_PROVIDER_INFO, type QrlSignMessageParams, type QrlSignTypedDataParams, type QrlSignedMessageResult, type QrlSignedResult, type QrlSignedResultWithDescriptor, type QrlSignedTypedDataResult, type QrlSigningResult, type QrlSigningSchemeVersion, type QrlTypedDataPayload, RESTRICTED_METHODS, type RelayMessage, type RpcMethodPolicy, SCHEME_TAG_MSG, SCHEME_TAG_TYPED, SCHEME_VERSION_MSG, SCHEME_VERSION_TYPED, type Session, SocketClient, type StructDef, type SynAckMessage, TYPED_DATA_LIMITS, type TypeMap, type TypedDataPayload, type TypedField, UNRESTRICTED_METHODS, type VerifyMessageForSignerParams, type VerifyMessageParams, type VerifyTypedDataForSignerParams, type VerifyTypedDataParams, attemptWalletRedirect, bytesToHex, cidFromString, cidRandom, cidToString, classifyRpcMethod, computeFingerprint, computeMessageDigest, computeTypedDataDigest, concatBytes, encodeField, encodeType, fingerprintEquals, formatQrlAddressFingerprint, generateConnectionURI, getAppStoreUrl, hasSigningDescriptor, hashStruct, hexToBytes, isCurrentQrlAddress, isMobileBrowser, isQrlSignedMessageResult, isQrlSignedResult, isQrlSignedTypedDataResult, isValidJsonRpcId, isValidJsonRpcMethod, normalizeRelayUrl, parseConnectionURI, qip55AddressFromBytes, typeHash, verifyMessage, verifyMessageForSigner, verifyMessageSignature, verifyTypedData, verifyTypedDataForSigner, verifyTypedDataSignature };
+export { type AckMessage, BLOB_LEN, CAP_LEN, CID_LEN, ConnectionManager, ConnectionStatus, type DAppMetadata, type DAppSession, DEFAULT_RELAY_URL, DIGEST_LEN, type Domain, type EIP6963ProviderInfoOverride, EXPLICITLY_UNSUPPORTED_METHODS, FP_LEN, type InitiatedKeyExchange, type JsonRpcRequest, type JsonRpcResponse, KeyExchange, KeyExchangeMessageType, MAX_CONNECTION_URI_LENGTH, MAX_JSON_RPC_ID_LENGTH, MAX_JSON_RPC_METHOD_LENGTH, MAX_RELAY_URL_LENGTH, ML_DSA_87_PUBLIC_KEY_BYTES, ML_DSA_87_SIGNATURE_BYTES, ML_DSA_DESCRIPTOR_BYTES, type Message, MessageType, PAIRING_CAPABILITY_LEN, PROTOCOL_VERSION, type ParsedURI, type PendingRequest, type PersistedSession, type ProviderEvents, QRLConnectProvider as QRLConnect, type QRLConnectOptions, QRLConnectProvider, QRL_ADDRESS_BYTES, QRL_ADDRESS_HEX_LENGTH, QRL_CONNECT_PROVIDER_INFO, type QrlSignMessageParams, type QrlSignTypedDataParams, type QrlSignedMessageResult, type QrlSignedResult, type QrlSignedResultWithDescriptor, type QrlSignedTypedDataResult, type QrlSigningResult, type QrlSigningSchemeVersion, type QrlTypedDataPayload, RESTRICTED_METHODS, type RelayMessage, type RpcMethodPolicy, SCHEME_TAG_MSG, SCHEME_TAG_TYPED, SCHEME_TAG_TYPED_V2, SCHEME_VERSION_MSG, SCHEME_VERSION_TYPED, SCHEME_VERSION_TYPED_V2, type Session, SocketClient, type StructDef, type SynAckMessage, TYPED_DATA_LIMITS, type TypeMap, type TypedDataPayload, type TypedDataSchemeVersion, type TypedField, UNRESTRICTED_METHODS, type VerifyMessageForSignerParams, type VerifyMessageParams, type VerifyTypedDataForSignerParams, type VerifyTypedDataParams, attemptWalletRedirect, bytesToHex, cidFromString, cidRandom, cidToString, classifyRpcMethod, computeFingerprint, computeMessageDigest, computeTypedDataDigest, concatBytes, encodeField, encodeType, fingerprintEquals, formatQrlAddressFingerprint, generateConnectionURI, getAppStoreUrl, hasSigningDescriptor, hashStruct, hexToBytes, isCurrentQrlAddress, isMobileBrowser, isQrlSignedMessageResult, isQrlSignedResult, isQrlSignedTypedDataResult, isValidJsonRpcId, isValidJsonRpcMethod, normalizeRelayUrl, parseConnectionURI, qip55AddressFromBytes, typeHash, typedDataSchemeTag, typedDataSchemeVersion, verifyMessage, verifyMessageForSigner, verifyMessageSignature, verifyTypedData, verifyTypedDataForSigner, verifyTypedDataSignature };

package/dist/index.d.ts

@@ -269,8 +269,8 @@ interface EIP6963ProviderInfoOverride {
     rdns?: string;
 }
 /**
- * Rich response object returned by `qrl_signMessage` and retained for locked
- * `qrl_signTypedData` v1 fixtures. The signature alone is not enough to
+ * Rich response object returned by `qrl_signMessage` and
+ * `qrl_signTypedData`. The signature alone is not enough to
  * verify since ML-DSA-87 public keys cannot be recovered from a signature,
  * so the wallet returns the public key explicitly. Stateless verifiers need
  * the original payload plus the signature fields below.
@@ -290,24 +290,26 @@ interface QrlSignedResult {
     signer: string;
     /** 0x-hex of the 64-byte SHAKE256 digest that was signed. */
     digest: string;
-    /** Scheme tag: 'QRL-SIGN-MSG-v1' or 'QRL-SIGN-TYPED-v1'. */
+    /** Scheme tag: 'QRL-SIGN-MSG-v1', 'QRL-SIGN-TYPED-v1' or 'QRL-SIGN-TYPED-v2'. */
     schemeVersion: QrlSigningSchemeVersion;
 }
 /** A current wallet response whose descriptor can be signer-bound. */
 interface QrlSignedResultWithDescriptor extends QrlSignedResult {
     descriptor: string;
 }
-type QrlSigningSchemeVersion = 'QRL-SIGN-MSG-v1' | 'QRL-SIGN-TYPED-v1';
+type QrlSigningSchemeVersion = 'QRL-SIGN-MSG-v1' | 'QRL-SIGN-TYPED-v1' | 'QRL-SIGN-TYPED-v2';
 /** Strict wire shape returned by `qrl_signMessage`. */
 interface QrlSignedMessageResult extends QrlSignedResult {
     schemeVersion: 'QRL-SIGN-MSG-v1';
 }
 /**
- * Historical v1 response from `qrl_signTypedData`. It echoes `domain` so a
- * stateless verifier does not need to be told the domain out-of-band.
+ * Response from `qrl_signTypedData`. It echoes `domain` so a stateless
+ * verifier does not need to be told the domain out-of-band. The scheme is
+ * v2 when the payload's types reach an `address` field and v1 otherwise;
+ * pass `schemeVersion` to `verifyTypedDataForSigner` to have it checked.
  */
 interface QrlSignedTypedDataResult extends QrlSignedResult {
-    schemeVersion: 'QRL-SIGN-TYPED-v1';
+    schemeVersion: 'QRL-SIGN-TYPED-v1' | 'QRL-SIGN-TYPED-v2';
     domain: Record<string, unknown>;
 }
 /** Every strict signing-result wire shape understood by this SDK. */
@@ -338,10 +340,9 @@ declare function hasSigningDescriptor(result: unknown): result is QrlSigningResu
  */
 type QrlSignMessageParams = [string, string];
 /**
- * Reserved `qrl_signTypedData` params: `[signer, payload]`. This interface
- * describes the historical v1 payload retained by the verifier exports. The
- * QIP-55 provider rejects requests until a versioned 64-byte encoding is
- * defined.
+ * `qrl_signTypedData` params: `[signer, payload]`. A payload whose types
+ * reach an `address` field is signed under QRL-SIGN-TYPED-v2, any other
+ * under v1.
  */
 interface QrlTypedDataPayload {
     types: Record<string, readonly {
@@ -870,8 +871,17 @@ declare class SocketClient extends EventEmitter<SocketClientEvents> {
  */
 declare const SCHEME_VERSION_MSG = "QRL-SIGN-MSG-v1";
 declare const SCHEME_VERSION_TYPED = "QRL-SIGN-TYPED-v1";
+/**
+ * Typed data with 64-byte slots, one QRVM word per atomic value, so a QIP-55
+ * address fits. A payload uses it exactly when an `address` type is
+ * reachable from QRLDomain or the primary type; every other payload keeps
+ * v1. See typedData.ts.
+ */
+declare const SCHEME_VERSION_TYPED_V2 = "QRL-SIGN-TYPED-v2";
+type TypedDataSchemeVersion = typeof SCHEME_VERSION_TYPED | typeof SCHEME_VERSION_TYPED_V2;
 declare const SCHEME_TAG_MSG: Uint8Array;
 declare const SCHEME_TAG_TYPED: Uint8Array;
+declare const SCHEME_TAG_TYPED_V2: Uint8Array;
 /** SHAKE256 output length used throughout the signing module (NIST L5-matched). */
 declare const DIGEST_LEN = 64;
 
@@ -887,7 +897,7 @@ declare const DIGEST_LEN = 64;
 declare function computeMessageDigest(messageBytes: Uint8Array): Uint8Array;
 
 /**
- * Historical EIP-712-shaped typed-data encoding for `qrl_signTypedData` v1.
+ * EIP-712-shaped typed-data encoding for `qrl_signTypedData`.
  *
  * Byte-identical algorithm with the wallet's signing/typedData.ts; this
  * file is the SDK port (only the import block differs: the SDK routes
@@ -895,10 +905,19 @@ declare function computeMessageDigest(messageBytes: Uint8Array): Uint8Array;
  * the wallet copy for the spec-level comments; behavior must stay in
  * lock-step or the cross-repo parity test fails on next CI.
  *
- * The v1 address slot is 32 bytes. QIP-55 address fields fail closed until a
- * 64-byte encoding receives a new scheme tag and lockstep wallet fixtures.
- * Address-free digests retain their existing encoding.
+ * Two schemes share this codec and differ only in the atomic slot size:
+ * - QRL-SIGN-TYPED-v1: 32-byte slots, the original layout.
+ * - QRL-SIGN-TYPED-v2: 64-byte slots, one QRVM word per atomic value, so a
+ *   64-byte QIP-55 address fits one slot. Integers are zero- or
+ *   sign-extended over 512 bits, bool and address are left-padded, bytesN
+ *   is right-padded.
+ * Strings, bytes, arrays, structs and type hashes are 64-byte SHAKE256
+ * digests in both. A payload uses v2 exactly when an `address` type
+ * (including address arrays) is reachable from QRLDomain or the primary
+ * type, so address-free payloads keep their v1 digests and older verifiers
+ * keep working for them.
  */
+
 declare const TYPED_DATA_LIMITS: Readonly<{
     maxTypes: 32;
     maxFieldsPerType: 32;
@@ -928,8 +947,25 @@ interface TypedDataPayload {
 }
 declare function encodeType(primary: string, types: TypeMap): string;
 declare function typeHash(primary: string, types: TypeMap): Uint8Array;
-declare function encodeField(type: FieldType, value: unknown, types: TypeMap): Uint8Array;
-declare function hashStruct(primary: string, data: Message, types: TypeMap): Uint8Array;
+/**
+ * Encode one field. The scheme defaults to the one `types` selects (v2 when
+ * any struct has an address field), which matches computeTypedDataDigest
+ * when `types` is a payload's full type map.
+ */
+declare function encodeField(type: FieldType, value: unknown, types: TypeMap, schemeVersion?: TypedDataSchemeVersion): Uint8Array;
+/**
+ * Hash one struct. The scheme defaults to the one `types` selects (v2 when
+ * any struct has an address field), which matches computeTypedDataDigest
+ * when `types` is a payload's full type map.
+ */
+declare function hashStruct(primary: string, data: Message, types: TypeMap, schemeVersion?: TypedDataSchemeVersion): Uint8Array;
+/**
+ * The scheme a payload is signed and verified under. It follows from the
+ * payload's types alone, so wallet and verifier agree without negotiating.
+ */
+declare function typedDataSchemeVersion(payload: unknown): TypedDataSchemeVersion;
+/** The digest-preimage and ML-DSA-87 ctx tag of a typed-data scheme. */
+declare function typedDataSchemeTag(schemeVersion: TypedDataSchemeVersion): Uint8Array;
 declare function computeTypedDataDigest(payload: unknown): Uint8Array;
 
 /**
@@ -961,13 +997,18 @@ interface VerifyTypedDataParams {
     signature: Uint8Array | string;
     publicKey: Uint8Array | string;
     payload: TypedDataPayload;
+    /**
+     * The `schemeVersion` from the wallet response. Optional: the payload's
+     * types decide the scheme, and a supplied value must match it.
+     */
+    schemeVersion?: string | undefined;
 }
 /**
  * Verify against an explicitly supplied ML-DSA public key only. This does not
  * bind that key to a Q-address. Use verifyTypedDataForSigner when signer
  * identity matters.
  */
-declare function verifyTypedDataSignature({ signature, publicKey, payload, }: VerifyTypedDataParams): boolean;
+declare function verifyTypedDataSignature({ signature, publicKey, payload, schemeVersion, }: VerifyTypedDataParams): boolean;
 interface VerifyMessageForSignerParams extends VerifyMessageParams {
     /** QIP-55 Q + 128 hex address expected by the dApp. */
     expectedSigner: string;
@@ -983,7 +1024,7 @@ interface VerifyTypedDataForSignerParams extends VerifyTypedDataParams {
     descriptor?: Uint8Array | string | undefined;
 }
 /** Verify both the typed-data signature and public-key-to-signer binding. */
-declare function verifyTypedDataForSigner({ expectedSigner, descriptor, signature, publicKey, payload, }: VerifyTypedDataForSignerParams): boolean;
+declare function verifyTypedDataForSigner({ expectedSigner, descriptor, signature, publicKey, payload, schemeVersion, }: VerifyTypedDataForSignerParams): boolean;
 /**
  * @deprecated Use verifyMessageSignature for a key-only check, or
  * verifyMessageForSigner when signer identity matters.
@@ -1135,4 +1176,4 @@ declare function isValidJsonRpcMethod(value: unknown): value is string;
  */
 declare function classifyRpcMethod(method: string): RpcMethodPolicy;
 
-export { type AckMessage, BLOB_LEN, CAP_LEN, CID_LEN, ConnectionManager, ConnectionStatus, type DAppMetadata, type DAppSession, DEFAULT_RELAY_URL, DIGEST_LEN, type Domain, type EIP6963ProviderInfoOverride, EXPLICITLY_UNSUPPORTED_METHODS, FP_LEN, type InitiatedKeyExchange, type JsonRpcRequest, type JsonRpcResponse, KeyExchange, KeyExchangeMessageType, MAX_CONNECTION_URI_LENGTH, MAX_JSON_RPC_ID_LENGTH, MAX_JSON_RPC_METHOD_LENGTH, MAX_RELAY_URL_LENGTH, ML_DSA_87_PUBLIC_KEY_BYTES, ML_DSA_87_SIGNATURE_BYTES, ML_DSA_DESCRIPTOR_BYTES, type Message, MessageType, PAIRING_CAPABILITY_LEN, PROTOCOL_VERSION, type ParsedURI, type PendingRequest, type PersistedSession, type ProviderEvents, QRLConnectProvider as QRLConnect, type QRLConnectOptions, QRLConnectProvider, QRL_ADDRESS_BYTES, QRL_ADDRESS_HEX_LENGTH, QRL_CONNECT_PROVIDER_INFO, type QrlSignMessageParams, type QrlSignTypedDataParams, type QrlSignedMessageResult, type QrlSignedResult, type QrlSignedResultWithDescriptor, type QrlSignedTypedDataResult, type QrlSigningResult, type QrlSigningSchemeVersion, type QrlTypedDataPayload, RESTRICTED_METHODS, type RelayMessage, type RpcMethodPolicy, SCHEME_TAG_MSG, SCHEME_TAG_TYPED, SCHEME_VERSION_MSG, SCHEME_VERSION_TYPED, type Session, SocketClient, type StructDef, type SynAckMessage, TYPED_DATA_LIMITS, type TypeMap, type TypedDataPayload, type TypedField, UNRESTRICTED_METHODS, type VerifyMessageForSignerParams, type VerifyMessageParams, type VerifyTypedDataForSignerParams, type VerifyTypedDataParams, attemptWalletRedirect, bytesToHex, cidFromString, cidRandom, cidToString, classifyRpcMethod, computeFingerprint, computeMessageDigest, computeTypedDataDigest, concatBytes, encodeField, encodeType, fingerprintEquals, formatQrlAddressFingerprint, generateConnectionURI, getAppStoreUrl, hasSigningDescriptor, hashStruct, hexToBytes, isCurrentQrlAddress, isMobileBrowser, isQrlSignedMessageResult, isQrlSignedResult, isQrlSignedTypedDataResult, isValidJsonRpcId, isValidJsonRpcMethod, normalizeRelayUrl, parseConnectionURI, qip55AddressFromBytes, typeHash, verifyMessage, verifyMessageForSigner, verifyMessageSignature, verifyTypedData, verifyTypedDataForSigner, verifyTypedDataSignature };
+export { type AckMessage, BLOB_LEN, CAP_LEN, CID_LEN, ConnectionManager, ConnectionStatus, type DAppMetadata, type DAppSession, DEFAULT_RELAY_URL, DIGEST_LEN, type Domain, type EIP6963ProviderInfoOverride, EXPLICITLY_UNSUPPORTED_METHODS, FP_LEN, type InitiatedKeyExchange, type JsonRpcRequest, type JsonRpcResponse, KeyExchange, KeyExchangeMessageType, MAX_CONNECTION_URI_LENGTH, MAX_JSON_RPC_ID_LENGTH, MAX_JSON_RPC_METHOD_LENGTH, MAX_RELAY_URL_LENGTH, ML_DSA_87_PUBLIC_KEY_BYTES, ML_DSA_87_SIGNATURE_BYTES, ML_DSA_DESCRIPTOR_BYTES, type Message, MessageType, PAIRING_CAPABILITY_LEN, PROTOCOL_VERSION, type ParsedURI, type PendingRequest, type PersistedSession, type ProviderEvents, QRLConnectProvider as QRLConnect, type QRLConnectOptions, QRLConnectProvider, QRL_ADDRESS_BYTES, QRL_ADDRESS_HEX_LENGTH, QRL_CONNECT_PROVIDER_INFO, type QrlSignMessageParams, type QrlSignTypedDataParams, type QrlSignedMessageResult, type QrlSignedResult, type QrlSignedResultWithDescriptor, type QrlSignedTypedDataResult, type QrlSigningResult, type QrlSigningSchemeVersion, type QrlTypedDataPayload, RESTRICTED_METHODS, type RelayMessage, type RpcMethodPolicy, SCHEME_TAG_MSG, SCHEME_TAG_TYPED, SCHEME_TAG_TYPED_V2, SCHEME_VERSION_MSG, SCHEME_VERSION_TYPED, SCHEME_VERSION_TYPED_V2, type Session, SocketClient, type StructDef, type SynAckMessage, TYPED_DATA_LIMITS, type TypeMap, type TypedDataPayload, type TypedDataSchemeVersion, type TypedField, UNRESTRICTED_METHODS, type VerifyMessageForSignerParams, type VerifyMessageParams, type VerifyTypedDataForSignerParams, type VerifyTypedDataParams, attemptWalletRedirect, bytesToHex, cidFromString, cidRandom, cidToString, classifyRpcMethod, computeFingerprint, computeMessageDigest, computeTypedDataDigest, concatBytes, encodeField, encodeType, fingerprintEquals, formatQrlAddressFingerprint, generateConnectionURI, getAppStoreUrl, hasSigningDescriptor, hashStruct, hexToBytes, isCurrentQrlAddress, isMobileBrowser, isQrlSignedMessageResult, isQrlSignedResult, isQrlSignedTypedDataResult, isValidJsonRpcId, isValidJsonRpcMethod, normalizeRelayUrl, parseConnectionURI, qip55AddressFromBytes, typeHash, typedDataSchemeTag, typedDataSchemeVersion, verifyMessage, verifyMessageForSigner, verifyMessageSignature, verifyTypedData, verifyTypedDataForSigner, verifyTypedDataSignature };

package/dist/index.js

@@ -59,8 +59,10 @@ __export(index_exports, {
   RESTRICTED_METHODS: () => RESTRICTED_METHODS,
   SCHEME_TAG_MSG: () => SCHEME_TAG_MSG,
   SCHEME_TAG_TYPED: () => SCHEME_TAG_TYPED,
+  SCHEME_TAG_TYPED_V2: () => SCHEME_TAG_TYPED_V2,
   SCHEME_VERSION_MSG: () => SCHEME_VERSION_MSG,
   SCHEME_VERSION_TYPED: () => SCHEME_VERSION_TYPED,
+  SCHEME_VERSION_TYPED_V2: () => SCHEME_VERSION_TYPED_V2,
   SocketClient: () => SocketClient,
   TYPED_DATA_LIMITS: () => TYPED_DATA_LIMITS,
   UNRESTRICTED_METHODS: () => UNRESTRICTED_METHODS,
@@ -94,6 +96,8 @@ __export(index_exports, {
   parseConnectionURI: () => parseConnectionURI,
   qip55AddressFromBytes: () => qip55AddressFromBytes,
   typeHash: () => typeHash,
+  typedDataSchemeTag: () => typedDataSchemeTag,
+  typedDataSchemeVersion: () => typedDataSchemeVersion,
   verifyMessage: () => verifyMessage,
   verifyMessageForSigner: () => verifyMessageForSigner,
   verifyMessageSignature: () => verifyMessageSignature,
@@ -566,7 +570,7 @@ function isQrlSignedTypedDataResult(value) {
   try {
     if (!isSigningResultRecord(value)) return false;
     const keys = hasOwn(value, "descriptor") ? TYPED_RESULT_KEYS_WITH_DESCRIPTOR : TYPED_RESULT_KEYS;
-    return hasExactOwnKeys(value, keys) && value.schemeVersion === "QRL-SIGN-TYPED-v1" && isSigningResultRecord(value.domain) && hasValidSigningFields(value);
+    return hasExactOwnKeys(value, keys) && (value.schemeVersion === "QRL-SIGN-TYPED-v1" || value.schemeVersion === "QRL-SIGN-TYPED-v2") && isSigningResultRecord(value.domain) && hasValidSigningFields(value);
   } catch {
     return false;
   }
@@ -3081,8 +3085,10 @@ var ConnectionManager = _ConnectionManager;
 // src/signing/ctx.ts
 var SCHEME_VERSION_MSG = "QRL-SIGN-MSG-v1";
 var SCHEME_VERSION_TYPED = "QRL-SIGN-TYPED-v1";
+var SCHEME_VERSION_TYPED_V2 = "QRL-SIGN-TYPED-v2";
 var SCHEME_TAG_MSG = new TextEncoder().encode(SCHEME_VERSION_MSG);
 var SCHEME_TAG_TYPED = new TextEncoder().encode(SCHEME_VERSION_TYPED);
+var SCHEME_TAG_TYPED_V2 = new TextEncoder().encode(SCHEME_VERSION_TYPED_V2);
 var DIGEST_LEN = 64;
 
 // src/signing/bytes.ts
@@ -3122,7 +3128,14 @@ function concatBytesArr(parts) {
 }
 
 // src/signing/typedData.ts
-var SLOT = 32;
+var SLOT_BYTES = Object.freeze({
+  [SCHEME_VERSION_TYPED]: 32,
+  [SCHEME_VERSION_TYPED_V2]: 64
+});
+var SCHEME_TAGS = Object.freeze({
+  [SCHEME_VERSION_TYPED]: SCHEME_TAG_TYPED,
+  [SCHEME_VERSION_TYPED_V2]: SCHEME_TAG_TYPED_V2
+});
 var TYPED_DATA_LIMITS = Object.freeze({
   maxTypes: 32,
   maxFieldsPerType: 32,
@@ -3174,6 +3187,12 @@ function parsePayload(payload) {
 var ATOMIC_RE = /^(?:(address|bool|string|bytes)|(u?int)(\d+)|bytes(\d+)|(.+?)\[(\d*)\])$/;
 var IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var UNSAFE_OBJECT_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+function newBudget(schemeVersion) {
+  return {
+    remainingValues: TYPED_DATA_LIMITS.maxEncodedValues,
+    slot: SLOT_BYTES[schemeVersion]
+  };
+}
 function consumeValue(budget) {
   budget.remainingValues--;
   if (budget.remainingValues < 0) throw new Error("typed data contains too many encoded values");
@@ -3320,29 +3339,29 @@ function encodeType(primary, types) {
 function typeHash(primary, types) {
   return shake256Digest(new TextEncoder().encode(encodeType(primary, types)), DIGEST_LEN);
 }
-function parseQAddress(addr) {
+function parseQAddress(addr, slot) {
   if (!isCurrentQrlAddress(addr)) {
     throw new Error(`invalid Q-address: ${String(addr)}`);
   }
   const bytes = hexToBytes("0x" + addr.slice(1).toLowerCase());
-  if (bytes.length > SLOT) {
+  if (bytes.length > slot) {
     throw new Error("qrl_signTypedData v1 does not support QIP-55 address fields");
   }
   return bytes;
 }
-function padLeft32(bytes) {
-  if (bytes.length > SLOT) throw new Error("cannot pad: bytes > 32");
-  const out = new Uint8Array(SLOT);
-  out.set(bytes, SLOT - bytes.length);
+function padLeft(bytes, slot) {
+  if (bytes.length > slot) throw new Error(`cannot pad: bytes > ${slot}`);
+  const out = new Uint8Array(slot);
+  out.set(bytes, slot - bytes.length);
   return out;
 }
-function padRight32(bytes) {
-  if (bytes.length > SLOT) throw new Error("cannot pad: bytes > 32");
-  const out = new Uint8Array(SLOT);
+function padRight(bytes, slot) {
+  if (bytes.length > slot) throw new Error(`cannot pad: bytes > ${slot}`);
+  const out = new Uint8Array(slot);
   out.set(bytes, 0);
   return out;
 }
-function bigIntToSlot(value, width, signed) {
+function bigIntToSlot(value, width, signed, slot) {
   if (signed) {
     const limit = 1n << BigInt(width - 1);
     if (value >= limit || value < -limit) {
@@ -3353,11 +3372,12 @@ function bigIntToSlot(value, width, signed) {
     const limit = 1n << BigInt(width);
     if (value >= limit) throw new Error(`uint${width} out of range: ${value}`);
   }
-  const slotMask = (1n << 256n) - 1n;
-  const repr = value < 0n ? value + (1n << 256n) & slotMask : value;
-  const out = new Uint8Array(SLOT);
+  const slotBits = BigInt(slot * 8);
+  const slotMask = (1n << slotBits) - 1n;
+  const repr = value < 0n ? value + (1n << slotBits) & slotMask : value;
+  const out = new Uint8Array(slot);
   let v = repr;
-  for (let i = SLOT - 1; i >= 0; i--) {
+  for (let i = slot - 1; i >= 0; i--) {
     out[i] = Number(v & 0xffn);
     v >>= 8n;
   }
@@ -3401,12 +3421,12 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       if (typeof value !== "string") {
         throw new Error(`address field expects string: ${typeof value}`);
       }
-      return padLeft32(parseQAddress(value));
+      return padLeft(parseQAddress(value, budget.slot), budget.slot);
     case "bool":
       if (typeof value !== "boolean") {
         throw new Error(`bool field expects boolean: ${typeof value}`);
       }
-      return padLeft32(new Uint8Array([value ? 1 : 0]));
+      return padLeft(new Uint8Array([value ? 1 : 0]), budget.slot);
     case "string": {
       if (typeof value !== "string") {
         throw new Error(`string field expects string: ${typeof value}`);
@@ -3429,9 +3449,19 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       }
       return shake256Digest(hexToBytes(value), DIGEST_LEN);
     case "uintN":
-      return bigIntToSlot(parseIntValue(value, `uint${parsed.width}`), parsed.width, false);
+      return bigIntToSlot(
+        parseIntValue(value, `uint${parsed.width}`),
+        parsed.width,
+        false,
+        budget.slot
+      );
     case "intN":
-      return bigIntToSlot(parseIntValue(value, `int${parsed.width}`), parsed.width, true);
+      return bigIntToSlot(
+        parseIntValue(value, `int${parsed.width}`),
+        parsed.width,
+        true,
+        budget.slot
+      );
     case "bytesN": {
       if (typeof value !== "string") {
         throw new Error(`bytes${parsed.width} expects 0x-hex string: ${typeof value}`);
@@ -3443,7 +3473,7 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       if (raw.length !== parsed.width) {
         throw new Error(`bytes${parsed.width} requires ${parsed.width} bytes, got ${raw.length}`);
       }
-      return padRight32(raw);
+      return padRight(raw, budget.slot);
     }
     case "array": {
       if (!Array.isArray(value)) {
@@ -3462,15 +3492,10 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
     }
   }
 }
-function encodeField(type, value, types) {
+function encodeField(type, value, types, schemeVersion) {
   validateTypeMap(types);
-  return encodeFieldWithBudget(
-    type,
-    value,
-    types,
-    { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues },
-    0
-  );
+  const scheme = schemeVersion ?? schemeVersionForTypes(types);
+  return encodeFieldWithBudget(type, value, types, newBudget(scheme), 0);
 }
 function hashStructWithBudget(primary, data, types, budget, depth) {
   consumeValue(budget);
@@ -3495,15 +3520,10 @@ function hashStructWithBudget(primary, data, types, budget, depth) {
   }
   return shake256Digest(concatBytesArr(parts), DIGEST_LEN);
 }
-function hashStruct(primary, data, types) {
+function hashStruct(primary, data, types, schemeVersion) {
   validateTypeMap(types);
-  return hashStructWithBudget(
-    primary,
-    data,
-    types,
-    { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues },
-    0
-  );
+  const scheme = schemeVersion ?? schemeVersionForTypes(types);
+  return hashStructWithBudget(primary, data, types, newBudget(scheme), 0);
 }
 var RESERVED_DOMAIN_FIELDS = {
   name: "string",
@@ -3539,7 +3559,7 @@ function validatePayloadReachability(primary, types) {
     if (!reachable.has(k)) throw new Error(`unused referenced type: ${k}`);
   }
 }
-function computeTypedDataDigest(payload) {
+function parseAndValidatePayload(payload) {
   const parsed = parsePayload(payload);
   validateTypeMap(parsed.types);
   assertIdentifier(parsed.primaryType, "primary type");
@@ -3548,7 +3568,26 @@ function computeTypedDataDigest(payload) {
   }
   validateDomainTypes(parsed.types);
   validatePayloadReachability(parsed.primaryType, parsed.types);
-  const budget = { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues };
+  return parsed;
+}
+function schemeVersionForTypes(types) {
+  for (const fields of Object.values(types)) {
+    if (fields.some((f) => baseTypeName(f.type) === "address")) {
+      return SCHEME_VERSION_TYPED_V2;
+    }
+  }
+  return SCHEME_VERSION_TYPED;
+}
+function typedDataSchemeVersion(payload) {
+  return schemeVersionForTypes(parseAndValidatePayload(payload).types);
+}
+function typedDataSchemeTag(schemeVersion) {
+  return SCHEME_TAGS[schemeVersion];
+}
+function computeTypedDataDigest(payload) {
+  const parsed = parseAndValidatePayload(payload);
+  const schemeVersion = schemeVersionForTypes(parsed.types);
+  const budget = newBudget(schemeVersion);
   const domainHash = hashStructWithBudget("QRLDomain", parsed.domain, parsed.types, budget, 0);
   const messageHash = hashStructWithBudget(
     parsed.primaryType,
@@ -3557,7 +3596,10 @@ function computeTypedDataDigest(payload) {
     budget,
     0
   );
-  return shake256Digest(concatBytes(SCHEME_TAG_TYPED, domainHash, messageHash), DIGEST_LEN);
+  return shake256Digest(
+    concatBytes(SCHEME_TAGS[schemeVersion], domainHash, messageHash),
+    DIGEST_LEN
+  );
 }
 
 // src/utils/platform.ts
@@ -3749,9 +3791,8 @@ function validateRestrictedRequest(method, params, authorizedAccounts, currentCh
   if (params[0] !== authorizedAccount) {
     throw new Error("qrl_signTypedData signer is not the authorized account");
   }
-  throw new Error(
-    "qrl_signTypedData is unavailable for QIP-55 until the 64-byte word encoding and signing scheme version are finalized"
-  );
+  computeTypedDataDigest(params[1]);
+  return void 0;
 }
 function requiresAuthorizedAccount(method) {
   return method === "qrl_sendTransaction" || method === "qrl_signTransaction" || method === "qrl_signMessage" || method === "qrl_signTypedData";
@@ -4397,9 +4438,13 @@ function verifyMessageBytes(signature, publicKey, messageBytes) {
   const digest = computeMessageDigest(messageBytes);
   return mldsaVerify(signature, digest, publicKey, SCHEME_TAG_MSG);
 }
-function verifyTypedDataBytes(signature, publicKey, payload) {
+function verifyTypedDataBytes(signature, publicKey, payload, claimedSchemeVersion) {
+  const schemeVersion = typedDataSchemeVersion(payload);
+  if (claimedSchemeVersion !== void 0 && claimedSchemeVersion !== schemeVersion) {
+    return false;
+  }
   const digest = computeTypedDataDigest(payload);
-  return mldsaVerify(signature, digest, publicKey, SCHEME_TAG_TYPED);
+  return mldsaVerify(signature, digest, publicKey, typedDataSchemeTag(schemeVersion));
 }
 function verifyMessageSignature({
   signature,
@@ -4419,13 +4464,14 @@ function verifyMessageSignature({
 function verifyTypedDataSignature({
   signature,
   publicKey,
-  payload
+  payload,
+  schemeVersion
 }) {
   try {
     const sig = fixedBytesOrHex(signature, ML_DSA_87_SIGNATURE_BYTES);
     const pk = fixedBytesOrHex(publicKey, ML_DSA_87_PUBLIC_KEY_BYTES);
     if (!sig || !pk) return false;
-    return verifyTypedDataBytes(sig, pk, payload);
+    return verifyTypedDataBytes(sig, pk, payload, schemeVersion);
   } catch {
     return false;
   }
@@ -4463,7 +4509,8 @@ function verifyTypedDataForSigner({
   descriptor,
   signature,
   publicKey,
-  payload
+  payload,
+  schemeVersion
 }) {
   try {
     if (descriptor === void 0) return false;
@@ -4471,7 +4518,7 @@ function verifyTypedDataForSigner({
     const publicKeyBytes = fixedBytesOrHex(publicKey, ML_DSA_87_PUBLIC_KEY_BYTES);
     const signatureBytes = fixedBytesOrHex(signature, ML_DSA_87_SIGNATURE_BYTES);
     if (!descriptorBytes || !publicKeyBytes || !signatureBytes) return false;
-    return publicKeyMatchesSigner(expectedSigner, descriptorBytes, publicKeyBytes) && verifyTypedDataBytes(signatureBytes, publicKeyBytes, payload);
+    return publicKeyMatchesSigner(expectedSigner, descriptorBytes, publicKeyBytes) && verifyTypedDataBytes(signatureBytes, publicKeyBytes, payload, schemeVersion);
   } catch {
     return false;
   }
@@ -4513,8 +4560,10 @@ function verifyTypedData(params) {
   RESTRICTED_METHODS,
   SCHEME_TAG_MSG,
   SCHEME_TAG_TYPED,
+  SCHEME_TAG_TYPED_V2,
   SCHEME_VERSION_MSG,
   SCHEME_VERSION_TYPED,
+  SCHEME_VERSION_TYPED_V2,
   SocketClient,
   TYPED_DATA_LIMITS,
   UNRESTRICTED_METHODS,
@@ -4548,6 +4597,8 @@ function verifyTypedData(params) {
   parseConnectionURI,
   qip55AddressFromBytes,
   typeHash,
+  typedDataSchemeTag,
+  typedDataSchemeVersion,
   verifyMessage,
   verifyMessageForSigner,
   verifyMessageSignature,

package/dist/index.mjs

@@ -461,7 +461,7 @@ function isQrlSignedTypedDataResult(value) {
   try {
     if (!isSigningResultRecord(value)) return false;
     const keys = hasOwn(value, "descriptor") ? TYPED_RESULT_KEYS_WITH_DESCRIPTOR : TYPED_RESULT_KEYS;
-    return hasExactOwnKeys(value, keys) && value.schemeVersion === "QRL-SIGN-TYPED-v1" && isSigningResultRecord(value.domain) && hasValidSigningFields(value);
+    return hasExactOwnKeys(value, keys) && (value.schemeVersion === "QRL-SIGN-TYPED-v1" || value.schemeVersion === "QRL-SIGN-TYPED-v2") && isSigningResultRecord(value.domain) && hasValidSigningFields(value);
   } catch {
     return false;
   }
@@ -2976,8 +2976,10 @@ var ConnectionManager = _ConnectionManager;
 // src/signing/ctx.ts
 var SCHEME_VERSION_MSG = "QRL-SIGN-MSG-v1";
 var SCHEME_VERSION_TYPED = "QRL-SIGN-TYPED-v1";
+var SCHEME_VERSION_TYPED_V2 = "QRL-SIGN-TYPED-v2";
 var SCHEME_TAG_MSG = new TextEncoder().encode(SCHEME_VERSION_MSG);
 var SCHEME_TAG_TYPED = new TextEncoder().encode(SCHEME_VERSION_TYPED);
+var SCHEME_TAG_TYPED_V2 = new TextEncoder().encode(SCHEME_VERSION_TYPED_V2);
 var DIGEST_LEN = 64;
 
 // src/signing/bytes.ts
@@ -3017,7 +3019,14 @@ function concatBytesArr(parts) {
 }
 
 // src/signing/typedData.ts
-var SLOT = 32;
+var SLOT_BYTES = Object.freeze({
+  [SCHEME_VERSION_TYPED]: 32,
+  [SCHEME_VERSION_TYPED_V2]: 64
+});
+var SCHEME_TAGS = Object.freeze({
+  [SCHEME_VERSION_TYPED]: SCHEME_TAG_TYPED,
+  [SCHEME_VERSION_TYPED_V2]: SCHEME_TAG_TYPED_V2
+});
 var TYPED_DATA_LIMITS = Object.freeze({
   maxTypes: 32,
   maxFieldsPerType: 32,
@@ -3069,6 +3078,12 @@ function parsePayload(payload) {
 var ATOMIC_RE = /^(?:(address|bool|string|bytes)|(u?int)(\d+)|bytes(\d+)|(.+?)\[(\d*)\])$/;
 var IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var UNSAFE_OBJECT_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+function newBudget(schemeVersion) {
+  return {
+    remainingValues: TYPED_DATA_LIMITS.maxEncodedValues,
+    slot: SLOT_BYTES[schemeVersion]
+  };
+}
 function consumeValue(budget) {
   budget.remainingValues--;
   if (budget.remainingValues < 0) throw new Error("typed data contains too many encoded values");
@@ -3215,29 +3230,29 @@ function encodeType(primary, types) {
 function typeHash(primary, types) {
   return shake256Digest(new TextEncoder().encode(encodeType(primary, types)), DIGEST_LEN);
 }
-function parseQAddress(addr) {
+function parseQAddress(addr, slot) {
   if (!isCurrentQrlAddress(addr)) {
     throw new Error(`invalid Q-address: ${String(addr)}`);
   }
   const bytes = hexToBytes("0x" + addr.slice(1).toLowerCase());
-  if (bytes.length > SLOT) {
+  if (bytes.length > slot) {
     throw new Error("qrl_signTypedData v1 does not support QIP-55 address fields");
   }
   return bytes;
 }
-function padLeft32(bytes) {
-  if (bytes.length > SLOT) throw new Error("cannot pad: bytes > 32");
-  const out = new Uint8Array(SLOT);
-  out.set(bytes, SLOT - bytes.length);
+function padLeft(bytes, slot) {
+  if (bytes.length > slot) throw new Error(`cannot pad: bytes > ${slot}`);
+  const out = new Uint8Array(slot);
+  out.set(bytes, slot - bytes.length);
   return out;
 }
-function padRight32(bytes) {
-  if (bytes.length > SLOT) throw new Error("cannot pad: bytes > 32");
-  const out = new Uint8Array(SLOT);
+function padRight(bytes, slot) {
+  if (bytes.length > slot) throw new Error(`cannot pad: bytes > ${slot}`);
+  const out = new Uint8Array(slot);
   out.set(bytes, 0);
   return out;
 }
-function bigIntToSlot(value, width, signed) {
+function bigIntToSlot(value, width, signed, slot) {
   if (signed) {
     const limit = 1n << BigInt(width - 1);
     if (value >= limit || value < -limit) {
@@ -3248,11 +3263,12 @@ function bigIntToSlot(value, width, signed) {
     const limit = 1n << BigInt(width);
     if (value >= limit) throw new Error(`uint${width} out of range: ${value}`);
   }
-  const slotMask = (1n << 256n) - 1n;
-  const repr = value < 0n ? value + (1n << 256n) & slotMask : value;
-  const out = new Uint8Array(SLOT);
+  const slotBits = BigInt(slot * 8);
+  const slotMask = (1n << slotBits) - 1n;
+  const repr = value < 0n ? value + (1n << slotBits) & slotMask : value;
+  const out = new Uint8Array(slot);
   let v = repr;
-  for (let i = SLOT - 1; i >= 0; i--) {
+  for (let i = slot - 1; i >= 0; i--) {
     out[i] = Number(v & 0xffn);
     v >>= 8n;
   }
@@ -3296,12 +3312,12 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       if (typeof value !== "string") {
         throw new Error(`address field expects string: ${typeof value}`);
       }
-      return padLeft32(parseQAddress(value));
+      return padLeft(parseQAddress(value, budget.slot), budget.slot);
     case "bool":
       if (typeof value !== "boolean") {
         throw new Error(`bool field expects boolean: ${typeof value}`);
       }
-      return padLeft32(new Uint8Array([value ? 1 : 0]));
+      return padLeft(new Uint8Array([value ? 1 : 0]), budget.slot);
     case "string": {
       if (typeof value !== "string") {
         throw new Error(`string field expects string: ${typeof value}`);
@@ -3324,9 +3340,19 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       }
       return shake256Digest(hexToBytes(value), DIGEST_LEN);
     case "uintN":
-      return bigIntToSlot(parseIntValue(value, `uint${parsed.width}`), parsed.width, false);
+      return bigIntToSlot(
+        parseIntValue(value, `uint${parsed.width}`),
+        parsed.width,
+        false,
+        budget.slot
+      );
     case "intN":
-      return bigIntToSlot(parseIntValue(value, `int${parsed.width}`), parsed.width, true);
+      return bigIntToSlot(
+        parseIntValue(value, `int${parsed.width}`),
+        parsed.width,
+        true,
+        budget.slot
+      );
     case "bytesN": {
       if (typeof value !== "string") {
         throw new Error(`bytes${parsed.width} expects 0x-hex string: ${typeof value}`);
@@ -3338,7 +3364,7 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
       if (raw.length !== parsed.width) {
         throw new Error(`bytes${parsed.width} requires ${parsed.width} bytes, got ${raw.length}`);
       }
-      return padRight32(raw);
+      return padRight(raw, budget.slot);
     }
     case "array": {
       if (!Array.isArray(value)) {
@@ -3357,15 +3383,10 @@ function encodeFieldWithBudget(type, value, types, budget, depth) {
     }
   }
 }
-function encodeField(type, value, types) {
+function encodeField(type, value, types, schemeVersion) {
   validateTypeMap(types);
-  return encodeFieldWithBudget(
-    type,
-    value,
-    types,
-    { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues },
-    0
-  );
+  const scheme = schemeVersion ?? schemeVersionForTypes(types);
+  return encodeFieldWithBudget(type, value, types, newBudget(scheme), 0);
 }
 function hashStructWithBudget(primary, data, types, budget, depth) {
   consumeValue(budget);
@@ -3390,15 +3411,10 @@ function hashStructWithBudget(primary, data, types, budget, depth) {
   }
   return shake256Digest(concatBytesArr(parts), DIGEST_LEN);
 }
-function hashStruct(primary, data, types) {
+function hashStruct(primary, data, types, schemeVersion) {
   validateTypeMap(types);
-  return hashStructWithBudget(
-    primary,
-    data,
-    types,
-    { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues },
-    0
-  );
+  const scheme = schemeVersion ?? schemeVersionForTypes(types);
+  return hashStructWithBudget(primary, data, types, newBudget(scheme), 0);
 }
 var RESERVED_DOMAIN_FIELDS = {
   name: "string",
@@ -3434,7 +3450,7 @@ function validatePayloadReachability(primary, types) {
     if (!reachable.has(k)) throw new Error(`unused referenced type: ${k}`);
   }
 }
-function computeTypedDataDigest(payload) {
+function parseAndValidatePayload(payload) {
   const parsed = parsePayload(payload);
   validateTypeMap(parsed.types);
   assertIdentifier(parsed.primaryType, "primary type");
@@ -3443,7 +3459,26 @@ function computeTypedDataDigest(payload) {
   }
   validateDomainTypes(parsed.types);
   validatePayloadReachability(parsed.primaryType, parsed.types);
-  const budget = { remainingValues: TYPED_DATA_LIMITS.maxEncodedValues };
+  return parsed;
+}
+function schemeVersionForTypes(types) {
+  for (const fields of Object.values(types)) {
+    if (fields.some((f) => baseTypeName(f.type) === "address")) {
+      return SCHEME_VERSION_TYPED_V2;
+    }
+  }
+  return SCHEME_VERSION_TYPED;
+}
+function typedDataSchemeVersion(payload) {
+  return schemeVersionForTypes(parseAndValidatePayload(payload).types);
+}
+function typedDataSchemeTag(schemeVersion) {
+  return SCHEME_TAGS[schemeVersion];
+}
+function computeTypedDataDigest(payload) {
+  const parsed = parseAndValidatePayload(payload);
+  const schemeVersion = schemeVersionForTypes(parsed.types);
+  const budget = newBudget(schemeVersion);
   const domainHash = hashStructWithBudget("QRLDomain", parsed.domain, parsed.types, budget, 0);
   const messageHash = hashStructWithBudget(
     parsed.primaryType,
@@ -3452,7 +3487,10 @@ function computeTypedDataDigest(payload) {
     budget,
     0
   );
-  return shake256Digest(concatBytes(SCHEME_TAG_TYPED, domainHash, messageHash), DIGEST_LEN);
+  return shake256Digest(
+    concatBytes(SCHEME_TAGS[schemeVersion], domainHash, messageHash),
+    DIGEST_LEN
+  );
 }
 
 // src/utils/platform.ts
@@ -3644,9 +3682,8 @@ function validateRestrictedRequest(method, params, authorizedAccounts, currentCh
   if (params[0] !== authorizedAccount) {
     throw new Error("qrl_signTypedData signer is not the authorized account");
   }
-  throw new Error(
-    "qrl_signTypedData is unavailable for QIP-55 until the 64-byte word encoding and signing scheme version are finalized"
-  );
+  computeTypedDataDigest(params[1]);
+  return void 0;
 }
 function requiresAuthorizedAccount(method) {
   return method === "qrl_sendTransaction" || method === "qrl_signTransaction" || method === "qrl_signMessage" || method === "qrl_signTypedData";
@@ -4292,9 +4329,13 @@ function verifyMessageBytes(signature, publicKey, messageBytes) {
   const digest = computeMessageDigest(messageBytes);
   return mldsaVerify(signature, digest, publicKey, SCHEME_TAG_MSG);
 }
-function verifyTypedDataBytes(signature, publicKey, payload) {
+function verifyTypedDataBytes(signature, publicKey, payload, claimedSchemeVersion) {
+  const schemeVersion = typedDataSchemeVersion(payload);
+  if (claimedSchemeVersion !== void 0 && claimedSchemeVersion !== schemeVersion) {
+    return false;
+  }
   const digest = computeTypedDataDigest(payload);
-  return mldsaVerify(signature, digest, publicKey, SCHEME_TAG_TYPED);
+  return mldsaVerify(signature, digest, publicKey, typedDataSchemeTag(schemeVersion));
 }
 function verifyMessageSignature({
   signature,
@@ -4314,13 +4355,14 @@ function verifyMessageSignature({
 function verifyTypedDataSignature({
   signature,
   publicKey,
-  payload
+  payload,
+  schemeVersion
 }) {
   try {
     const sig = fixedBytesOrHex(signature, ML_DSA_87_SIGNATURE_BYTES);
     const pk = fixedBytesOrHex(publicKey, ML_DSA_87_PUBLIC_KEY_BYTES);
     if (!sig || !pk) return false;
-    return verifyTypedDataBytes(sig, pk, payload);
+    return verifyTypedDataBytes(sig, pk, payload, schemeVersion);
   } catch {
     return false;
   }
@@ -4358,7 +4400,8 @@ function verifyTypedDataForSigner({
   descriptor,
   signature,
   publicKey,
-  payload
+  payload,
+  schemeVersion
 }) {
   try {
     if (descriptor === void 0) return false;
@@ -4366,7 +4409,7 @@ function verifyTypedDataForSigner({
     const publicKeyBytes = fixedBytesOrHex(publicKey, ML_DSA_87_PUBLIC_KEY_BYTES);
     const signatureBytes = fixedBytesOrHex(signature, ML_DSA_87_SIGNATURE_BYTES);
     if (!descriptorBytes || !publicKeyBytes || !signatureBytes) return false;
-    return publicKeyMatchesSigner(expectedSigner, descriptorBytes, publicKeyBytes) && verifyTypedDataBytes(signatureBytes, publicKeyBytes, payload);
+    return publicKeyMatchesSigner(expectedSigner, descriptorBytes, publicKeyBytes) && verifyTypedDataBytes(signatureBytes, publicKeyBytes, payload, schemeVersion);
   } catch {
     return false;
   }
@@ -4407,8 +4450,10 @@ export {
   RESTRICTED_METHODS,
   SCHEME_TAG_MSG,
   SCHEME_TAG_TYPED,
+  SCHEME_TAG_TYPED_V2,
   SCHEME_VERSION_MSG,
   SCHEME_VERSION_TYPED,
+  SCHEME_VERSION_TYPED_V2,
   SocketClient,
   TYPED_DATA_LIMITS,
   UNRESTRICTED_METHODS,
@@ -4442,6 +4487,8 @@ export {
   parseConnectionURI,
   qip55AddressFromBytes,
   typeHash,
+  typedDataSchemeTag,
+  typedDataSchemeVersion,
   verifyMessage,
   verifyMessageForSigner,
   verifyMessageSignature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrlwallet/connect",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "packageManager": "npm@10.9.8",
   "description": "Connect your dApp to QRL Wallet via QR code or deep link",
   "main": "dist/index.js",